diff --git a/FrameworkPackageStubs/AndroidManifest.xml b/FrameworkPackageStubs/AndroidManifest.xml
index ac674cb..4e51f13 100644
--- a/FrameworkPackageStubs/AndroidManifest.xml
+++ b/FrameworkPackageStubs/AndroidManifest.xml
@@ -59,11 +59,26 @@
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="" />
+                <data android:scheme="http" />
+                <data android:scheme="https" />
                 <data android:scheme="content" />
                 <data android:scheme="file" />
                 <data android:mimeType="video/*" />
                 <data android:mimeType="image/*" />
             </intent-filter>
+            <intent-filter android:priority="-1">
+                <action android:name="android.intent.action.PICK" />
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="vnd.android.cursor.dir/image" />
+            </intent-filter>
+            <intent-filter android:priority="-1">
+                <action android:name="android.intent.action.PICK" />
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="vnd.android.cursor.dir/video"/>
+            </intent-filter>
         </activity>
 
         <!-- Settings package stubs -->
diff --git a/FrameworkPackageStubs/res/values-uz/strings.xml b/FrameworkPackageStubs/res/values-uz/strings.xml
index 06078a6..209810d 100644
--- a/FrameworkPackageStubs/res/values-uz/strings.xml
+++ b/FrameworkPackageStubs/res/values-uz/strings.xml
@@ -3,5 +3,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="6179574017413146651">"Activity Stub"</string>
     <string name="message_not_supported" msgid="133939962837892495">"Bu amalni bajaradigan ilova mavjud emas"</string>
-    <string name="stub_name" msgid="3987164490218189006">"Yoʻq"</string>
+    <string name="stub_name" msgid="3987164490218189006">"Hech qanday"</string>
 </resources>
diff --git a/car-lib/Android.bp b/car-lib/Android.bp
index 39db28e..1978ba3 100644
--- a/car-lib/Android.bp
+++ b/car-lib/Android.bp
@@ -65,7 +65,7 @@
     srcs: ["src/android/car/navigation/navigation_state.proto"]
 }
 
-// library to access settings from CarSettings 
+// library to access settings from CarSettings
 java_library {
     name: "android.car.settings",
     srcs: ["src/android/car/settings/CarSettings.java"]
@@ -80,7 +80,6 @@
     aidl: {
         include_dirs: [
             "system/bt/binder",
-            "packages/services/Car/watchdog/aidl",
         ],
     },
     exclude_srcs: [
@@ -89,7 +88,6 @@
     ],
     static_libs: [
         "android.car.internal.event-log-tags",
-        "carwatchdog_aidl_interface-java",
     ],
     product_variables: {
         pdk: {
@@ -228,6 +226,70 @@
     },
 }
 
+// Generates stubs for API documentation.
+droidstubs {
+    name: "car-doc-stubs",
+    srcs: [
+        "src/**/*.java"
+    ],
+    create_doc_stubs: true,
+    annotations_enabled: true,
+    api_levels_annotations_enabled: true,
+    api_levels_jar_filename: "android.car.jar",
+    api_levels_annotations_dirs: [
+        "sdk-dir",
+        "api-versions-jars-dir",
+    ],
+    previous_api: ":android-car-last-released-api",
+    merge_annotations_dirs: [
+        "metalava-manual",
+    ],
+    arg_files: [
+        "AndroidManifest.xml",
+    ],
+    // Add --verbose to print metalava details.
+    args: "--manifest $(location AndroidManifest.xml) " +
+          "--error UnhiddenSystemApi " +
+          "--hide RequiresPermission " +
+          "--hide CallbackInterface " +
+          "--hide MissingPermission " +
+          "--hide HiddenSuperclass --hide DeprecationMismatch --hide UnavailableSymbol " +
+          "--hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo " +
+          "--hide Todo --hide Typo ",
+    write_sdk_values: true,
+}
+
+// Generates API docs for go/devsite.
+droiddoc {
+    name: "ds-car-docs",
+    srcs: [
+        ":car-doc-stubs",
+    ],
+    libs: [
+        "stub-annotations",
+        "unsupportedappusage",
+    ],
+    custom_template: "droiddoc-templates-sdk",
+    // These variables that are used in doclava templates.
+    hdf: [
+        "dac true",
+        "sdk.preview 0", // Not a preview version.
+        "sdk.version 30",
+        "android.whichdoc online",
+        "android.hasSamples false",
+    ],
+    arg_files: [
+        "AndroidManifest.xml",
+    ],
+    proofread_file: "ds-sdk-docs-proofrerad.txt",
+    // See doclava docs in https://github.com/tinks/doclava.
+    // See error numbers in external/doclava/src/com/google/doclava/Errors.java.
+    // TODO: Add -werror -lerror to catch bad javadocs
+    args: "-android -manifest $(location AndroidManifest.xml) -toroot / -devsite -yamlV2 -metalavaApiSince " +
+        "-hide 111 -hide 113 -hide 125 -hide 126 -hide 127 -hide 128 " +
+        "-stubpackages android.car -dac_libraryroot android/car ",
+}
+
 java_library {
     name: "android.car-stubs",
     srcs: [
diff --git a/car-lib/src/android/car/VehiclePropertyIds.java b/car-lib/src/android/car/VehiclePropertyIds.java
index a9945da..644ea1e 100644
--- a/car-lib/src/android/car/VehiclePropertyIds.java
+++ b/car-lib/src/android/car/VehiclePropertyIds.java
@@ -129,7 +129,7 @@
     public static final int INFO_EXTERIOR_DIMENSIONS = 289472779;
     /**
      * Current odometer value of the vehicle
-     * Requires permission: {@link Car#PERMISSION_MILEAGE}.
+     * The property is protected by the signature permission: android.car.permission.CAR_MILEAGE.
      */
     @RequiresPermission(Car.PERMISSION_MILEAGE)
     public static final int PERF_ODOMETER = 291504644;
@@ -166,25 +166,29 @@
     public static final int PERF_REAR_STEERING_ANGLE = 291504656;
     /**
      * Temperature of engine coolant
-     * Requires permission: {@link Car#PERMISSION_CAR_ENGINE_DETAILED}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CAR_ENGINE_DETAILED.
      */
     @RequiresPermission(Car.PERMISSION_CAR_ENGINE_DETAILED)
     public static final int ENGINE_COOLANT_TEMP = 291504897;
     /**
      * Engine oil level
-     * Requires permission: {@link Car#PERMISSION_CAR_ENGINE_DETAILED}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CAR_ENGINE_DETAILED.
      */
     @RequiresPermission(Car.PERMISSION_CAR_ENGINE_DETAILED)
     public static final int ENGINE_OIL_LEVEL = 289407747;
     /**
      * Temperature of engine oil
-     * Requires permission: {@link Car#PERMISSION_CAR_ENGINE_DETAILED}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CAR_ENGINE_DETAILED.
      */
     @RequiresPermission(Car.PERMISSION_CAR_ENGINE_DETAILED)
     public static final int ENGINE_OIL_TEMP = 291504900;
     /**
      * Engine rpm
-     * Requires permission: {@link Car#PERMISSION_CAR_ENGINE_DETAILED}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CAR_ENGINE_DETAILED.
      */
     @RequiresPermission(Car.PERMISSION_CAR_ENGINE_DETAILED)
     public static final int ENGINE_RPM = 291504901;
@@ -203,7 +207,8 @@
     /**
      * Fuel door open
      * Requires permission: {@link Car#PERMISSION_ENERGY_PORTS} to read the property.
-     * Requires permission: {@link Car#PERMISSION_CONTROL_ENERGY_PORTS} to control the property.
+     * Requires the signature permission: android.car.permission.CONTROL_CAR_ENERGY_PORTS to write
+     * the property.
      */
     @RequiresPermission.Read(@RequiresPermission(Car.PERMISSION_ENERGY_PORTS))
     @RequiresPermission.Write(@RequiresPermission(Car.PERMISSION_CONTROL_ENERGY_PORTS))
@@ -217,7 +222,8 @@
     /**
      * EV charge port open
      * Requires permission: {@link Car#PERMISSION_ENERGY_PORTS} to read the property.
-     * Requires permission: {@link Car#PERMISSION_CONTROL_ENERGY_PORTS} to control the property.
+     * Requires the signature permission: android.car.permission.CONTROL_CAR_ENERGY_PORTS to write
+     * the property.
      */
     @RequiresPermission.Read(@RequiresPermission(Car.PERMISSION_ENERGY_PORTS))
     @RequiresPermission.Write(@RequiresPermission(Car.PERMISSION_CONTROL_ENERGY_PORTS))
@@ -241,7 +247,8 @@
      * all energy sources in a vehicle.  For example, a hybrid car's range will
      * be the sum of the ranges based on fuel and battery.
      * Requires permission: {@link Car#PERMISSION_ENERGY} to read the property.
-     * Requires permission: {@link Car#PERMISSION_ADJUST_RANGE_REMAINING} to write the property.
+     * Requires the signature permission: android.car.permission.ADJUST_RANGE_REMAINING to write
+     * the property.
      */
     @RequiresPermission.Read(@RequiresPermission(Car.PERMISSION_ENERGY))
     @RequiresPermission.Write(@RequiresPermission(Car.PERMISSION_ADJUST_RANGE_REMAINING))
@@ -251,7 +258,7 @@
      *
      * min/max value indicates tire pressure sensor range.  Each tire will have a separate min/max
      * value denoted by its areaConfig.areaId.
-     * Requires permission: {@link Car#PERMISSION_TIRES}.
+     * The property is protected by the signature permission: android.car.permission.CAR_TIRES.
      */
     @RequiresPermission(Car.PERMISSION_TIRES)
     public static final int TIRE_PRESSURE = 392168201;
@@ -298,7 +305,8 @@
     public static final int NIGHT_MODE = 287310855;
     /**
      * State of the vehicles turn signals
-     * Requires permission: {@link Car#PERMISSION_EXTERIOR_LIGHTS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CAR_EXTERIOR_LIGHTS .
      */
     @RequiresPermission(Car.PERMISSION_EXTERIOR_LIGHTS)
     public static final int TURN_SIGNAL_STATE = 289408008;
@@ -310,109 +318,127 @@
     public static final int IGNITION_STATE = 289408009;
     /**
      * ABS is active
-     * Requires permission: {@link Car#PERMISSION_CAR_DYNAMICS_STATE}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CAR_DYNAMICS_STATE.
      */
     @RequiresPermission(Car.PERMISSION_CAR_DYNAMICS_STATE)
     public static final int ABS_ACTIVE = 287310858;
     /**
      * Traction Control is active
-     * Requires permission: {@link Car#PERMISSION_CAR_DYNAMICS_STATE}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CAR_DYNAMICS_STATE.
      */
     @RequiresPermission(Car.PERMISSION_CAR_DYNAMICS_STATE)
     public static final int TRACTION_CONTROL_ACTIVE = 287310859;
     /**
      * Fan speed setting
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_CLIMATE}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_CLIMATE.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_CLIMATE)
     public static final int HVAC_FAN_SPEED = 356517120;
     /**
      * Fan direction setting
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_CLIMATE}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_CLIMATE.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_CLIMATE)
     public static final int HVAC_FAN_DIRECTION = 356517121;
     /**
      * HVAC current temperature.
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_CLIMATE}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_CLIMATE.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_CLIMATE)
     public static final int HVAC_TEMPERATURE_CURRENT = 358614274;
     /**
      * HVAC, target temperature set.
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_CLIMATE}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_CLIMATE.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_CLIMATE)
     public static final int HVAC_TEMPERATURE_SET = 358614275;
     /**
      * On/off defrost for designated window
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_CLIMATE}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_CLIMATE.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_CLIMATE)
     public static final int HVAC_DEFROSTER = 320865540;
     /**
      * On/off AC for designated areaId
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_CLIMATE}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_CLIMATE.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_CLIMATE)
     public static final int HVAC_AC_ON = 354419973;
     /**
      * On/off max AC
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_CLIMATE}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_CLIMATE.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_CLIMATE)
     public static final int HVAC_MAX_AC_ON = 354419974;
     /**
      * On/off max defrost
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_CLIMATE}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_CLIMATE.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_CLIMATE)
     public static final int HVAC_MAX_DEFROST_ON = 354419975;
     /**
      * Recirculation on/off
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_CLIMATE}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_CLIMATE.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_CLIMATE)
     public static final int HVAC_RECIRC_ON = 354419976;
     /**
      * Enable temperature coupling between areas.
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_CLIMATE}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_CLIMATE.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_CLIMATE)
     public static final int HVAC_DUAL_ON = 354419977;
     /**
      * On/off automatic mode
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_CLIMATE}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_CLIMATE.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_CLIMATE)
     public static final int HVAC_AUTO_ON = 354419978;
     /**
      * Seat heating/cooling
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_CLIMATE}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_CLIMATE.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_CLIMATE)
     public static final int HVAC_SEAT_TEMPERATURE = 356517131;
     /**
      * Side Mirror Heat
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_CLIMATE}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_CLIMATE.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_CLIMATE)
     public static final int HVAC_SIDE_MIRROR_HEAT = 339739916;
     /**
      * Steering Wheel Heating/Cooling
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_CLIMATE}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_CLIMATE.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_CLIMATE)
     public static final int HVAC_STEERING_WHEEL_HEAT = 289408269;
     /**
      * Temperature units for display
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_CLIMATE}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_CLIMATE.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_CLIMATE)
     public static final int HVAC_TEMPERATURE_DISPLAY_UNITS = 289408270;
     /**
      * Actual fan speed
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_CLIMATE}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_CLIMATE.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_CLIMATE)
     public static final int HVAC_ACTUAL_FAN_SPEED_RPM = 356517135;
@@ -423,31 +449,36 @@
      * properties that control individual HVAC features/subsystems to AVAILABLE
      * state (unless any/all of them are UNAVAILABLE on their own individual
      * merits).
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_CLIMATE}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_CLIMATE.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_CLIMATE)
     public static final int HVAC_POWER_ON = 354419984;
     /**
      * Fan Positions Available
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_CLIMATE}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_CLIMATE.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_CLIMATE)
     public static final int HVAC_FAN_DIRECTION_AVAILABLE = 356582673;
     /**
      * Automatic recirculation on/off
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_CLIMATE}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_CLIMATE.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_CLIMATE)
     public static final int HVAC_AUTO_RECIRC_ON = 354419986;
     /**
      * Seat ventilation
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_CLIMATE}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_CLIMATE.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_CLIMATE)
     public static final int HVAC_SEAT_VENTILATION = 356517139;
     /**
      * ELECTRIC DEFROSTER
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_CLIMATE}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_CLIMATE.
      * @hide
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_CLIMATE)
@@ -455,8 +486,8 @@
     /**
      * Distance units for display
      * Requires permission {@link Car#PERMISSION_READ_DISPLAY_UNITS} to read the property.
-     * Requires permission {@link Car#PERMISSION_CONTROL_DISPLAY_UNITS} and
-     * {@link Car#PERMISSION_VENDOR_EXTENSION}to write the property.
+     * Requires two signature permissions: android.car.permission.CONTROL_CAR_DISPLAY_UNITS and
+     * android.car.permission.CAR_VENDOR_EXTENSION to write the property.
      */
     @RequiresPermission.Read(@RequiresPermission(Car.PERMISSION_READ_DISPLAY_UNITS))
     @RequiresPermission.Write(@RequiresPermission(allOf = {Car.PERMISSION_CONTROL_DISPLAY_UNITS,
@@ -465,8 +496,8 @@
     /**
      * Fuel volume units for display
      * Requires permission {@link Car#PERMISSION_READ_DISPLAY_UNITS} to read the property.
-     * Requires permission {@link Car#PERMISSION_CONTROL_DISPLAY_UNITS}
-     * and {@link Car#PERMISSION_VENDOR_EXTENSION}to write the property.
+     * Requires two signature permissions: android.car.permission.CONTROL_CAR_DISPLAY_UNITS and
+     * android.car.permission.CAR_VENDOR_EXTENSION to write the property.
      */
     @RequiresPermission.Read(@RequiresPermission(Car.PERMISSION_READ_DISPLAY_UNITS))
     @RequiresPermission.Write(@RequiresPermission(allOf = {Car.PERMISSION_CONTROL_DISPLAY_UNITS,
@@ -475,8 +506,8 @@
     /**
      * Tire pressure units for display
      * Requires permission {@link Car#PERMISSION_READ_DISPLAY_UNITS} to read the property.
-     * Requires permission {@link Car#PERMISSION_CONTROL_DISPLAY_UNITS} and
-     * {@link Car#PERMISSION_VENDOR_EXTENSION}to write the property.
+     * Requires two signature permissions: android.car.permission.CONTROL_CAR_DISPLAY_UNITS and
+     * android.car.permission.CAR_VENDOR_EXTENSION to write the property.
      */
     @RequiresPermission.Read(@RequiresPermission(Car.PERMISSION_READ_DISPLAY_UNITS))
     @RequiresPermission.Write(@RequiresPermission(allOf = {Car.PERMISSION_CONTROL_DISPLAY_UNITS,
@@ -485,8 +516,8 @@
     /**
      * EV battery units for display
      * Requires permission {@link Car#PERMISSION_READ_DISPLAY_UNITS} to read the property.
-     * Requires permission {@link Car#PERMISSION_CONTROL_DISPLAY_UNITS} and
-     * {@link Car#PERMISSION_VENDOR_EXTENSION}to write the property.
+     * Requires two signature permissions: android.car.permission.CONTROL_CAR_DISPLAY_UNITS and
+     * android.car.permission.CAR_VENDOR_EXTENSION to write the property.
      */
     @RequiresPermission.Read(@RequiresPermission(Car.PERMISSION_READ_DISPLAY_UNITS))
     @RequiresPermission.Write(@RequiresPermission(allOf = {Car.PERMISSION_CONTROL_DISPLAY_UNITS,
@@ -495,8 +526,8 @@
     /**
      * Speed Units for display
      * Requires permission {@link Car#PERMISSION_READ_DISPLAY_UNITS} to read the property.
-     * Requires permission {@link Car#PERMISSION_CONTROL_DISPLAY_UNITS} and
-     * {@link Car#PERMISSION_VENDOR_EXTENSION}to write the property.
+     * Requires two signature permissions: android.car.permission.CONTROL_CAR_DISPLAY_UNITS and
+     * android.car.permission.CAR_VENDOR_EXTENSION to write the property.
      * @hide
      */
     @RequiresPermission.Read(@RequiresPermission(Car.PERMISSION_READ_DISPLAY_UNITS))
@@ -506,8 +537,8 @@
     /**
      * Fuel consumption units for display
      * Requires permission {@link Car#PERMISSION_READ_DISPLAY_UNITS} to read the property.
-     * Requires permission {@link Car#PERMISSION_CONTROL_DISPLAY_UNITS} and
-     * {@link Car#PERMISSION_VENDOR_EXTENSION}to write the property.
+     * Requires two signature permissions: android.car.permission.CONTROL_CAR_DISPLAY_UNITS and
+     * android.car.permission.CAR_VENDOR_EXTENSION to write the property.
      */
     @RequiresPermission.Read(@RequiresPermission(Car.PERMISSION_READ_DISPLAY_UNITS))
     @RequiresPermission.Write(@RequiresPermission(allOf = {Car.PERMISSION_CONTROL_DISPLAY_UNITS,
@@ -524,7 +555,7 @@
      *
      * It is assumed that AP's power state is controller by separate power
      * controller.
-     * Requires permission: {@link Car#PERMISSION_CAR_POWER}.
+     * The property is protected by the signature permission: android.car.permission.CAR_POWER.
      */
     @RequiresPermission(Car.PERMISSION_CAR_POWER)
     public static final int AP_POWER_STATE_REQ = 289475072;
@@ -533,7 +564,7 @@
      *
      * It is assumed that AP's power state is controller by separate power
      * controller.
-     * Requires permission: {@link Car#PERMISSION_CAR_POWER}.
+     * The property is protected by the signature permission: android.car.permission.CAR_POWER.
      */
     @RequiresPermission(Car.PERMISSION_CAR_POWER)
     public static final int AP_POWER_STATE_REPORT = 289475073;
@@ -543,7 +574,7 @@
      * off. For example, even if user presses power on button after automatic
      * power on with door unlock, bootup reason must stay with
      * VehicleApPowerBootupReason#USER_UNLOCK.
-     * Requires permission: {@link Car#PERMISSION_CAR_POWER}.
+     * The property is protected by the signature permission: android.car.permission.CAR_POWER.
      */
     @RequiresPermission(Car.PERMISSION_CAR_POWER)
     public static final int AP_POWER_BOOTUP_REASON = 289409538;
@@ -551,7 +582,7 @@
      * Property to represent brightness of the display. Some cars have single
      * control for the brightness of all displays and this property is to share
      * change in that control.
-     * Requires permission: {@link Car#PERMISSION_CAR_POWER}.
+     * The property is protected by the signature permission: android.car.permission.CAR_POWER.
      */
     @RequiresPermission(Car.PERMISSION_CAR_POWER)
     public static final int DISPLAY_BRIGHTNESS = 289409539;
@@ -564,55 +595,64 @@
      *
      * This is an integer in case a door may be set to a particular position.
      * Max value indicates fully open, min value (0) indicates fully closed.
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_DOORS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_DOORS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_DOORS)
     public static final int DOOR_POS = 373295872;
     /**
      * Door move
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_DOORS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_DOORS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_DOORS)
     public static final int DOOR_MOVE = 373295873;
     /**
      * Door lock
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_DOORS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_DOORS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_DOORS)
     public static final int DOOR_LOCK = 371198722;
     /**
      * Mirror Z Position
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_MIRRORS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_MIRRORS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_MIRRORS)
     public static final int MIRROR_Z_POS = 339741504;
     /**
      * Mirror Z Move
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_MIRRORS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_MIRRORS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_MIRRORS)
     public static final int MIRROR_Z_MOVE = 339741505;
     /**
      * Mirror Y Position
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_MIRRORS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_MIRRORS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_MIRRORS)
     public static final int MIRROR_Y_POS = 339741506;
     /**
      * Mirror Y Move
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_MIRRORS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_MIRRORS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_MIRRORS)
     public static final int MIRROR_Y_MOVE = 339741507;
     /**
      * Mirror Lock
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_MIRRORS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_MIRRORS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_MIRRORS)
     public static final int MIRROR_LOCK = 287312708;
     /**
      * Mirror Fold
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_MIRRORS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_MIRRORS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_MIRRORS)
     public static final int MIRROR_FOLD = 287312709;
@@ -622,7 +662,8 @@
      * This parameter selects the memory preset to use to select the seat
      * position. The minValue is always 0, and the maxValue determines the
      * number of seat positions available.
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_SEATS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_SEATS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_SEATS)
     public static final int SEAT_MEMORY_SELECT = 356518784;
@@ -632,7 +673,8 @@
      * This setting allows the user to save the current seat position settings
      * into the selected preset slot.  The maxValue for each seat position
      * must match the maxValue for SEAT_MEMORY_SELECT.
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_SEATS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_SEATS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_SEATS)
     public static final int SEAT_MEMORY_SET = 356518785;
@@ -640,37 +682,43 @@
      * Seatbelt buckled
      *
      * True indicates belt is buckled.
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_SEATS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_SEATS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_SEATS)
     public static final int SEAT_BELT_BUCKLED = 354421634;
     /**
      * Seatbelt height position
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_SEATS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_SEATS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_SEATS)
     public static final int SEAT_BELT_HEIGHT_POS = 356518787;
     /**
      * Seatbelt height move
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_SEATS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_SEATS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_SEATS)
     public static final int SEAT_BELT_HEIGHT_MOVE = 356518788;
     /**
      * Seat fore/aft position
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_SEATS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_SEATS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_SEATS)
     public static final int SEAT_FORE_AFT_POS = 356518789;
     /**
      * Seat fore/aft move
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_SEATS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_SEATS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_SEATS)
     public static final int SEAT_FORE_AFT_MOVE = 356518790;
     /**
      * Seat backrest angle 1 position
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_SEATS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_SEATS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_SEATS)
     public static final int SEAT_BACKREST_ANGLE_1_POS = 356518791;
@@ -678,146 +726,169 @@
      * Seat backrest angle 1 move
      *
      * Moves the backrest forward or recline.
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_SEATS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_SEATS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_SEATS)
     public static final int SEAT_BACKREST_ANGLE_1_MOVE = 356518792;
     /**
      * Seat backrest angle 2 position
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_SEATS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_SEATS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_SEATS)
     public static final int SEAT_BACKREST_ANGLE_2_POS = 356518793;
     /**
      * Seat backrest angle 2 move
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_SEATS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_SEATS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_SEATS)
     public static final int SEAT_BACKREST_ANGLE_2_MOVE = 356518794;
     /**
      * Seat height position
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_SEATS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_SEATS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_SEATS)
     public static final int SEAT_HEIGHT_POS = 356518795;
     /**
      * Seat height move
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_SEATS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_SEATS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_SEATS)
     public static final int SEAT_HEIGHT_MOVE = 356518796;
     /**
      * Seat depth position
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_SEATS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_SEATS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_SEATS)
     public static final int SEAT_DEPTH_POS = 356518797;
     /**
      * Seat depth move
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_SEATS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_SEATS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_SEATS)
     public static final int SEAT_DEPTH_MOVE = 356518798;
     /**
      * Seat tilt position
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_SEATS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_SEATS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_SEATS)
     public static final int SEAT_TILT_POS = 356518799;
     /**
      * Seat tilt move
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_SEATS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_SEATS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_SEATS)
     public static final int SEAT_TILT_MOVE = 356518800;
     /**
      * Lumber fore/aft position
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_SEATS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_SEATS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_SEATS)
     public static final int SEAT_LUMBAR_FORE_AFT_POS = 356518801;
     /**
      * Lumbar fore/aft move
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_SEATS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_SEATS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_SEATS)
     public static final int SEAT_LUMBAR_FORE_AFT_MOVE = 356518802;
     /**
      * Lumbar side support position
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_SEATS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_SEATS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_SEATS)
     public static final int SEAT_LUMBAR_SIDE_SUPPORT_POS = 356518803;
     /**
      * Lumbar side support move
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_SEATS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_SEATS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_SEATS)
     public static final int SEAT_LUMBAR_SIDE_SUPPORT_MOVE = 356518804;
     /**
      * Headrest height position
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_SEATS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_SEATS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_SEATS)
     public static final int SEAT_HEADREST_HEIGHT_POS = 289409941;
     /**
      * Headrest height move
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_SEATS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_SEATS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_SEATS)
     public static final int SEAT_HEADREST_HEIGHT_MOVE = 356518806;
     /**
      * Headrest angle position
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_SEATS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_SEATS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_SEATS)
     public static final int SEAT_HEADREST_ANGLE_POS = 356518807;
     /**
      * Headrest angle move
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_SEATS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_SEATS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_SEATS)
     public static final int SEAT_HEADREST_ANGLE_MOVE = 356518808;
     /**
      * Headrest fore/aft position
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_SEATS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_SEATS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_SEATS)
     public static final int SEAT_HEADREST_FORE_AFT_POS = 356518809;
     /**
      * Headrest fore/aft move
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_SEATS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_SEATS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_SEATS)
     public static final int SEAT_HEADREST_FORE_AFT_MOVE = 356518810;
     /**
      * Seat Occupancy
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_SEATS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_SEATS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_SEATS)
     public static final int SEAT_OCCUPANCY = 356518832;
     /**
      * Window Position
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_WINDOWS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_WINDOWS
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_WINDOWS)
     public static final int WINDOW_POS = 322964416;
     /**
      * Window Move
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_WINDOWS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_WINDOWS
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_WINDOWS)
     public static final int WINDOW_MOVE = 322964417;
     /**
      * Window Lock
-     * Requires permission: {@link Car#PERMISSION_CONTROL_CAR_WINDOWS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CONTROL_CAR_WINDOWS
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_CAR_WINDOWS)
     public static final int WINDOW_LOCK = 320867268;
     /**
      * Vehicle Maps Service (VMS) message
-     * Requires one of permissions in {@link Car#PERMISSION_VMS_PUBLISHER},
-     * {@link Car#PERMISSION_VMS_SUBSCRIBER}.
+     * The property is protected by the signature permissions:
+     * android.car.permission.VMS_PUBLISHER and android.car.permission.VMS_SUBSCRIBER.
      */
     @RequiresPermission(anyOf = {Car.PERMISSION_VMS_PUBLISHER, Car.PERMISSION_VMS_SUBSCRIBER})
     public static final int VEHICLE_MAP_SERVICE = 299895808;
@@ -825,7 +896,8 @@
      * OBD2 Live Sensor Data
      *
      * Reports a snapshot of the current (live) values of the OBD2 sensors available.
-     * Requires permission: {@link Car#PERMISSION_CAR_DIAGNOSTIC_READ_ALL}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CAR_DIAGNOSTICS.
      */
     @RequiresPermission(Car.PERMISSION_CAR_DIAGNOSTIC_READ_ALL)
     public static final int OBD2_LIVE_FRAME = 299896064;
@@ -834,13 +906,15 @@
      *
      * Reports a snapshot of the value of the OBD2 sensors available at the time that a fault
      * occurred and was detected.
-     * Requires permission: {@link Car#PERMISSION_CAR_DIAGNOSTIC_READ_ALL}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CAR_DIAGNOSTICS.
      */
     @RequiresPermission(Car.PERMISSION_CAR_DIAGNOSTIC_READ_ALL)
     public static final int OBD2_FREEZE_FRAME = 299896065;
     /**
      * OBD2 Freeze Frame Information
-     * Requires permission: {@link Car#PERMISSION_CAR_DIAGNOSTIC_READ_ALL}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CAR_DIAGNOSTICS.
      */
     @RequiresPermission(Car.PERMISSION_CAR_DIAGNOSTIC_READ_ALL)
     public static final int OBD2_FREEZE_FRAME_INFO = 299896066;
@@ -849,55 +923,64 @@
      *
      * This property allows deletion of any of the freeze frames stored in
      * vehicle memory, as described by OBD2_FREEZE_FRAME_INFO.
-     * Requires permission: {@link Car#PERMISSION_CAR_DIAGNOSTIC_CLEAR}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CLEAR_CAR_DIAGNOSTICS.
      */
     @RequiresPermission(Car.PERMISSION_CAR_DIAGNOSTIC_CLEAR)
     public static final int OBD2_FREEZE_FRAME_CLEAR = 299896067;
     /**
      * Headlights State
-     * Requires permission: {@link Car#PERMISSION_EXTERIOR_LIGHTS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CAR_EXTERIOR_LIGHTS.
      */
     @RequiresPermission(Car.PERMISSION_EXTERIOR_LIGHTS)
     public static final int HEADLIGHTS_STATE = 289410560;
     /**
      * High beam lights state
-     * Requires permission: {@link Car#PERMISSION_EXTERIOR_LIGHTS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CAR_EXTERIOR_LIGHTS.
      */
     @RequiresPermission(Car.PERMISSION_EXTERIOR_LIGHTS)
     public static final int HIGH_BEAM_LIGHTS_STATE = 289410561;
     /**
      * Fog light state
-     * Requires permission: {@link Car#PERMISSION_EXTERIOR_LIGHTS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CAR_EXTERIOR_LIGHTS.
      */
     @RequiresPermission(Car.PERMISSION_EXTERIOR_LIGHTS)
     public static final int FOG_LIGHTS_STATE = 289410562;
     /**
      * Hazard light status
-     * Requires permission: {@link Car#PERMISSION_EXTERIOR_LIGHTS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CAR_EXTERIOR_LIGHTS.
      */
     @RequiresPermission(Car.PERMISSION_EXTERIOR_LIGHTS)
     public static final int HAZARD_LIGHTS_STATE = 289410563;
     /**
      * Headlight switch
-     * Requires permission: {@link Car#PERMISSION_CONTROL_EXTERIOR_LIGHTS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CAR_EXTERIOR_LIGHTS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_EXTERIOR_LIGHTS)
     public static final int HEADLIGHTS_SWITCH = 289410576;
     /**
      * High beam light switch
-     * Requires permission: {@link Car#PERMISSION_CONTROL_EXTERIOR_LIGHTS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CAR_EXTERIOR_LIGHTS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_EXTERIOR_LIGHTS)
     public static final int HIGH_BEAM_LIGHTS_SWITCH = 289410577;
     /**
      * Fog light switch
-     * Requires permission: {@link Car#PERMISSION_CONTROL_EXTERIOR_LIGHTS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CAR_EXTERIOR_LIGHTS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_EXTERIOR_LIGHTS)
     public static final int FOG_LIGHTS_SWITCH = 289410578;
     /**
      * Hazard light switch
-     * Requires permission: {@link Car#PERMISSION_CONTROL_EXTERIOR_LIGHTS}.
+     * The property is protected by the signature permission:
+     * android.car.permission.CAR_EXTERIOR_LIGHTS.
      */
     @RequiresPermission(Car.PERMISSION_CONTROL_EXTERIOR_LIGHTS)
     public static final int HAZARD_LIGHTS_SWITCH = 289410579;
diff --git a/car-lib/src/android/car/hardware/CarPropertyConfig.java b/car-lib/src/android/car/hardware/CarPropertyConfig.java
index df7ac5f..96b0aa8 100644
--- a/car-lib/src/android/car/hardware/CarPropertyConfig.java
+++ b/car-lib/src/android/car/hardware/CarPropertyConfig.java
@@ -38,8 +38,6 @@
  * Represents general information about car property such as data type and min/max ranges for car
  * areas (if applicable). This class supposed to be immutable, parcelable and could be passed over.
  *
- * <p>Use {@link CarPropertyConfig#newBuilder} to create an instance of this class.
- *
  * @param <T> refer to Parcel#writeValue(Object) to get a list of all supported types. The class
  * should be visible to framework as default class loader is being used here.
  *
diff --git a/car-lib/src/android/car/hardware/CarSensorEvent.java b/car-lib/src/android/car/hardware/CarSensorEvent.java
index 3f33a8d..68ba9f5 100644
--- a/car-lib/src/android/car/hardware/CarSensorEvent.java
+++ b/car-lib/src/android/car/hardware/CarSensorEvent.java
@@ -24,13 +24,14 @@
  * data is stored in a sensor-type specific format in the object's float and byte arrays.
  *
  * To aid unmarshalling the object's data arrays, this class provides static nested classes and
- * conversion methods, for example {@link EnvironmentData} and {@link #getEnvironmentData}. The
- * conversion methods each have an optional data parameter which, if not null, will be used and
- * returned. This parameter should be used to avoid unnecessary object churn whenever possible.
- * Additionally, calling a conversion method on a CarSensorEvent object with an inappropriate type
- * will result in an {@code UnsupportedOperationException} being thrown.
+ * conversion methods. The conversion methods each have an optional data parameter which,
+ * if not null, will be used and returned. This parameter should be used to avoid unnecessary
+ * object churn whenever possible. Additionally, calling a conversion method on a CarSensorEvent
+ * object with an inappropriate type will result in an {@code UnsupportedOperationException}
+ * being thrown.
  *
- * @deprecated consider using {@link android.car.hardware.property.CarPropertyEvent} instead.
+ * @deprecated consider using {@link CarPropertyValue} and
+ * {@link android.car.hardware.property.CarPropertyManager} instead.
  */
 @Deprecated
 public class CarSensorEvent implements Parcelable {
diff --git a/car-lib/src/android/car/hardware/CarSensorManager.java b/car-lib/src/android/car/hardware/CarSensorManager.java
index d047aa1..b34e171 100644
--- a/car-lib/src/android/car/hardware/CarSensorManager.java
+++ b/car-lib/src/android/car/hardware/CarSensorManager.java
@@ -52,17 +52,14 @@
     /**
      * This sensor represents vehicle speed in m/s.
      * Sensor data in {@link CarSensorEvent} is a float which will be >= 0.
-     * This requires {@link Car#PERMISSION_SPEED} permission.
      */
     public static final int SENSOR_TYPE_CAR_SPEED                   = 0x11600207;
     /**
      * Represents engine RPM of the car. Sensor data in {@link CarSensorEvent} is a float.
-     * This requires {@link Car#PERMISSION_CAR_ENGINE_DETAILED} permission.
      */
     public static final int SENSOR_TYPE_RPM                         = 0x11600305;
     /**
      * Total travel distance of the car in Kilometer. Sensor data is a float.
-     * This requires {@link Car#PERMISSION_MILEAGE} permission.
      */
     public static final int SENSOR_TYPE_ODOMETER                    = 0x11600204;
     /**
@@ -138,12 +135,10 @@
     public static final int SENSOR_TYPE_WHEEL_TICK_DISTANCE         = 0x11510306;
     /**
      * Set to true when ABS is active.  This sensor is event driven.
-     * This requires {@link Car#PERMISSION_CAR_DYNAMICS_STATE} permission.
      */
     public static final int SENSOR_TYPE_ABS_ACTIVE                  = 0x1120040a;
     /**
      * Set to true when traction control is active.  This sensor is event driven.
-     * This requires {@link Car#PERMISSION_CAR_DYNAMICS_STATE} permission.
      */
     public static final int SENSOR_TYPE_TRACTION_CONTROL_ACTIVE     = 0x1120040b;
     /** @hide */
@@ -156,8 +151,8 @@
 
     /**
      * Indicates battery level of the car.
-     * In {@link CarSensorEvent}, represents battery level in WH.  floatValues[{@link
-     * CarSensorEvent#INDEX_EV_BATTERY_CAPACITY_ACTUAL}] represents the actual battery capacity in
+     * In {@link CarSensorEvent}, represents battery level in WH.  floatValues of
+     * INDEX_EV_BATTERY_CAPACITY_ACTUAL property represents the actual battery capacity in
      * WH.  The battery degrades over time, so this value is expected to drop slowly over the life
      * of the vehicle.
      * This requires {@link Car#PERMISSION_ENERGY} permission.
@@ -180,7 +175,6 @@
     public static final int SENSOR_TYPE_EV_BATTERY_CHARGE_RATE      = 0x1160030c;
     /**
      * Oil level sensor.
-     * This requires {@link Car#PERMISSION_CAR_ENGINE_DETAILED} permission
      */
     public static final int SENSOR_TYPE_ENGINE_OIL_LEVEL            = 0x11400303;
 
diff --git a/car-lib/src/android/car/user/UserRemovalResult.java b/car-lib/src/android/car/user/UserRemovalResult.java
index dbfd8a6..e76528b 100644
--- a/car-lib/src/android/car/user/UserRemovalResult.java
+++ b/car-lib/src/android/car/user/UserRemovalResult.java
@@ -72,11 +72,11 @@
     public static final int STATUS_USER_DOES_NOT_EXIST = CommonResults.LAST_COMMON_STATUS + 2;
 
     /**
-     * When user to remove is last admin user.
+     * When last admin user successfully removed.
      *
      * @hide
      */
-    public static final int STATUS_TARGET_USER_IS_LAST_ADMIN_USER =
+    public static final int STATUS_SUCCESSFUL_LAST_ADMIN_REMOVED =
             CommonResults.LAST_COMMON_STATUS + 3;
 
     /**
@@ -87,12 +87,12 @@
      *         {@link UserRemovalResult#STATUS_HAL_INTERNAL_FAILURE},
      *         {@link UserRemovalResult#STATUS_TARGET_USER_IS_CURRENT_USER},
      *         {@link UserRemovalResult#STATUS_USER_DOES_NOT_EXIST}, or
-     *         {@link UserRemovalResult#STATUS_TARGET_USER_IS_LAST_ADMIN_USER}.
+     *         {@link UserRemovalResult#STATUS_SUCCESSFUL_LAST_ADMIN_REMOVED}.
      */
     private final @Status int mStatus;
 
     public boolean isSuccess() {
-        return mStatus == STATUS_SUCCESSFUL;
+        return mStatus == STATUS_SUCCESSFUL || mStatus == STATUS_SUCCESSFUL_LAST_ADMIN_REMOVED;
     }
 
     // TODO(b/158195639): if you change any status constant, you need to manually assign its values
@@ -119,7 +119,7 @@
         STATUS_HAL_INTERNAL_FAILURE,
         STATUS_TARGET_USER_IS_CURRENT_USER,
         STATUS_USER_DOES_NOT_EXIST,
-        STATUS_TARGET_USER_IS_LAST_ADMIN_USER
+        STATUS_SUCCESSFUL_LAST_ADMIN_REMOVED
     })
     @Retention(RetentionPolicy.SOURCE)
     @DataClass.Generated.Member
@@ -139,8 +139,8 @@
                     return "STATUS_TARGET_USER_IS_CURRENT_USER";
             case STATUS_USER_DOES_NOT_EXIST:
                     return "STATUS_USER_DOES_NOT_EXIST";
-            case STATUS_TARGET_USER_IS_LAST_ADMIN_USER:
-                    return "STATUS_TARGET_USER_IS_LAST_ADMIN_USER";
+            case STATUS_SUCCESSFUL_LAST_ADMIN_REMOVED:
+                    return "STATUS_SUCCESSFUL_LAST_ADMIN_REMOVED";
             default: return Integer.toHexString(value);
         }
     }
@@ -156,14 +156,31 @@
      *           {@link UserRemovalResult#STATUS_HAL_INTERNAL_FAILURE},
      *           {@link UserRemovalResult#STATUS_TARGET_USER_IS_CURRENT_USER},
      *           {@link UserRemovalResult#STATUS_USER_DOES_NOT_EXIST}, or
-     *           {@link UserRemovalResult#STATUS_TARGET_USER_IS_LAST_ADMIN_USER}.
+     *           {@link UserRemovalResult#STATUS_SUCCESSFUL_LAST_ADMIN_REMOVED}.
      * @hide
      */
     @DataClass.Generated.Member
     public UserRemovalResult(
-            int status) {
+            @Status int status) {
         this.mStatus = status;
 
+        if (!(mStatus == STATUS_SUCCESSFUL)
+                && !(mStatus == STATUS_ANDROID_FAILURE)
+                && !(mStatus == STATUS_HAL_INTERNAL_FAILURE)
+                && !(mStatus == STATUS_TARGET_USER_IS_CURRENT_USER)
+                && !(mStatus == STATUS_USER_DOES_NOT_EXIST)
+                && !(mStatus == STATUS_SUCCESSFUL_LAST_ADMIN_REMOVED)) {
+            throw new java.lang.IllegalArgumentException(
+                    "status was " + mStatus + " but must be one of: "
+                            + "STATUS_SUCCESSFUL(" + STATUS_SUCCESSFUL + "), "
+                            + "STATUS_ANDROID_FAILURE(" + STATUS_ANDROID_FAILURE + "), "
+                            + "STATUS_HAL_INTERNAL_FAILURE(" + STATUS_HAL_INTERNAL_FAILURE + "), "
+                            + "STATUS_TARGET_USER_IS_CURRENT_USER(" + STATUS_TARGET_USER_IS_CURRENT_USER + "), "
+                            + "STATUS_USER_DOES_NOT_EXIST(" + STATUS_USER_DOES_NOT_EXIST + "), "
+                            + "STATUS_SUCCESSFUL_LAST_ADMIN_REMOVED(" + STATUS_SUCCESSFUL_LAST_ADMIN_REMOVED + ")");
+        }
+
+
         // onConstructed(); // You can define this method to get a callback
     }
 
@@ -175,10 +192,10 @@
      *         {@link UserRemovalResult#STATUS_HAL_INTERNAL_FAILURE},
      *         {@link UserRemovalResult#STATUS_TARGET_USER_IS_CURRENT_USER},
      *         {@link UserRemovalResult#STATUS_USER_DOES_NOT_EXIST}, or
-     *         {@link UserRemovalResult#STATUS_TARGET_USER_IS_LAST_ADMIN_USER}.
+     *         {@link UserRemovalResult#STATUS_SUCCESSFUL_LAST_ADMIN_REMOVED}.
      */
     @DataClass.Generated.Member
-    public int getStatus() {
+    public @Status int getStatus() {
         return mStatus;
     }
 
@@ -189,7 +206,7 @@
         // String fieldNameToString() { ... }
 
         return "UserRemovalResult { " +
-                "status = " + mStatus +
+                "status = " + statusToString(mStatus) +
         " }";
     }
 
@@ -217,6 +234,23 @@
 
         this.mStatus = status;
 
+        if (!(mStatus == STATUS_SUCCESSFUL)
+                && !(mStatus == STATUS_ANDROID_FAILURE)
+                && !(mStatus == STATUS_HAL_INTERNAL_FAILURE)
+                && !(mStatus == STATUS_TARGET_USER_IS_CURRENT_USER)
+                && !(mStatus == STATUS_USER_DOES_NOT_EXIST)
+                && !(mStatus == STATUS_SUCCESSFUL_LAST_ADMIN_REMOVED)) {
+            throw new java.lang.IllegalArgumentException(
+                    "status was " + mStatus + " but must be one of: "
+                            + "STATUS_SUCCESSFUL(" + STATUS_SUCCESSFUL + "), "
+                            + "STATUS_ANDROID_FAILURE(" + STATUS_ANDROID_FAILURE + "), "
+                            + "STATUS_HAL_INTERNAL_FAILURE(" + STATUS_HAL_INTERNAL_FAILURE + "), "
+                            + "STATUS_TARGET_USER_IS_CURRENT_USER(" + STATUS_TARGET_USER_IS_CURRENT_USER + "), "
+                            + "STATUS_USER_DOES_NOT_EXIST(" + STATUS_USER_DOES_NOT_EXIST + "), "
+                            + "STATUS_SUCCESSFUL_LAST_ADMIN_REMOVED(" + STATUS_SUCCESSFUL_LAST_ADMIN_REMOVED + ")");
+        }
+
+
         // onConstructed(); // You can define this method to get a callback
     }
 
@@ -235,10 +269,10 @@
     };
 
     @DataClass.Generated(
-            time = 1591259644931L,
+            time = 1600198487158L,
             codegenVersion = "1.0.15",
             sourceFile = "packages/services/Car/car-lib/src/android/car/user/UserRemovalResult.java",
-            inputSignatures = "public static final  int STATUS_SUCCESSFUL\npublic static final  int STATUS_ANDROID_FAILURE\npublic static final  int STATUS_HAL_INTERNAL_FAILURE\npublic static final  int STATUS_TARGET_USER_IS_CURRENT_USER\npublic static final  int STATUS_USER_DOES_NOT_EXIST\npublic static final  int STATUS_TARGET_USER_IS_LAST_ADMIN_USER\nprivate final  int mStatus\npublic  boolean isSuccess()\nclass UserRemovalResult extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genToString=true, genHiddenConstructor=true, genHiddenConstDefs=true)")
+            inputSignatures = "public static final  int STATUS_SUCCESSFUL\npublic static final  int STATUS_ANDROID_FAILURE\npublic static final  int STATUS_HAL_INTERNAL_FAILURE\npublic static final  int STATUS_TARGET_USER_IS_CURRENT_USER\npublic static final  int STATUS_USER_DOES_NOT_EXIST\npublic static final  int STATUS_SUCCESSFUL_LAST_ADMIN_REMOVED\nprivate final @android.car.user.UserRemovalResult.Status int mStatus\npublic  boolean isSuccess()\nclass UserRemovalResult extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genToString=true, genHiddenConstructor=true, genHiddenConstDefs=true)")
     @Deprecated
     private void __metadata() {}
 
diff --git a/car-lib/src/android/car/vms/VmsClient.java b/car-lib/src/android/car/vms/VmsClient.java
index a941909..9e9e6d0 100644
--- a/car-lib/src/android/car/vms/VmsClient.java
+++ b/car-lib/src/android/car/vms/VmsClient.java
@@ -154,10 +154,7 @@
     }
 
     /**
-     * Disables the monitoring of Vehicle Map Service packets by this client.
-     *
-     * <p>If monitoring is disabled, this client will receive only packets for its subscriptions.
-     * Disabling monitoring does not affect the client's existing subscriptions.
+     * Returns the current monitoring state of the client.
      */
     @RequiresPermission(Car.PERMISSION_VMS_SUBSCRIBER)
     public boolean isMonitoringEnabled() {
diff --git a/car-lib/src/android/car/watchdog/CarWatchdogManager.java b/car-lib/src/android/car/watchdog/CarWatchdogManager.java
index d8fb7d9..301e3b6 100644
--- a/car-lib/src/android/car/watchdog/CarWatchdogManager.java
+++ b/car-lib/src/android/car/watchdog/CarWatchdogManager.java
@@ -23,7 +23,6 @@
 import android.annotation.NonNull;
 import android.annotation.RequiresPermission;
 import android.annotation.SystemApi;
-import android.automotive.watchdog.ICarWatchdogClient;
 import android.car.Car;
 import android.car.CarManagerBase;
 import android.os.Handler;
@@ -318,7 +317,7 @@
     }
 
     /** @hide */
-    private static final class ICarWatchdogClientImpl extends ICarWatchdogClient.Stub {
+    private static final class ICarWatchdogClientImpl extends ICarWatchdogServiceCallback.Stub {
         private final WeakReference<CarWatchdogManager> mManager;
 
         private ICarWatchdogClientImpl(CarWatchdogManager manager) {
@@ -326,7 +325,7 @@
         }
 
         @Override
-        public void checkIfAlive(int sessionId, int timeout) {
+        public void onCheckHealthStatus(int sessionId, int timeout) {
             CarWatchdogManager manager = mManager.get();
             if (manager != null) {
                 manager.checkClientStatus(sessionId, timeout);
@@ -334,22 +333,12 @@
         }
 
         @Override
-        public void prepareProcessTermination() {
+        public void onPrepareProcessTermination() {
             CarWatchdogManager manager = mManager.get();
             if (manager != null) {
                 manager.notifyProcessTermination();
             }
         }
-
-        @Override
-        public int getInterfaceVersion() {
-            return this.VERSION;
-        }
-
-        @Override
-        public String getInterfaceHash() {
-            return this.HASH;
-        }
     }
 
     private final class SessionInfo {
diff --git a/car-lib/src/android/car/watchdog/ICarWatchdogService.aidl b/car-lib/src/android/car/watchdog/ICarWatchdogService.aidl
index 017e0e1..358e5e4 100644
--- a/car-lib/src/android/car/watchdog/ICarWatchdogService.aidl
+++ b/car-lib/src/android/car/watchdog/ICarWatchdogService.aidl
@@ -16,13 +16,12 @@
 
 package android.car.watchdog;
 
-import android.automotive.watchdog.ICarWatchdogClient;
-import android.automotive.watchdog.TimeoutLength;
+import android.car.watchdog.ICarWatchdogServiceCallback;
 
 /** @hide */
 interface ICarWatchdogService {
     // registerClient needs to get callingPid, so cannot be oneway.
-    void registerClient(in ICarWatchdogClient client, in TimeoutLength timeout);
-    void unregisterClient(in ICarWatchdogClient client);
-    void tellClientAlive(in ICarWatchdogClient client, in int sessionId);
+    void registerClient(in ICarWatchdogServiceCallback client, in int timeout);
+    void unregisterClient(in ICarWatchdogServiceCallback client);
+    void tellClientAlive(in ICarWatchdogServiceCallback client, in int sessionId);
 }
diff --git a/car-lib/src/android/car/watchdog/ICarWatchdogServiceCallback.aidl b/car-lib/src/android/car/watchdog/ICarWatchdogServiceCallback.aidl
new file mode 100644
index 0000000..9d1fd8a
--- /dev/null
+++ b/car-lib/src/android/car/watchdog/ICarWatchdogServiceCallback.aidl
@@ -0,0 +1,23 @@
+/*
+ * 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.car.watchdog;
+
+/** @hide */
+oneway interface ICarWatchdogServiceCallback {
+    void onCheckHealthStatus(in int sessionId, in int timeout);
+    void onPrepareProcessTermination();
+}
diff --git a/car-maps-placeholder/res/values-ar/strings.xml b/car-maps-placeholder/res/values-ar/strings.xml
index ccb8e52..8fa36a4 100644
--- a/car-maps-placeholder/res/values-ar/strings.xml
+++ b/car-maps-placeholder/res/values-ar/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">"خرائط Google"</string>
     <string name="error_text" msgid="5575174711944349180">"لم يتم تثبيت تطبيقات خرائط. يُرجى التواصل مع الشركة المصنّعة للسيارة."</string>
 </resources>
diff --git a/car-maps-placeholder/res/values-ca/strings.xml b/car-maps-placeholder/res/values-ca/strings.xml
index cd33f37..b516190 100644
--- a/car-maps-placeholder/res/values-ca/strings.xml
+++ b/car-maps-placeholder/res/values-ca/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">"Mapes"</string>
+    <string name="app_name" msgid="6575346965016311017">"Maps"</string>
     <string name="error_text" msgid="5575174711944349180">"No hi ha cap aplicació de mapes instal·lada. Contacta amb el fabricant del cotxe."</string>
 </resources>
diff --git a/car-maps-placeholder/res/values-de/strings.xml b/car-maps-placeholder/res/values-de/strings.xml
index eb1e434..f5eef72 100644
--- a/car-maps-placeholder/res/values-de/strings.xml
+++ b/car-maps-placeholder/res/values-de/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">"Karten"</string>
+    <string name="app_name" msgid="6575346965016311017">"Maps"</string>
     <string name="error_text" msgid="5575174711944349180">"Keine Karten-App installiert. Bitte wende dich an den Autohersteller."</string>
 </resources>
diff --git a/car-maps-placeholder/res/values-eu/strings.xml b/car-maps-placeholder/res/values-eu/strings.xml
index 2bccc99..1cfccd3 100644
--- a/car-maps-placeholder/res/values-eu/strings.xml
+++ b/car-maps-placeholder/res/values-eu/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">"Mapak"</string>
+    <string name="app_name" msgid="6575346965016311017">"Maps"</string>
     <string name="error_text" msgid="5575174711944349180">"Ez dago mapa-aplikaziorik instalatuta. Jarri autoaren fabrikatzailearekin harremanetan."</string>
 </resources>
diff --git a/car-maps-placeholder/res/values-fi/strings.xml b/car-maps-placeholder/res/values-fi/strings.xml
index b4ddba7..4ebe066 100644
--- a/car-maps-placeholder/res/values-fi/strings.xml
+++ b/car-maps-placeholder/res/values-fi/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">"Kartat"</string>
+    <string name="app_name" msgid="6575346965016311017">"Maps"</string>
     <string name="error_text" msgid="5575174711944349180">"Karttasovellusta ei ole asennettu. Ota yhteyttä auton valmistajaan."</string>
 </resources>
diff --git a/car-maps-placeholder/res/values-gl/strings.xml b/car-maps-placeholder/res/values-gl/strings.xml
index f0763de..3451202 100644
--- a/car-maps-placeholder/res/values-gl/strings.xml
+++ b/car-maps-placeholder/res/values-gl/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">"Mapas"</string>
+    <string name="app_name" msgid="6575346965016311017">"Maps"</string>
     <string name="error_text" msgid="5575174711944349180">"Non se instalou a aplicación de mapas. Contacta co fabricante do coche."</string>
 </resources>
diff --git a/car-maps-placeholder/res/values-it/strings.xml b/car-maps-placeholder/res/values-it/strings.xml
index 539e817..141433e 100644
--- a/car-maps-placeholder/res/values-it/strings.xml
+++ b/car-maps-placeholder/res/values-it/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">"Mappe"</string>
+    <string name="app_name" msgid="6575346965016311017">"Maps"</string>
     <string name="error_text" msgid="5575174711944349180">"Nessuna app di mappe installata. Contatta il produttore dell\'auto."</string>
 </resources>
diff --git a/car-maps-placeholder/res/values-lv/strings.xml b/car-maps-placeholder/res/values-lv/strings.xml
index 842e0f8..44ae610 100644
--- a/car-maps-placeholder/res/values-lv/strings.xml
+++ b/car-maps-placeholder/res/values-lv/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">"Kartes"</string>
+    <string name="app_name" msgid="6575346965016311017">"Maps"</string>
     <string name="error_text" msgid="5575174711944349180">"Nav instalēta neviena karšu lietojumprogramma. Sazinieties ar automašīnas ražotāju."</string>
 </resources>
diff --git a/car-maps-placeholder/res/values-my/strings.xml b/car-maps-placeholder/res/values-my/strings.xml
index 88a1273..6961823 100644
--- a/car-maps-placeholder/res/values-my/strings.xml
+++ b/car-maps-placeholder/res/values-my/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-nb/strings.xml b/car-maps-placeholder/res/values-nb/strings.xml
index e081913..9b6cf65 100644
--- a/car-maps-placeholder/res/values-nb/strings.xml
+++ b/car-maps-placeholder/res/values-nb/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">"Kart"</string>
+    <string name="app_name" msgid="6575346965016311017">"Maps"</string>
     <string name="error_text" msgid="5575174711944349180">"Ingen kartapper er installert. Kontakt bilprodusenten."</string>
 </resources>
diff --git a/car-maps-placeholder/res/values-sq/strings.xml b/car-maps-placeholder/res/values-sq/strings.xml
index c7f1b9d..6ff0a14 100644
--- a/car-maps-placeholder/res/values-sq/strings.xml
+++ b/car-maps-placeholder/res/values-sq/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">"Hartat"</string>
+    <string name="app_name" msgid="6575346965016311017">"Maps"</string>
     <string name="error_text" msgid="5575174711944349180">"Nuk ka asnjë aplikacion të hartave të instaluar. Kontakto me prodhuesin e makinës."</string>
 </resources>
diff --git a/car-maps-placeholder/res/values-sv/strings.xml b/car-maps-placeholder/res/values-sv/strings.xml
index 5dc6bda..3b36f71 100644
--- a/car-maps-placeholder/res/values-sv/strings.xml
+++ b/car-maps-placeholder/res/values-sv/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">"Kartor"</string>
+    <string name="app_name" msgid="6575346965016311017">"Maps"</string>
     <string name="error_text" msgid="5575174711944349180">"Ingen kartapp har installerats. Kontakta bilens tillverkare."</string>
 </resources>
diff --git a/car-maps-placeholder/res/values-vi/strings.xml b/car-maps-placeholder/res/values-vi/strings.xml
index 71b52d1..b5fb349 100644
--- a/car-maps-placeholder/res/values-vi/strings.xml
+++ b/car-maps-placeholder/res/values-vi/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">"Bản đồ"</string>
+    <string name="app_name" msgid="6575346965016311017">"Maps"</string>
     <string name="error_text" msgid="5575174711944349180">"Chưa cài đặt ứng dụng bản đồ nào. Vui lòng liên hệ với nhà sản xuất ô tô của bạn."</string>
 </resources>
diff --git a/car-usb-handler/res/values-eu/strings.xml b/car-usb-handler/res/values-eu/strings.xml
index 2b2b720..f4cda5b 100644
--- a/car-usb-handler/res/values-eu/strings.xml
+++ b/car-usb-handler/res/values-eu/strings.xml
@@ -24,7 +24,7 @@
     <string name="usb_pref_delete_cancel" msgid="5999791462730255929">"Utzi"</string>
     <string name="usb_resolving_handlers" msgid="1943100136172948686">"Kudeatzaile bateragarriak eskuratzen"</string>
     <string name="usb_unknown_device" msgid="4211439272338937095">"USB bidezko gailu ezezaguna"</string>
-    <string name="usb_boot_service_notification" msgid="8519949189071048797">"USB gailuak aztertzen"</string>
+    <string name="usb_boot_service_notification" msgid="8519949189071048797">"USB bidezko gailuak aztertzen"</string>
   <string-array name="config_AoapIncompatibleDeviceIds">
     <item msgid="4267974637522344258">"18d1:9302"</item>
   </string-array>
diff --git a/car-usb-handler/res/values-kn/strings.xml b/car-usb-handler/res/values-kn/strings.xml
index 4203cbf..de05cc2 100644
--- a/car-usb-handler/res/values-kn/strings.xml
+++ b/car-usb-handler/res/values-kn/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="6963366455471441257">"ಯುಎಸ್‌ಬಿ ಹಾಂಡ್ಲರ್"</string>
     <string name="usb_saved_devices" msgid="2829442070749964872">"ಉಳಿಸಲಾದ ಸಾಧನಗಳು"</string>
-    <string name="usb_pref_delete_title" msgid="3885061814853467483">"ಯುಎಸ್‌ಬಿ ಡ್ರೈವ್ ಅನ್ನು ನಿರ್ವಹಿಸುವ ಆಪ್ ಅನ್ನು ತೆಗೆ"</string>
-    <string name="usb_pref_delete_message" msgid="5849493572520646218">"ನೀವು ಖಂಡಿತವಾಗಿಯೂ %1$s ಕ್ಕೆ ಪೂರ್ವನಿಯೋಜಿತ ಆಪ್ ಅನ್ನು ಅಳಿಸಲು ಅಳಿಸಲು ಬಯಸುತ್ತೀರಾ?"</string>
+    <string name="usb_pref_delete_title" msgid="3885061814853467483">"ಯುಎಸ್‌ಬಿ ಡ್ರೈವ್ ಅನ್ನು ನಿರ್ವಹಿಸುವ ಆ್ಯಪ್‍‍ ಅನ್ನು ತೆಗೆಯಿರಿ"</string>
+    <string name="usb_pref_delete_message" msgid="5849493572520646218">"ನೀವು ಖಂಡಿತವಾಗಿಯೂ %1$s ಕ್ಕೆ ಪೂರ್ವನಿಯೋಜಿತ ಆ್ಯಪ್‍‍ ಅನ್ನು ಅಳಿಸಲು ಬಯಸುತ್ತೀರಾ?"</string>
     <string name="usb_pref_delete_yes" msgid="7803356145103146036">"ಹೌದು"</string>
     <string name="usb_pref_delete_cancel" msgid="5999791462730255929">"ರದ್ದುಗೊಳಿಸಿ"</string>
     <string name="usb_resolving_handlers" msgid="1943100136172948686">"ಬೆಂಬಲಿತ ಹ್ಯಾಂಡ್‌ಲರ್‌ಗಳನ್ನು ಪಡೆಯುತ್ತಿದ್ದೇವೆ"</string>
diff --git a/car-usb-handler/src/android/car/usb/handler/AoapServiceManager.java b/car-usb-handler/src/android/car/usb/handler/AoapServiceManager.java
index 04bef87..f0656aa 100644
--- a/car-usb-handler/src/android/car/usb/handler/AoapServiceManager.java
+++ b/car-usb-handler/src/android/car/usb/handler/AoapServiceManager.java
@@ -55,9 +55,7 @@
 
     private static final int MSG_DISCONNECT = 1;
     private static final int DISCONNECT_DELAY_MS = 30000;
-
-    private static final int INVOCATION_TIMEOUT_MS = 5000;
-
+    private static final int INVOCATION_TIMEOUT_MS = 20000;
 
     private final HashMap<ComponentName, AoapServiceConnection> mConnections = new HashMap<>();
     private Context mContext;
diff --git a/car_product/build/car.mk b/car_product/build/car.mk
index 657bad9..456f7fd 100644
--- a/car_product/build/car.mk
+++ b/car_product/build/car.mk
@@ -21,8 +21,8 @@
 
 PRODUCT_PACKAGES += \
     Bluetooth \
+    CarActivityResolver \
     CarDeveloperOptions \
-    CompanionDeviceSupport \
     OneTimeInitializer \
     Provision \
     StatementService \
@@ -43,7 +43,6 @@
     DirectRenderingCluster \
     GarageModeTestApp \
     ExperimentalCarService \
-    RotaryPlayground \
     BugReportApp \
 
 # SEPolicy for test apps / services
@@ -86,6 +85,7 @@
 PRODUCT_PACKAGES += \
     CarFrameworkPackageStubs \
     CarService \
+    CarShell \
     CarDialerApp \
     CarRadioApp \
     OverviewApp \
diff --git a/car_product/build/car_base.mk b/car_product/build/car_base.mk
index a1b6534..531aa1e 100644
--- a/car_product/build/car_base.mk
+++ b/car_product/build/car_base.mk
@@ -17,7 +17,16 @@
 # Base platform for car builds
 # car packages should be added to car.mk instead of here
 
+ifeq ($(DISABLE_CAR_PRODUCT_CONFIG_OVERLAY),)
 PRODUCT_PACKAGE_OVERLAYS += packages/services/Car/car_product/overlay
+endif
+
+ifeq ($(DISABLE_CAR_PRODUCT_VISUAL_OVERLAY),)
+PRODUCT_PACKAGE_OVERLAYS += packages/services/Car/car_product/overlay-visual
+endif
+
+PRODUCT_COPY_FILES += \
+    packages/services/Car/car_product/build/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml \
 
 PRODUCT_PACKAGES += \
     com.android.wifi \
@@ -43,7 +52,6 @@
     MmsService \
     ExternalStorageProvider \
     atrace \
-    cameraserver \
     libandroidfw \
     libaudioutils \
     libmdnssd \
@@ -57,12 +65,16 @@
     car-bugreportd \
 
 # EVS resources
-PRODUCT_PACKAGES += android.automotive.evs.manager@1.0
+PRODUCT_PACKAGES += android.automotive.evs.manager@1.1
 # The following packages, or their vendor specific equivalents should be include in the device.mk
 #PRODUCT_PACKAGES += evs_app
 #PRODUCT_PACKAGES += evs_app_default_resources
 #PRODUCT_PACKAGES += android.hardware.automotive.evs@1.0-service
 
+# EVS manager overrides cameraserver on automotive implementations so
+# we need to configure Camera API to not connect to it
+PRODUCT_PROPERTY_OVERRIDES += config.disable_cameraservice=true
+
 # Device running Android is a car
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.type.automotive.xml:system/etc/permissions/android.hardware.type.automotive.xml
diff --git a/car_product/build/component-overrides.xml b/car_product/build/component-overrides.xml
new file mode 100644
index 0000000..510b2be
--- /dev/null
+++ b/car_product/build/component-overrides.xml
@@ -0,0 +1,96 @@
+<?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.
+-->
+
+<!--
+    This component-overrides.xml is used to enable the service by default
+    on car devices. Since Runtime Resource Overlays (RROs) can no longer change
+    the value of resources in manifest when read during PackagerParser.
+-->
+<config>
+<!--
+    The components mentioned under bluetooth are based on
+    packages/services/Car/car_product/overlay/packages/apps/Bluetooth/res/values/config.xml
+    and packages/apps/Bluetooth/AndroidManifest.xml
+-->
+    <component-override package="com.android.bluetooth" >
+        <!-- Disable source profiles (typically used in phone) -->
+        <!-- Controlled by profile_supported_a2dp -->
+        <component class=".a2dp.A2dpService" enabled="false" />
+
+        <!-- Controlled by profile_supported_avrcp_target -->
+        <component class=".avrcp.AvrcpTargetService" enabled="false" />
+
+        <!-- Controlled by profile_supported_hs_hfp -->
+        <component class=".hfp.HeadsetService" enabled="false" />
+
+        <!-- Controlled by profile_supported_hid_device -->
+        <component class=".hid.HidDeviceService" enabled="false" />
+
+        <!-- Controlled by profile_supported_hid_host -->
+        <component class=".hid.HidHostService" enabled="false" />
+
+        <!-- Controlled by profile_supported_pbap -->
+        <component class=".pbap.BluetoothPbapActivity" enabled="false" />
+        <component class=".pbap.BluetoothPbapService" enabled="false" />
+
+        <!-- Controlled by profile_supported_map -->
+        <component class=".map.BluetoothMapService" enabled="false" />
+        <component class=".map.BluetoothMapSettings" enabled="false" />
+
+        <!-- Controlled by profile_supported_opp -->
+        <component class=".opp.BluetoothOppService" enabled="false" />
+        <component class=".opp.BluetoothOppReceiver" enabled="false" />
+        <component class=".opp.BluetoothOppLauncherActivity" enabled="false" />
+        <component class=".opp.BluetoothOppBtEnableActivity" enabled="false" />
+        <component class=".opp.BluetoothOppBtEnablingActivity" enabled="false" />
+        <component class=".opp.BluetoothOppIncomingFileConfirmActivity" enabled="false" />
+        <component class=".opp.BluetoothOppTransferActivity" enabled="false" />
+        <component class=".opp.BluetoothOppTransferHistory" enabled="false" />
+
+        <!-- Controlled by profile_supported_sap -->
+        <component class=".sap.SapService" enabled="false" />
+        <!-- End for disabling-->
+
+        <!-- Enable sink profiles (typically used on a CarKitt) -->
+        <!-- Controlled by profile_supported_hfpclient -->
+        <component class=".hfpclient.HeadsetClientService" enabled="true" />
+
+        <!-- Controlled by hfp_client_connection_service_enabled -->
+        <component class=".hfpclient.connserv.HfpClientConnectionService" enabled="true" />
+
+        <!-- Controlled by profile_supported_avrcp_controller -->
+        <component class=".avrcpcontroller.AvrcpControllerService" enabled="true" />
+
+        <!-- Controlled by avrcp_controller_enable_cover_art -->
+        <component class=".avrcpcontroller.AvrcpCoverArtProvider" enabled="true" />
+
+        <!-- Controlled by profile_supported_a2dp_sink -->
+        <component class=".a2dpsink.A2dpSinkService" enabled="true" />
+        <component class=".avrcpcontroller.BluetoothMediaBrowserService" enabled="true" />
+        <component class=".BluetoothPrefs" enabled="true" />
+
+        <!-- Controlled by profile_supported_pbapclient -->
+        <component class=".pbapclient.PbapClientService" enabled="true" />
+        <component class=".pbapclient.AuthenticationService" enabled="true" />
+
+        <!-- Controlled by profile_supported_pan -->
+        <component class=".pan.PanService" enabled="true" />
+
+        <!-- Controlled by profile_supported_mapmce -->
+        <component class=".mapclient.MapClientService" enabled="true" />
+        <!-- End for enabling-->
+    </component-override>
+</config>
diff --git a/car_product/build/preinstalled-packages-product-car-base.xml b/car_product/build/preinstalled-packages-product-car-base.xml
index 0ed7b7f..2525000 100644
--- a/car_product/build/preinstalled-packages-product-car-base.xml
+++ b/car_product/build/preinstalled-packages-product-car-base.xml
@@ -26,6 +26,12 @@
         <install-in user-type="SYSTEM" />
     </install-in-user-type>
 
+    <!-- Failed to complete CtsShortcutHostTestCases if LocalTransport is not
+    installed for system user  -->
+    <install-in-user-type package="com.android.localtransport">
+        <install-in user-type="SYSTEM" />
+    </install-in-user-type>
+
 <!--
   Apps that need to run on SYSTEM and evaluated by package owner.
   Here the apps will have FULL and SYSTEM.
@@ -42,6 +48,10 @@
         <install-in user-type="FULL" />
         <install-in user-type="SYSTEM" />
     </install-in-user-type>
+        <install-in-user-type package="com.android.car.shell">
+        <install-in user-type="FULL" />
+        <install-in user-type="SYSTEM" />
+    </install-in-user-type>
     <install-in-user-type package="com.android.car.frameworkpackagestubs">
         <install-in user-type="FULL" />
         <install-in user-type="SYSTEM" />
@@ -272,6 +282,9 @@
     <install-in-user-type package="com.android.car.calendar">
         <install-in user-type="FULL" />
     </install-in-user-type>
+    <install-in-user-type package="com.android.car.activityresolver">
+        <install-in user-type="FULL" />
+    </install-in-user-type>
     <install-in-user-type package="com.android.wifi.inprocess.overlay.car">
         <install-in user-type="FULL" />
     </install-in-user-type>
diff --git a/car_product/init/init.car.rc b/car_product/init/init.car.rc
index d255942..a4880ab 100644
--- a/car_product/init/init.car.rc
+++ b/car_product/init/init.car.rc
@@ -6,11 +6,11 @@
 on property:persist.automotive.evs.mode=0
     # stop EVS and automotive display services
     stop automotive_display
-    stop evs_driver
+    stop evs_sample_driver
     stop evs_manager
 
 on property:persist.automotive.evs.mode=1
     # start EVS and automotive display services
     start automotive_display
-    start evs_driver
+    start evs_sample_driver
     start evs_manager
diff --git a/car_product/overlay/frameworks/base/core/res/res/anim/fade_in.xml b/car_product/overlay-visual/frameworks/base/core/res/res/anim/fade_in.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/anim/fade_in.xml
rename to car_product/overlay-visual/frameworks/base/core/res/res/anim/fade_in.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/anim/fade_out.xml b/car_product/overlay-visual/frameworks/base/core/res/res/anim/fade_out.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/anim/fade_out.xml
rename to car_product/overlay-visual/frameworks/base/core/res/res/anim/fade_out.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/drawable-night-nodpi/default_wallpaper.png b/car_product/overlay-visual/frameworks/base/core/res/res/drawable-night-nodpi/default_wallpaper.png
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/drawable-night-nodpi/default_wallpaper.png
rename to car_product/overlay-visual/frameworks/base/core/res/res/drawable-night-nodpi/default_wallpaper.png
Binary files differ
diff --git a/car_product/overlay/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png b/car_product/overlay-visual/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png
rename to car_product/overlay-visual/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png
Binary files differ
diff --git a/car_product/overlay/frameworks/base/core/res/res/drawable-sw600dp-night/default_wallpaper.png b/car_product/overlay-visual/frameworks/base/core/res/res/drawable-sw600dp-night/default_wallpaper.png
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/drawable-sw600dp-night/default_wallpaper.png
rename to car_product/overlay-visual/frameworks/base/core/res/res/drawable-sw600dp-night/default_wallpaper.png
Binary files differ
diff --git a/car_product/overlay/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.png b/car_product/overlay-visual/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.png
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.png
rename to car_product/overlay-visual/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.png
Binary files differ
diff --git a/car_product/overlay/frameworks/base/core/res/res/drawable-sw720dp-night/default_wallpaper.png b/car_product/overlay-visual/frameworks/base/core/res/res/drawable-sw720dp-night/default_wallpaper.png
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/drawable-sw720dp-night/default_wallpaper.png
rename to car_product/overlay-visual/frameworks/base/core/res/res/drawable-sw720dp-night/default_wallpaper.png
Binary files differ
diff --git a/car_product/overlay/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.png b/car_product/overlay-visual/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.png
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.png
rename to car_product/overlay-visual/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.png
Binary files differ
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable/activated_item_background.xml b/car_product/overlay-visual/frameworks/base/core/res/res/drawable/activated_item_background.xml
new file mode 100644
index 0000000..280934f
--- /dev/null
+++ b/car_product/overlay-visual/frameworks/base/core/res/res/drawable/activated_item_background.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true" android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="#8A94CBFF"/>
+            <stroke android:width="4dp"
+                    android:color="#94CBFF"/>
+        </shape>
+    </item>
+    <item android:state_focused="true" android:state_activated="true">
+        <shape android:shape="rectangle">
+            <solid android:color="?android:attr/colorControlActivated"/>
+            <stroke android:width="8dp" android:color="#94CBFF"/>
+        </shape>
+    </item>
+    <item android:state_focused="true">
+        <shape android:shape="rectangle">
+            <solid android:color="#3D94CBFF"/>
+            <stroke android:width="8dp" android:color="#94CBFF"/>
+        </shape>
+    </item>
+    <item android:state_activated="true">
+        <shape android:shape="rectangle">
+            <solid android:color="?android:attr/colorControlActivated"/>
+        </shape>
+    </item>
+    <item>
+        <ripple android:color="?android:attr/colorControlHighlight">
+            <item android:id="@android:id/mask">
+                <color android:color="@android:color/white" />
+            </item>
+        </ripple>
+    </item>
+</selector>
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable/btn_borderless_car.xml b/car_product/overlay-visual/frameworks/base/core/res/res/drawable/btn_borderless_car.xml
new file mode 100644
index 0000000..e5392ee
--- /dev/null
+++ b/car_product/overlay-visual/frameworks/base/core/res/res/drawable/btn_borderless_car.xml
@@ -0,0 +1,56 @@
+<?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.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true">
+        <inset android:insetLeft="@*android:dimen/button_inset_horizontal_material"
+               android:insetTop="@*android:dimen/button_inset_vertical_material"
+               android:insetRight="@*android:dimen/button_inset_horizontal_material"
+               android:insetBottom="@*android:dimen/button_inset_vertical_material">
+            <selector>
+                <item android:state_focused="true" android:state_pressed="true">
+                    <shape android:shape="rectangle">
+                        <corners android:radius="?android:attr/buttonCornerRadius" />
+                        <solid android:color="#8A94CBFF"/>
+                        <stroke android:width="4dp"
+                                android:color="#94CBFF"/>
+                        <padding android:left="@*android:dimen/button_padding_horizontal_material"
+                                 android:top="@*android:dimen/button_padding_vertical_material"
+                                 android:right="@*android:dimen/button_padding_horizontal_material"
+                                 android:bottom="@*android:dimen/button_padding_vertical_material" />
+                    </shape>
+                </item>
+                <item android:state_focused="true">
+                    <shape android:shape="rectangle">
+                        <corners android:radius="?android:attr/buttonCornerRadius" />
+                        <solid android:color="#3D94CBFF"/>
+                        <stroke android:width="8dp" android:color="#94CBFF"/>
+                        <padding android:left="@*android:dimen/button_padding_horizontal_material"
+                                 android:top="@*android:dimen/button_padding_vertical_material"
+                                 android:right="@*android:dimen/button_padding_horizontal_material"
+                                 android:bottom="@*android:dimen/button_padding_vertical_material" />
+                    </shape>
+                </item>
+            </selector>
+        </inset>
+    </item>
+    <item>
+        <ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="?android:attr/colorControlHighlight">
+            <item android:id="@android:id/mask"
+                  android:drawable="@*android:drawable/btn_default_mtrl_shape" />
+        </ripple>
+    </item>
+</selector>
diff --git a/car_product/overlay/frameworks/base/core/res/res/drawable/ic_account_circle.xml b/car_product/overlay-visual/frameworks/base/core/res/res/drawable/ic_account_circle.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/drawable/ic_account_circle.xml
rename to car_product/overlay-visual/frameworks/base/core/res/res/drawable/ic_account_circle.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/drawable/ic_collapse_notification.xml b/car_product/overlay-visual/frameworks/base/core/res/res/drawable/ic_collapse_notification.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/drawable/ic_collapse_notification.xml
rename to car_product/overlay-visual/frameworks/base/core/res/res/drawable/ic_collapse_notification.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/drawable/ic_expand_notification.xml b/car_product/overlay-visual/frameworks/base/core/res/res/drawable/ic_expand_notification.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/drawable/ic_expand_notification.xml
rename to car_product/overlay-visual/frameworks/base/core/res/res/drawable/ic_expand_notification.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/drawable-night/item_background.xml b/car_product/overlay-visual/frameworks/base/core/res/res/drawable/item_background.xml
similarity index 70%
rename from car_product/overlay/frameworks/base/core/res/res/drawable-night/item_background.xml
rename to car_product/overlay-visual/frameworks/base/core/res/res/drawable/item_background.xml
index cfab8bd..51a1d58 100644
--- a/car_product/overlay/frameworks/base/core/res/res/drawable-night/item_background.xml
+++ b/car_product/overlay-visual/frameworks/base/core/res/res/drawable/item_background.xml
@@ -15,12 +15,18 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true" android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="#8A94CBFF"/>
+            <stroke android:width="4dp"
+                    android:color="#94CBFF"/>
+        </shape>
+    </item>
     <item android:state_focused="true">
-        <ripple android:color="#2371cd">
-            <item android:id="@android:id/mask">
-                <color android:color="@android:color/white" />
-            </item>
-        </ripple>
+        <shape android:shape="rectangle">
+            <solid android:color="#3D94CBFF"/>
+            <stroke android:width="8dp" android:color="#94CBFF"/>
+        </shape>
     </item>
     <item>
         <ripple android:color="?android:attr/colorControlHighlight">
diff --git a/car_product/overlay/frameworks/base/core/res/res/drawable/toast_frame.xml b/car_product/overlay-visual/frameworks/base/core/res/res/drawable/toast_frame.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/drawable/toast_frame.xml
rename to car_product/overlay-visual/frameworks/base/core/res/res/drawable/toast_frame.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/layout/notification_template_right_icon.xml b/car_product/overlay-visual/frameworks/base/core/res/res/layout/notification_template_right_icon.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/layout/notification_template_right_icon.xml
rename to car_product/overlay-visual/frameworks/base/core/res/res/layout/notification_template_right_icon.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/layout/resolve_list_item.xml b/car_product/overlay-visual/frameworks/base/core/res/res/layout/resolve_list_item.xml
similarity index 97%
rename from car_product/overlay/frameworks/base/core/res/res/layout/resolve_list_item.xml
rename to car_product/overlay-visual/frameworks/base/core/res/res/layout/resolve_list_item.xml
index 633dd2d..2fc9901 100644
--- a/car_product/overlay/frameworks/base/core/res/res/layout/resolve_list_item.xml
+++ b/car_product/overlay-visual/frameworks/base/core/res/res/layout/resolve_list_item.xml
@@ -23,7 +23,7 @@
               android:minHeight="?android:attr/listPreferredItemHeightLarge"
               android:paddingTop="4dp"
               android:paddingBottom="4dp"
-              android:background="?android:attr/activatedBackgroundIndicator">
+              android:background="@drawable/activated_item_background">
     <ImageView android:id="@*android:id/icon"
                android:layout_width="75dp"
                android:layout_height="75dp"
diff --git a/car_product/overlay/frameworks/base/core/res/res/layout/resolver_different_item_header.xml b/car_product/overlay-visual/frameworks/base/core/res/res/layout/resolver_different_item_header.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/layout/resolver_different_item_header.xml
rename to car_product/overlay-visual/frameworks/base/core/res/res/layout/resolver_different_item_header.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/layout/resolver_list.xml b/car_product/overlay-visual/frameworks/base/core/res/res/layout/resolver_list.xml
similarity index 86%
rename from car_product/overlay/frameworks/base/core/res/res/layout/resolver_list.xml
rename to car_product/overlay-visual/frameworks/base/core/res/res/layout/resolver_list.xml
index eec830d..1bc599d 100644
--- a/car_product/overlay/frameworks/base/core/res/res/layout/resolver_list.xml
+++ b/car_product/overlay-visual/frameworks/base/core/res/res/layout/resolver_list.xml
@@ -20,5 +20,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
+    <com.android.car.ui.FocusParkingView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
     <include layout="@*android:layout/car_resolver_list"/>
 </FrameLayout>
diff --git a/car_product/overlay/frameworks/base/core/res/res/layout/resolver_list_with_default.xml b/car_product/overlay-visual/frameworks/base/core/res/res/layout/resolver_list_with_default.xml
similarity index 87%
rename from car_product/overlay/frameworks/base/core/res/res/layout/resolver_list_with_default.xml
rename to car_product/overlay-visual/frameworks/base/core/res/res/layout/resolver_list_with_default.xml
index 682f749..5477f2c 100644
--- a/car_product/overlay/frameworks/base/core/res/res/layout/resolver_list_with_default.xml
+++ b/car_product/overlay-visual/frameworks/base/core/res/res/layout/resolver_list_with_default.xml
@@ -20,5 +20,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
+    <com.android.car.ui.FocusParkingView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
     <include layout="@*android:layout/car_resolver_list_with_default"/>
 </FrameLayout>
diff --git a/car_product/overlay/frameworks/base/core/res/res/layout/transient_notification.xml b/car_product/overlay-visual/frameworks/base/core/res/res/layout/transient_notification.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/layout/transient_notification.xml
rename to car_product/overlay-visual/frameworks/base/core/res/res/layout/transient_notification.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-h1752dp/dimens.xml b/car_product/overlay-visual/frameworks/base/core/res/res/values-h1752dp/dimens.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-h1752dp/dimens.xml
rename to car_product/overlay-visual/frameworks/base/core/res/res/values-h1752dp/dimens.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-h600dp/dimens.xml b/car_product/overlay-visual/frameworks/base/core/res/res/values-h600dp/dimens.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-h600dp/dimens.xml
rename to car_product/overlay-visual/frameworks/base/core/res/res/values-h600dp/dimens.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-night/colors_car.xml b/car_product/overlay-visual/frameworks/base/core/res/res/values-night/colors_car.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-night/colors_car.xml
rename to car_product/overlay-visual/frameworks/base/core/res/res/values-night/colors_car.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-night/colors_device_defaults.xml b/car_product/overlay-visual/frameworks/base/core/res/res/values-night/colors_device_defaults.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-night/colors_device_defaults.xml
rename to car_product/overlay-visual/frameworks/base/core/res/res/values-night/colors_device_defaults.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-w1280dp/dimens.xml b/car_product/overlay-visual/frameworks/base/core/res/res/values-w1280dp/dimens.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-w1280dp/dimens.xml
rename to car_product/overlay-visual/frameworks/base/core/res/res/values-w1280dp/dimens.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-w1920dp/dimens.xml b/car_product/overlay-visual/frameworks/base/core/res/res/values-w1920dp/dimens.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-w1920dp/dimens.xml
rename to car_product/overlay-visual/frameworks/base/core/res/res/values-w1920dp/dimens.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-w690dp/dimens.xml b/car_product/overlay-visual/frameworks/base/core/res/res/values-w690dp/dimens.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-w690dp/dimens.xml
rename to car_product/overlay-visual/frameworks/base/core/res/res/values-w690dp/dimens.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-w840dp/dimens.xml b/car_product/overlay-visual/frameworks/base/core/res/res/values-w840dp/dimens.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-w840dp/dimens.xml
rename to car_product/overlay-visual/frameworks/base/core/res/res/values-w840dp/dimens.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values/colors.xml b/car_product/overlay-visual/frameworks/base/core/res/res/values/colors.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values/colors.xml
rename to car_product/overlay-visual/frameworks/base/core/res/res/values/colors.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values/colors_device_defaults.xml b/car_product/overlay-visual/frameworks/base/core/res/res/values/colors_device_defaults.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values/colors_device_defaults.xml
rename to car_product/overlay-visual/frameworks/base/core/res/res/values/colors_device_defaults.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values/dimens.xml b/car_product/overlay-visual/frameworks/base/core/res/res/values/dimens.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values/dimens.xml
rename to car_product/overlay-visual/frameworks/base/core/res/res/values/dimens.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values/styles.xml b/car_product/overlay-visual/frameworks/base/core/res/res/values/styles.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values/styles.xml
rename to car_product/overlay-visual/frameworks/base/core/res/res/values/styles.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values/styles_device_default.xml b/car_product/overlay-visual/frameworks/base/core/res/res/values/styles_device_default.xml
similarity index 96%
rename from car_product/overlay/frameworks/base/core/res/res/values/styles_device_default.xml
rename to car_product/overlay-visual/frameworks/base/core/res/res/values/styles_device_default.xml
index 08ea8dc..9db29ef 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values/styles_device_default.xml
+++ b/car_product/overlay-visual/frameworks/base/core/res/res/values/styles_device_default.xml
@@ -98,13 +98,17 @@
         <item name="android:paddingEnd">@*android:dimen/car_button_horizontal_padding</item>
     </style>
 
+    <style name="Widget.DeviceDefault.Button.Borderless" parent="android:Widget.Material.Button.Borderless">
+        <item name="android:background">@drawable/btn_borderless_car</item>
+    </style>
+
     <style name="Widget.DeviceDefault.CompoundButton.CheckBox" parent="android:Widget.Material.CompoundButton.CheckBox">
         <item name="android:button">@*android:drawable/car_checkbox</item>
     </style>
 
     <style name="Widget.DeviceDefault.CompoundButton.Switch" parent="android:Widget.Material.CompoundButton.Switch">
         <item name="android:thumb">@*android:drawable/car_switch_thumb</item>
-        <item name="android:switchMinWidth">@*android:dimen/car_primary_icon_size</item>
+        <item name="android:track">@*android:drawable/car_switch_track</item>
     </style>
 
     <style name="Widget.DeviceDefault.ProgressBar.Horizontal" parent="android:Widget.Material.ProgressBar.Horizontal">
diff --git a/car_product/overlay/frameworks/base/core/res/res/values/themes_device_defaults.xml b/car_product/overlay-visual/frameworks/base/core/res/res/values/themes_device_defaults.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values/themes_device_defaults.xml
rename to car_product/overlay-visual/frameworks/base/core/res/res/values/themes_device_defaults.xml
diff --git a/car_product/overlay/frameworks/base/packages/CarSystemUI/res/values-h600dp/dimens.xml b/car_product/overlay-visual/frameworks/base/packages/CarSystemUI/res/values-h600dp/dimens.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/packages/CarSystemUI/res/values-h600dp/dimens.xml
rename to car_product/overlay-visual/frameworks/base/packages/CarSystemUI/res/values-h600dp/dimens.xml
diff --git a/car_product/overlay/frameworks/base/packages/CarSystemUI/res/values-sw600dp/dimens.xml b/car_product/overlay-visual/frameworks/base/packages/CarSystemUI/res/values-sw600dp/dimens.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/packages/CarSystemUI/res/values-sw600dp/dimens.xml
rename to car_product/overlay-visual/frameworks/base/packages/CarSystemUI/res/values-sw600dp/dimens.xml
diff --git a/car_product/overlay/frameworks/base/packages/CarSystemUI/res/values-w1024dp/dimens.xml b/car_product/overlay-visual/frameworks/base/packages/CarSystemUI/res/values-w1024dp/dimens.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/packages/CarSystemUI/res/values-w1024dp/dimens.xml
rename to car_product/overlay-visual/frameworks/base/packages/CarSystemUI/res/values-w1024dp/dimens.xml
diff --git a/car_product/overlay/frameworks/base/packages/CarSystemUI/res/values-w550dp-land/dimens.xml b/car_product/overlay-visual/frameworks/base/packages/CarSystemUI/res/values-w550dp-land/dimens.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/packages/CarSystemUI/res/values-w550dp-land/dimens.xml
rename to car_product/overlay-visual/frameworks/base/packages/CarSystemUI/res/values-w550dp-land/dimens.xml
diff --git a/car_product/overlay/frameworks/base/packages/SettingsLib/res/values/dimens.xml b/car_product/overlay-visual/frameworks/base/packages/SettingsLib/res/values/dimens.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/packages/SettingsLib/res/values/dimens.xml
rename to car_product/overlay-visual/frameworks/base/packages/SettingsLib/res/values/dimens.xml
diff --git a/car_product/overlay/frameworks/base/packages/SettingsLib/res/values/styles.xml b/car_product/overlay-visual/frameworks/base/packages/SettingsLib/res/values/styles.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/packages/SettingsLib/res/values/styles.xml
rename to car_product/overlay-visual/frameworks/base/packages/SettingsLib/res/values/styles.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/drawable/item_background.xml b/car_product/overlay/frameworks/base/core/res/res/drawable/item_background.xml
deleted file mode 100644
index b95802f..0000000
--- a/car_product/overlay/frameworks/base/core/res/res/drawable/item_background.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true">
-        <ripple android:color="#4b9eff">
-            <item android:id="@android:id/mask">
-                <color android:color="@android:color/white" />
-            </item>
-        </ripple>
-    </item>
-    <item>
-        <ripple android:color="?android:attr/colorControlHighlight">
-            <item android:id="@android:id/mask">
-                <color android:color="@android:color/white" />
-            </item>
-        </ripple>
-    </item>
-</selector>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-zh-rHK/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-zh-rHK/strings.xml
index 86618d3..fd93b30 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-zh-rHK/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-zh-rHK/strings.xml
@@ -18,5 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"司機"</string>
-    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"只在前景存取大概位置"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"只在前景存取概略位置"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values/config.xml b/car_product/overlay/frameworks/base/core/res/res/values/config.xml
index 4538e60..73a380b 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
@@ -97,8 +97,6 @@
 
     <string name="config_dataUsageSummaryComponent">com.android.car.settings/com.android.car.settings.datausage.DataWarningAndLimitActivity</string>
 
-    <string name="config_defaultTrustAgent" translatable="false">com.android.car.companiondevicesupport/.feature.trust.TrustedDeviceAgentService</string>
-
     <!-- Controls whether system buttons use all caps for text -->
     <bool name="config_buttonTextAllCaps">false</bool>
 
@@ -126,4 +124,8 @@
         <item>"no_modify_accounts"</item>
     </string-array>
 
+    <!-- Use a car-specific activity resolver that supports rotary. -->
+    <string name="config_customResolverActivity" translatable="false"
+        >com.android.car.activityresolver/.CarResolverActivity</string>
+
 </resources>
diff --git a/car_product/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/car_product/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
index 81a9a3d..5b53dcf 100644
--- a/car_product/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/car_product/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -26,4 +26,7 @@
 
     <!-- Disable system heads-up notifications -->
     <integer name="def_heads_up_enabled">0</integer>
+
+    <!-- Default for UI touch sounds disabled -->
+    <bool name="def_sound_effects_enabled">false</bool>
 </resources>
diff --git a/car_product/sepolicy/private/carservice_app.te b/car_product/sepolicy/private/carservice_app.te
index 49a3c6f..2fd2095 100644
--- a/car_product/sepolicy/private/carservice_app.te
+++ b/car_product/sepolicy/private/carservice_app.te
@@ -66,8 +66,9 @@
 allow carservice_app statsd:binder call;
 
 # To access /sys/fs/<type>/<partition>/lifetime_write_kbytes
-r_dir_file(carservice_app, sysfs_fs_ext4)
-r_dir_file(carservice_app, sysfs_fs_f2fs)
+allow carservice_app sysfs:dir { open read search };
+allow carservice_app sysfs_fs_ext4_features:dir { open read search};
+allow carservice_app sysfs_fs_f2fs:dir { open read search };
 
 set_prop(carservice_app, ctl_start_prop)
 set_prop(carservice_app, ctl_stop_prop)
diff --git a/car_product/sepolicy/private/genfs_contexts b/car_product/sepolicy/private/genfs_contexts
deleted file mode 100644
index e8e6e9f..0000000
--- a/car_product/sepolicy/private/genfs_contexts
+++ /dev/null
@@ -1 +0,0 @@
-genfscon sysfs /fs/ext4 u:object_r:sysfs_fs_ext4:s0
diff --git a/car_product/sepolicy/public/file.te b/car_product/sepolicy/public/file.te
index 8703f35..11bf839 100644
--- a/car_product/sepolicy/public/file.te
+++ b/car_product/sepolicy/public/file.te
@@ -1,4 +1,8 @@
+# This type for lifetime_write_kbytes files which resides in
+# /sys/fs/<filesystem>/<partition>/lifetime_writes_kbytes
+# Vendors are supposed to extend genfs_contexts with the
+# partition names for their devices.
+type sysfs_fs_lifetime_write, sysfs_type, fs_type;
+
 # /data/system/car
 type system_car_data_file, file_type, data_file_type, core_data_file_type;
-# /sys/fs/ext4
-type sysfs_fs_ext4, sysfs_type, fs_type;
diff --git a/computepipe/runner/graph/GrpcGraph.cpp b/computepipe/runner/graph/GrpcGraph.cpp
index efd56c9..07e2656 100644
--- a/computepipe/runner/graph/GrpcGraph.cpp
+++ b/computepipe/runner/graph/GrpcGraph.cpp
@@ -171,7 +171,7 @@
 // Starts the graph.
 Status GrpcGraph::handleExecutionPhase(const runner::RunnerEvent& e) {
     std::lock_guard lock(mLock);
-    if (mGraphState != PrebuiltGraphState::STOPPED) {
+    if (mGraphState != PrebuiltGraphState::STOPPED || mStreamSetObserver == nullptr) {
         mStatus = Status::ILLEGAL_STATE;
         return mStatus;
     }
diff --git a/computepipe/runner/graph/LocalPrebuiltGraph.cpp b/computepipe/runner/graph/LocalPrebuiltGraph.cpp
index ae4cc8c..821e549 100644
--- a/computepipe/runner/graph/LocalPrebuiltGraph.cpp
+++ b/computepipe/runner/graph/LocalPrebuiltGraph.cpp
@@ -179,7 +179,7 @@
         const std::string& prebuilt_library,
         std::weak_ptr<PrebuiltEngineInterface> engineInterface) {
     std::unique_lock<std::mutex> lock(LocalPrebuiltGraph::mCreationMutex);
-    if (mPrebuiltGraphInstance != nullptr) {
+    if (mPrebuiltGraphInstance == nullptr) {
         mPrebuiltGraphInstance = new LocalPrebuiltGraph();
     }
     if (mPrebuiltGraphInstance->mGraphState.load() != PrebuiltGraphState::UNINITIALIZED) {
diff --git a/computepipe/tests/PipeQueryTest.cpp b/computepipe/tests/PipeQueryTest.cpp
index 634ebd0..c3c614a 100644
--- a/computepipe/tests/PipeQueryTest.cpp
+++ b/computepipe/tests/PipeQueryTest.cpp
@@ -100,30 +100,30 @@
 
 // Check retrieval of inserted entries
 TEST_F(PipeQueryTest, GetGraphListTest) {
-    std::shared_ptr<IPipeRunner> dummy1 = ndk::SharedRefBase::make<FakeRunner>();
-    addFakeRunner("dummy1", dummy1);
-    std::shared_ptr<IPipeRunner> dummy2 = ndk::SharedRefBase::make<FakeRunner>();
-    addFakeRunner("dummy2", dummy2);
+    std::shared_ptr<IPipeRunner> stub1 = ndk::SharedRefBase::make<FakeRunner>();
+    addFakeRunner("stub1", stub1);
+    std::shared_ptr<IPipeRunner> stub2 = ndk::SharedRefBase::make<FakeRunner>();
+    addFakeRunner("stub2", stub2);
 
     std::vector<std::string>* outNames = new std::vector<std::string>();
     std::shared_ptr<PipeQuery> qIface = ndk::SharedRefBase::make<PipeQuery>(mRegistry);
     ASSERT_TRUE(qIface->getGraphList(outNames).isOk());
 
     ASSERT_NE(outNames->size(), 0);
-    EXPECT_THAT(std::find(outNames->begin(), outNames->end(), "dummy1"),
+    EXPECT_THAT(std::find(outNames->begin(), outNames->end(), "stub1"),
                 testing::Ne(outNames->end()));
-    EXPECT_THAT(std::find(outNames->begin(), outNames->end(), "dummy2"),
+    EXPECT_THAT(std::find(outNames->begin(), outNames->end(), "stub2"),
                 testing::Ne(outNames->end()));
 }
 
 // Check successful retrieval of runner
 TEST_F(PipeQueryTest, GetRunnerTest) {
-    std::shared_ptr<IPipeRunner> dummy1 = ndk::SharedRefBase::make<FakeRunner>();
-    addFakeRunner("dummy1", dummy1);
+    std::shared_ptr<IPipeRunner> stub1 = ndk::SharedRefBase::make<FakeRunner>();
+    addFakeRunner("stub1", stub1);
 
     std::shared_ptr<PipeQuery> qIface = ndk::SharedRefBase::make<PipeQuery>(mRegistry);
     std::shared_ptr<IClientInfo> info = ndk::SharedRefBase::make<FakeClientInfo>();
     std::shared_ptr<IPipeRunner> runner;
-    ASSERT_TRUE(qIface->getPipeRunner("dummy1", info, &runner).isOk());
+    ASSERT_TRUE(qIface->getPipeRunner("stub1", info, &runner).isOk());
     EXPECT_THAT(runner, testing::NotNull());
 }
diff --git a/computepipe/tests/PipeRegistrationTest.cpp b/computepipe/tests/PipeRegistrationTest.cpp
index 1caf07b..4af8440 100644
--- a/computepipe/tests/PipeRegistrationTest.cpp
+++ b/computepipe/tests/PipeRegistrationTest.cpp
@@ -50,17 +50,17 @@
 
 // Valid registration succeeds
 TEST_F(PipeRegistrationTest, RegisterFakeRunner) {
-    std::shared_ptr<IPipeRunner> dummy = ndk::SharedRefBase::make<FakeRunner>();
+    std::shared_ptr<IPipeRunner> fake = ndk::SharedRefBase::make<FakeRunner>();
     std::shared_ptr<IPipeRegistration> rIface =
         ndk::SharedRefBase::make<PipeRegistration>(this->mRegistry);
-    EXPECT_TRUE(rIface->registerPipeRunner("dummy", dummy).isOk());
+    EXPECT_TRUE(rIface->registerPipeRunner("fake", fake).isOk());
 }
 
 // Duplicate registration fails
 TEST_F(PipeRegistrationTest, RegisterDuplicateRunner) {
-    std::shared_ptr<IPipeRunner> dummy = ndk::SharedRefBase::make<FakeRunner>();
+    std::shared_ptr<IPipeRunner> fake = ndk::SharedRefBase::make<FakeRunner>();
     std::shared_ptr<IPipeRegistration> rIface =
         ndk::SharedRefBase::make<PipeRegistration>(this->mRegistry);
-    ASSERT_TRUE(rIface->registerPipeRunner("dummy", dummy).isOk());
-    EXPECT_FALSE(rIface->registerPipeRunner("dummy", dummy).isOk());
+    ASSERT_TRUE(rIface->registerPipeRunner("fake", fake).isOk());
+    EXPECT_FALSE(rIface->registerPipeRunner("fake", fake).isOk());
 }
diff --git a/computepipe/tests/fuzz/Android.bp b/computepipe/tests/fuzz/Android.bp
new file mode 100644
index 0000000..9e4257f
--- /dev/null
+++ b/computepipe/tests/fuzz/Android.bp
@@ -0,0 +1,144 @@
+// Copyright 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.
+
+cc_library_static {
+    name: "libcomputepipeprotosfuzz",
+    proto: {
+        export_proto_headers: true,
+    },
+    shared_libs: ["libprotobuf-cpp-full"],
+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wno-unused-parameter",
+    ],
+    srcs: [
+        "Fuzz.proto",
+    ],
+}
+
+cc_defaults {
+    name: "libcomputepipefuzz-defaults",
+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wno-unused-parameter",
+        "-Wno-unused-variable",
+    ],
+    static_libs: [
+        "computepipe_runner_component",
+        "computepipe_stream_manager",
+        "libcomputepipeprotos",
+        "libgtest",
+        "libgmock",
+        "mock_stream_engine_interface",
+    ],
+    shared_libs: [
+        "libbase",
+        "liblog",
+        "libnativewindow",
+        "libprotobuf-cpp-lite",
+    ],
+    header_libs: [
+        "computepipe_runner_includes",
+        "graph_test_headers",
+    ],
+    include_dirs: [
+        "packages/services/Car/computepipe",
+        "packages/services/Car/computepipe/runner/stream_manager",
+    ],
+}
+
+cc_fuzz {
+    name: "computepipe_semantic_manager_fuzzer",
+    defaults: ["libcomputepipefuzz-defaults"],
+    srcs: [
+        "SemanticManagerFuzzer.cpp",
+    ],
+}
+
+cc_fuzz {
+    name: "computepipe_pixel_mem_handle_fuzzer",
+    defaults: ["libcomputepipefuzz-defaults"],
+    srcs: [
+        "PixelMemHandleFuzzer.cpp",
+    ],
+    shared_libs: [
+         "libprotobuf-cpp-full",
+    ],
+    static_libs: [
+        "libcomputepipeprotosfuzz",
+        "libprotobuf-mutator",
+    ],
+}
+
+cc_fuzz {
+    name: "computepipe_pixel_stream_manager_fuzzer",
+    defaults: ["libcomputepipefuzz-defaults"],
+    srcs: [
+        "PixelStreamManagerFuzzer.cpp",
+    ],
+    shared_libs: [
+         "libprotobuf-cpp-full",
+    ],
+    static_libs: [
+        "libcomputepipeprotosfuzz",
+        "libprotobuf-mutator",
+    ],
+}
+
+cc_fuzz {
+    name: "local_prebuild_graph_fuzzer",
+    defaults: ["libcomputepipefuzz-defaults"],
+    cppflags:[
+        "-fexceptions",
+    ],
+    static_libs: [
+        "computepipe_prebuilt_graph",
+    ],
+    shared_libs: [
+        "libstubgraphimpl",
+    ],
+    include_dirs: [
+        "packages/services/Car/computepipe",
+        "packages/services/Car/computepipe/runner/graph",
+    ],
+    srcs: [
+        "LocalPrebuildGraphFuzzer.cpp",
+    ],
+}
+
+cc_fuzz {
+    name: "grpc_graph_fuzzer",
+    defaults: ["libcomputepipefuzz-defaults"],
+    cppflags:[
+        "-fexceptions",
+    ],
+    static_libs: [
+        "computepipe_grpc_graph_proto",
+    ],
+    shared_libs: [
+        "computepipe_grpc_graph",
+        "libcomputepipeprotos",
+        "libgrpc++",
+        "libprotobuf-cpp-full",
+    ],
+    include_dirs: [
+        "packages/services/Car/computepipe",
+        "packages/services/Car/computepipe/runner/graph",
+    ],
+    srcs: [
+        "GrpcGraphFuzzer.cpp",
+    ],
+}
diff --git a/computepipe/tests/fuzz/Common.h b/computepipe/tests/fuzz/Common.h
new file mode 100644
index 0000000..9934b61
--- /dev/null
+++ b/computepipe/tests/fuzz/Common.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright 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.
+ */
+
+#ifndef CPP_COMPUTEPIPE_TESTS_FUZZ_COMMON_H_
+#define CPP_COMPUTEPIPE_TESTS_FUZZ_COMMON_H_
+
+namespace android {
+namespace automotive {
+namespace computepipe {
+namespace runner {
+namespace test {
+
+const int kMaxFuzzerConsumedBytes = 12;
+
+#define RUNNER_COMP_BASE_ENUM                                                   \
+    HANDLE_CONFIG_PHASE,                  /* verify handleConfigPhase */        \
+            HANDLE_EXECUTION_PHASE,       /* verify handleExecutionPhase */     \
+            HANDLE_STOP_IMMEDIATE_PHASE,  /* verify handleStopImmediatePhase */ \
+            HANDLE_STOP_WITH_FLUSH_PHASE, /* verify handleStopWithFlushPhase */ \
+            HANDLE_RESET_PHASE,           /* verify handleResetPhase */         \
+            API_SUM
+
+#define GRAPH_RUNNER_BASE_ENUM                                                 \
+    GET_GRAPH_TYPE,                      /* verify GetGraphType */             \
+            GET_GRAPH_STATE,             /* verify GetGraphState */            \
+            GET_STATUS,                  /* verify GetStatus */                \
+            GET_ERROR_MESSAGE,           /* verify GetErrorMessage */          \
+            GET_SUPPORTED_GRAPH_CONFIGS, /* verify GetSupportedGraphConfigs */ \
+            SET_INPUT_STREAM_DATA,       /* verify SetInputStreamData */       \
+            SET_INPUT_STREAM_PIXEL_DATA, /* verify SetInputStreamPixelData */  \
+            START_GRAPH_PROFILING,       /* verify StartGraphProfiling */      \
+            STOP_GRAPH_PROFILING         /* verify StopGraphProfiling */
+
+const char kAddress[16] = "[::]:10000";
+
+}  // namespace test
+}  // namespace runner
+}  // namespace computepipe
+}  // namespace automotive
+}  // namespace android
+
+#endif  // CPP_COMPUTEPIPE_TESTS_FUZZ_COMMON_H_
diff --git a/computepipe/tests/fuzz/Fuzz.proto b/computepipe/tests/fuzz/Fuzz.proto
new file mode 100644
index 0000000..31495d8
--- /dev/null
+++ b/computepipe/tests/fuzz/Fuzz.proto
@@ -0,0 +1,21 @@
+syntax = "proto2";
+
+package android.automotive.computepipe.fuzz.proto;
+
+enum PixelFormat {
+    RGB = 0;
+    RGBA = 1;
+    GRAY = 2;
+}
+
+message Frame {
+    required uint32 height = 1;
+    required uint32 width = 2;
+    required PixelFormat format  = 3;
+    required uint32 stride = 4;
+    required string buffer = 5;
+}
+
+message PixelMemHandleFuzzerInput {
+    repeated Frame frames = 1;
+}
\ No newline at end of file
diff --git a/computepipe/tests/fuzz/GrpcGraphFuzzer.cpp b/computepipe/tests/fuzz/GrpcGraphFuzzer.cpp
new file mode 100644
index 0000000..0f93aac
--- /dev/null
+++ b/computepipe/tests/fuzz/GrpcGraphFuzzer.cpp
@@ -0,0 +1,167 @@
+/*
+ * Copyright 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.
+ */
+
+#include <android-base/logging.h>
+#include <fuzzer/FuzzedDataProvider.h>
+#include <gmock/gmock.h>
+#include "ClientConfig.pb.h"
+#include "Common.h"
+#include "GrpcGraph.h"
+#include "GrpcGraphServerImpl.h"
+
+using ::android::automotive::computepipe::runner::ClientConfig;
+
+namespace android {
+namespace automotive {
+namespace computepipe {
+namespace graph {
+
+namespace {
+
+enum GRPC_GRAPH_FUZZ_FUNCS {
+    GRAPH_RUNNER_BASE_ENUM,
+    DISPATCH_PIXEL_DATA,            /* verify dispatchPixelData */
+    DISPATCH_SERIALIZED_DATA,       /* dispatchSerializedData */
+    DISPATCH_GRAPH_TERMINATION_MSG, /* dispatchGraphTerminationMessage */
+    RUNNER_COMP_BASE_ENUM
+};
+
+bool DoInitialization() {
+    // Initialization goes here
+    std::shared_ptr<GrpcGraphServerImpl> server;
+    server = std::make_shared<GrpcGraphServerImpl>(runner::test::kAddress);
+    std::thread t = std::thread([server]() { server->startServer(); });
+    t.detach();
+    std::this_thread::sleep_for(std::chrono::seconds(1));
+    return true;
+}
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+    static bool initialized = DoInitialization();
+    std::shared_ptr<PrebuiltEngineInterfaceImpl> engine;
+    std::unique_ptr<GrpcGraph> graph = std::make_unique<GrpcGraph>();
+    engine = std::make_shared<PrebuiltEngineInterfaceImpl>();
+    Status status = graph->initialize(runner::test::kAddress, engine);
+    if (status != Status::SUCCESS) {
+        LOG(ERROR) << "Initialization of GrpcGraph failed, aborting...";
+        exit(1);
+    }
+
+    // Fuzz goes here
+    FuzzedDataProvider fdp(data, size);
+    while (fdp.remaining_bytes() > runner::test::kMaxFuzzerConsumedBytes) {
+        switch (fdp.ConsumeIntegralInRange<uint32_t>(0, API_SUM - 1)) {
+            case GET_GRAPH_TYPE: {
+                graph->GetGraphType();
+                break;
+            }
+            case GET_GRAPH_STATE: {
+                graph->GetGraphState();
+                break;
+            }
+            case GET_STATUS: {
+                graph->GetStatus();
+                break;
+            }
+            case GET_ERROR_MESSAGE: {
+                graph->GetErrorMessage();
+                break;
+            }
+            case GET_SUPPORTED_GRAPH_CONFIGS: {
+                graph->GetSupportedGraphConfigs();
+                break;
+            }
+            case SET_INPUT_STREAM_DATA: {
+                graph->SetInputStreamData(/*streamIndex =*/2, /* timestamp =*/0, /* data =*/"");
+                break;
+            }
+            case SET_INPUT_STREAM_PIXEL_DATA: {
+                runner::InputFrame inputFrame(0, 0, PixelFormat::RGB, 0, nullptr);
+                graph->SetInputStreamPixelData(/*streamIndex =*/1, /*timestamp =*/0,
+                                               /*inputFrame =*/inputFrame);
+                break;
+            }
+            case START_GRAPH_PROFILING: {
+                graph->StartGraphProfiling();
+                break;
+            }
+            case STOP_GRAPH_PROFILING: {
+                graph->StopGraphProfiling();
+                break;
+            }
+            case HANDLE_CONFIG_PHASE: {
+                std::map<int, int> maxOutputPacketsPerStream;
+                ClientConfig e(0, 0, 0, maxOutputPacketsPerStream, proto::ProfilingType::DISABLED);
+                e.setPhaseState(runner::PhaseState::ENTRY);
+                graph->handleConfigPhase(e);
+                break;
+            }
+            case HANDLE_EXECUTION_PHASE: {
+                std::map<int, int> maxOutputPacketsPerStream;
+                ClientConfig e(0, 0, 0, maxOutputPacketsPerStream, proto::ProfilingType::DISABLED);
+                e.setPhaseState(runner::PhaseState::ENTRY);
+                graph->handleExecutionPhase(e);
+                break;
+            }
+            case HANDLE_STOP_IMMEDIATE_PHASE: {
+                std::map<int, int> maxOutputPacketsPerStream;
+                ClientConfig e(0, 0, 0, maxOutputPacketsPerStream, proto::ProfilingType::DISABLED);
+                e.setPhaseState(runner::PhaseState::ENTRY);
+                graph->handleStopImmediatePhase(e);
+                break;
+            }
+            case HANDLE_STOP_WITH_FLUSH_PHASE: {
+                std::map<int, int> maxOutputPacketsPerStream;
+                ClientConfig e(0, 0, 0, maxOutputPacketsPerStream, proto::ProfilingType::DISABLED);
+                e.setPhaseState(runner::PhaseState::ENTRY);
+                graph->handleStopWithFlushPhase(e);
+                break;
+            }
+            case HANDLE_RESET_PHASE: {
+                std::map<int, int> maxOutputPacketsPerStream;
+                ClientConfig e(0, 0, 0, maxOutputPacketsPerStream, proto::ProfilingType::DISABLED);
+                e.setPhaseState(runner::PhaseState::ENTRY);
+                graph->handleResetPhase(e);
+                break;
+            }
+            case DISPATCH_PIXEL_DATA: {
+                runner::InputFrame inputFrame(0, 0, PixelFormat::RGB, 0, nullptr);
+                graph->dispatchPixelData(/*streamIndex =*/2, /*timestamp =*/0,
+                                         /*inputFrame =*/inputFrame);
+                break;
+            }
+            case DISPATCH_SERIALIZED_DATA: {
+                graph->dispatchSerializedData(/*streamIndex =*/1, /* timestamp =*/0, /* data =*/"");
+                break;
+            }
+            case DISPATCH_GRAPH_TERMINATION_MSG: {
+                uint8_t status = fdp.ConsumeIntegralInRange<uint8_t>(0, Status::STATUS_MAX - 1);
+                graph->dispatchGraphTerminationMessage(static_cast<Status>(status), "");
+                break;
+            }
+            default:
+                LOG(ERROR) << "Unexpected option aborting...";
+                break;
+        }
+    }
+    return 0;
+}
+
+}  // namespace
+}  // namespace graph
+}  // namespace computepipe
+}  // namespace automotive
+}  // namespace android
diff --git a/computepipe/tests/fuzz/LocalPrebuildGraphFuzzer.cpp b/computepipe/tests/fuzz/LocalPrebuildGraphFuzzer.cpp
new file mode 100644
index 0000000..c7398e4
--- /dev/null
+++ b/computepipe/tests/fuzz/LocalPrebuildGraphFuzzer.cpp
@@ -0,0 +1,153 @@
+/*
+ * Copyright 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.
+ */
+
+#include <android-base/logging.h>
+#include <fuzzer/FuzzedDataProvider.h>
+#include <gmock/gmock.h>
+#include "ClientConfig.pb.h"
+#include "Common.h"
+#include "LocalPrebuiltGraph.h"
+#include "PrebuiltEngineInterfaceImpl.h"
+
+using ::android::automotive::computepipe::runner::ClientConfig;
+
+namespace android {
+namespace automotive {
+namespace computepipe {
+namespace graph {
+
+namespace {
+
+enum LOCAL_PREBUILD_GRAPH_FUZZ_FUNCS { GRAPH_RUNNER_BASE_ENUM, RUNNER_COMP_BASE_ENUM };
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+    // Initialization goes here
+    bool graphHasTerminated = false;
+    int numOutputStreamCallbacksReceived[4] = {0, 0, 0, 0};
+
+    PrebuiltEngineInterfaceImpl callback;
+    callback.SetGraphTerminationCallback(
+            [&graphHasTerminated](Status, std::string) { graphHasTerminated = true; });
+
+    // Add multiple pixel stream callback functions to see if all of them register.
+    callback.SetPixelCallback([&numOutputStreamCallbacksReceived](int streamIndex, int64_t,
+                                                                  const runner::InputFrame&) {
+        ASSERT_TRUE(streamIndex == 0 || streamIndex == 1);
+        numOutputStreamCallbacksReceived[streamIndex]++;
+    });
+
+    // Add multiple stream callback functions to see if all of them register.
+    callback.SetSerializedStreamCallback(
+            [&numOutputStreamCallbacksReceived](int streamIndex, int64_t, std::string&&) {
+                ASSERT_TRUE(streamIndex == 2 || streamIndex == 3);
+                numOutputStreamCallbacksReceived[streamIndex]++;
+            });
+
+    std::shared_ptr<PrebuiltEngineInterface> engineInterface =
+            std::static_pointer_cast<PrebuiltEngineInterface, PrebuiltEngineInterfaceImpl>(
+                    std::make_shared<PrebuiltEngineInterfaceImpl>(callback));
+    PrebuiltGraph* graph = GetLocalGraphFromLibrary("libstubgraphimpl.so", engineInterface);
+
+    // Fuzz goes here
+    FuzzedDataProvider fdp(data, size);
+    while (fdp.remaining_bytes() > runner::test::kMaxFuzzerConsumedBytes) {
+        switch (fdp.ConsumeIntegralInRange<uint32_t>(0, API_SUM - 1)) {
+            case GET_GRAPH_TYPE: {
+                graph->GetGraphType();
+                break;
+            }
+            case GET_GRAPH_STATE: {
+                graph->GetGraphState();
+                break;
+            }
+            case GET_STATUS: {
+                graph->GetStatus();
+                break;
+            }
+            case GET_ERROR_MESSAGE: {
+                graph->GetErrorMessage();
+                break;
+            }
+            case GET_SUPPORTED_GRAPH_CONFIGS: {
+                graph->GetSupportedGraphConfigs();
+                break;
+            }
+            case SET_INPUT_STREAM_DATA: {
+                graph->SetInputStreamData(/*streamIndex =*/2, /* timestamp =*/0, /* data =*/"");
+                break;
+            }
+            case SET_INPUT_STREAM_PIXEL_DATA: {
+                runner::InputFrame inputFrame(0, 0, PixelFormat::RGB, 0, nullptr);
+                graph->SetInputStreamPixelData(/*streamIndex =*/1, /*timestamp =*/0,
+                                               /*inputFrame =*/inputFrame);
+                break;
+            }
+            case START_GRAPH_PROFILING: {
+                graph->StartGraphProfiling();
+                break;
+            }
+            case STOP_GRAPH_PROFILING: {
+                graph->StopGraphProfiling();
+                break;
+            }
+            case HANDLE_CONFIG_PHASE: {
+                std::map<int, int> maxOutputPacketsPerStream;
+                ClientConfig e(0, 0, 0, maxOutputPacketsPerStream, proto::ProfilingType::DISABLED);
+                e.setPhaseState(runner::PhaseState::ENTRY);
+                graph->handleConfigPhase(e);
+                break;
+            }
+            case HANDLE_EXECUTION_PHASE: {
+                std::map<int, int> maxOutputPacketsPerStream;
+                ClientConfig e(0, 0, 0, maxOutputPacketsPerStream, proto::ProfilingType::DISABLED);
+                e.setPhaseState(runner::PhaseState::ENTRY);
+                graph->handleExecutionPhase(e);
+                break;
+            }
+            case HANDLE_STOP_IMMEDIATE_PHASE: {
+                std::map<int, int> maxOutputPacketsPerStream;
+                ClientConfig e(0, 0, 0, maxOutputPacketsPerStream, proto::ProfilingType::DISABLED);
+                e.setPhaseState(runner::PhaseState::ENTRY);
+                graph->handleStopImmediatePhase(e);
+                break;
+            }
+            case HANDLE_STOP_WITH_FLUSH_PHASE: {
+                std::map<int, int> maxOutputPacketsPerStream;
+                ClientConfig e(0, 0, 0, maxOutputPacketsPerStream, proto::ProfilingType::DISABLED);
+                e.setPhaseState(runner::PhaseState::ENTRY);
+                graph->handleStopWithFlushPhase(e);
+                break;
+            }
+            case HANDLE_RESET_PHASE: {
+                std::map<int, int> maxOutputPacketsPerStream;
+                ClientConfig e(0, 0, 0, maxOutputPacketsPerStream, proto::ProfilingType::DISABLED);
+                e.setPhaseState(runner::PhaseState::ENTRY);
+                graph->handleResetPhase(e);
+                break;
+            }
+            default:
+                LOG(ERROR) << "Unexpected option aborting...";
+                break;
+        }
+    }
+    return 0;
+}
+
+}  // namespace
+}  // namespace graph
+}  // namespace computepipe
+}  // namespace automotive
+}  // namespace android
diff --git a/computepipe/tests/fuzz/PixelMemHandleFuzzer.cpp b/computepipe/tests/fuzz/PixelMemHandleFuzzer.cpp
new file mode 100644
index 0000000..44a0471
--- /dev/null
+++ b/computepipe/tests/fuzz/PixelMemHandleFuzzer.cpp
@@ -0,0 +1,107 @@
+/*
+ * Copyright 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.
+ */
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+#include <vndk/hardware_buffer.h>
+
+#include "InputFrame.h"
+#include "PixelFormatUtils.h"
+#include "PixelStreamManager.h"
+#include "gmock/gmock-matchers.h"
+#include "Fuzz.pb.h"
+#include "src/libfuzzer/libfuzzer_macro.h"
+
+namespace android {
+namespace automotive {
+namespace computepipe {
+namespace runner {
+namespace stream_manager {
+namespace {
+
+InputFrame convertToInputFrame(const fuzz::proto::Frame& frame) {
+    uint32_t height = frame.height();
+    uint32_t width = frame.width();
+    uint32_t stride = frame.stride();
+    PixelFormat pixelFormat = static_cast<PixelFormat>(frame.format());
+    const uint8_t* data = reinterpret_cast<const uint8_t*>(frame.buffer().c_str());
+    return InputFrame(height, width, pixelFormat, stride, data);
+}
+
+int setFrameDataTest(const fuzz::proto::PixelMemHandleFuzzerInput& input) {
+    int bufferId = 10;
+    int streamId = 1;
+    uint64_t timestamp = 100;
+
+    PixelMemHandle memHandle(bufferId, streamId, AHARDWAREBUFFER_USAGE_CPU_READ_OFTEN);
+    InputFrame oldInputFrame = convertToInputFrame(input.frames().Get(0));
+    memHandle.setFrameData(timestamp, oldInputFrame);
+
+    // overwrite frame data with different format and dimensions
+    InputFrame newInputFrame = convertToInputFrame(input.frames().Get(1));
+    memHandle.setFrameData(timestamp, newInputFrame);
+
+    AHardwareBuffer_Desc desc;
+    AHardwareBuffer* buffer = memHandle.getHardwareBuffer();
+    AHardwareBuffer_describe(buffer, &desc);
+    return 0;
+}
+
+bool isValid(const fuzz::proto::PixelMemHandleFuzzerInput& input) {
+    for (auto& frame : input.frames()) {
+        uint64_t height = frame.height();
+        uint64_t width = frame.width();
+        uint64_t stride = frame.stride();
+        uint64_t size = frame.buffer().size();
+        if (stride > width * height) {
+            return false;
+        }
+
+        if (height * width != size) {
+            return false;
+        }
+
+        if (height * width == 0) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+// generate guided and mutated frame data for fuzzing
+DEFINE_PROTO_FUZZER(const fuzz::proto::PixelMemHandleFuzzerInput& input) {
+    static PostProcessorRegistration reg = {
+            [](const fuzz::proto::PixelMemHandleFuzzerInput* input, unsigned int seed) {
+                if (input->frames().size() < 2) {
+                    return;
+                }
+
+                if (!isValid(*input)) {
+                    return;
+                }
+
+                setFrameDataTest(*input);
+            }
+    };
+}
+
+}  // namespace
+}  // namespace stream_manager
+}  // namespace runner
+}  // namespace computepipe
+}  // namespace automotive
+}  // namespace android
diff --git a/computepipe/tests/fuzz/PixelStreamManagerFuzzer.cpp b/computepipe/tests/fuzz/PixelStreamManagerFuzzer.cpp
new file mode 100644
index 0000000..1a8c83e
--- /dev/null
+++ b/computepipe/tests/fuzz/PixelStreamManagerFuzzer.cpp
@@ -0,0 +1,131 @@
+/*
+ * Copyright 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.
+ */
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+#include <vndk/hardware_buffer.h>
+
+#include <fuzzer/FuzzedDataProvider.h>
+#include "EventGenerator.h"
+#include "InputFrame.h"
+#include "MockEngine.h"
+#include "OutputConfig.pb.h"
+#include "PixelFormatUtils.h"
+#include "PixelStreamManager.h"
+#include "RunnerComponent.h"
+#include "StreamEngineInterface.h"
+#include "StreamManager.h"
+#include "src/libfuzzer/libfuzzer_macro.h"
+#include "types/Status.h"
+
+using ::android::automotive::computepipe::runner::generator::DefaultEvent;
+using ::testing::Return;
+
+namespace android {
+namespace automotive {
+namespace computepipe {
+namespace runner {
+namespace stream_manager {
+namespace {
+
+enum State {
+    RESET = 0,
+    RUN,
+    STOP_WITH_FLUSH,
+    STOP_IMMEDIATE,
+    QUEUE_PACKET,
+    FREE_PACKET,
+    CLONE_PACKET
+};
+
+std::pair<std::shared_ptr<MockEngine>, std::unique_ptr<StreamManager>> CreateStreamManagerAndEngine(
+        int maxInFlightPackets) {
+    StreamManagerFactory factory;
+    proto::OutputConfig outputConfig;
+    outputConfig.set_type(proto::PacketType::PIXEL_DATA);
+    outputConfig.set_stream_name("pixel_stream");
+    std::shared_ptr<MockEngine> mockEngine = std::make_shared<MockEngine>();
+    std::unique_ptr<StreamManager> manager =
+            factory.getStreamManager(outputConfig, mockEngine, maxInFlightPackets);
+
+    return std::pair(mockEngine, std::move(manager));
+}
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+    if (size < sizeof(uint32_t)) {
+        return 0;
+    }
+
+    FuzzedDataProvider fdp(data, size);
+    int maxInFlightPackets = fdp.ConsumeIntegral<uint32_t>();
+    auto [mockEngine, manager] = CreateStreamManagerAndEngine(maxInFlightPackets);
+    std::vector<uint8_t> pixelData(16 * 16 * 3, 100);
+    InputFrame frame(16, 16, PixelFormat::RGB, 16 * 3, &pixelData[0]);
+    std::shared_ptr<MemHandle> memHandle;
+    EXPECT_CALL((*mockEngine), dispatchPacket)
+            .Times(testing::AnyNumber())
+            .WillRepeatedly(
+                    testing::DoAll(testing::SaveArg<0>(&memHandle), (Return(Status::SUCCESS))));
+
+    while (fdp.remaining_bytes() > 0) {
+        uint8_t state = fdp.ConsumeIntegralInRange<uint8_t>(RESET, CLONE_PACKET);
+        DefaultEvent e = DefaultEvent::generateEntryEvent(static_cast<DefaultEvent::Phase>(state));
+
+        switch (state) {
+            case RESET:
+            case RUN: {
+                manager->handleExecutionPhase(e);
+                break;
+            }
+            case STOP_WITH_FLUSH: {
+                EXPECT_CALL((*mockEngine), notifyEndOfStream).Times(testing::AtMost(1));
+                manager->handleStopWithFlushPhase(e);
+                sleep(1);
+                break;
+            }
+            case STOP_IMMEDIATE: {
+                EXPECT_CALL((*mockEngine), notifyEndOfStream).Times(testing::AtMost(1));
+                manager->handleStopImmediatePhase(e);
+                sleep(1);
+                break;
+            }
+            case QUEUE_PACKET: {
+                manager->queuePacket(frame, rand());
+                sleep(1);
+                break;
+            }
+            case FREE_PACKET: {
+                if (memHandle != nullptr) {
+                    manager->freePacket(memHandle->getBufferId());
+                }
+                break;
+            }
+            case CLONE_PACKET: {
+                manager->clonePacket(memHandle);
+                break;
+            }
+        }
+    }
+
+    return 0;
+}
+
+}  // namespace
+}  // namespace stream_manager
+}  // namespace runner
+}  // namespace computepipe
+}  // namespace automotive
+}  // namespace android
diff --git a/computepipe/tests/fuzz/SemanticManagerFuzzer.cpp b/computepipe/tests/fuzz/SemanticManagerFuzzer.cpp
new file mode 100644
index 0000000..9b2edb7
--- /dev/null
+++ b/computepipe/tests/fuzz/SemanticManagerFuzzer.cpp
@@ -0,0 +1,75 @@
+/*
+ * Copyright 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.
+ */
+
+#include <fuzzer/FuzzedDataProvider.h>
+#include <gmock/gmock.h>
+#include "EventGenerator.h"
+#include "MockEngine.h"
+#include "StreamManager.h"
+
+namespace android {
+namespace automotive {
+namespace computepipe {
+namespace runner {
+namespace stream_manager {
+
+using android::automotive::computepipe::runner::generator::DefaultEvent;
+using ::testing::Return;
+
+namespace {
+
+std::unique_ptr<StreamManager> SetupStreamManager(const std::shared_ptr<MockEngine>& engine) {
+    StreamManagerFactory factory;
+    proto::OutputConfig config;
+    config.set_type(proto::PacketType::SEMANTIC_DATA);
+    config.set_stream_name("semantic_stream");
+    return factory.getStreamManager(config, engine, 0);
+}
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+    // Set up process
+    char* fakeData = reinterpret_cast<char*>(malloc(sizeof(char) * size));
+    memcpy(fakeData, data, size * sizeof(char));
+
+    std::shared_ptr<MemHandle> currentPacket;
+    DefaultEvent e = DefaultEvent::generateEntryEvent(DefaultEvent::Phase::RUN);
+    std::shared_ptr<testing::NiceMock<MockEngine>> mockEngine =
+            std::make_shared<testing::NiceMock<MockEngine>>();
+    std::unique_ptr<StreamManager> manager = SetupStreamManager(mockEngine);
+    manager->handleExecutionPhase(e);
+
+    // Probably not called
+    ON_CALL((*mockEngine), dispatchPacket)
+            .WillByDefault(
+                    testing::DoAll(testing::SaveArg<0>(&currentPacket), (Return(Status::SUCCESS))));
+
+    manager->queuePacket(fakeData, size, 0);
+
+    if (currentPacket) {
+        EXPECT_EQ(std::memcmp(currentPacket->getData(), fakeData, size), 0);
+        currentPacket = nullptr;
+    }
+
+    free(fakeData);
+    return 0;
+}
+
+}  // namespace
+}  // namespace stream_manager
+}  // namespace runner
+}  // namespace computepipe
+}  // namespace automotive
+}  // namespace android
diff --git a/computepipe/tests/runner/graph/Android.bp b/computepipe/tests/runner/graph/Android.bp
index 14271dd..26fe1cf 100644
--- a/computepipe/tests/runner/graph/Android.bp
+++ b/computepipe/tests/runner/graph/Android.bp
@@ -12,6 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+cc_library_headers {
+    name: "graph_test_headers",
+    export_include_dirs: ["./includes"],
+}
+
 cc_test {
     name: "computepipe_prebuilt_graph_test",
     test_suites: ["device-tests"],
@@ -24,7 +29,7 @@
         "computepipe_runner_component",
         "libgtest",
         "libgmock",
-	      "libcomputepipeprotos",
+        "libcomputepipeprotos",
     ],
     shared_libs: [
         "libstubgraphimpl",
@@ -35,6 +40,7 @@
     ],
     header_libs: [
         "computepipe_runner_includes",
+        "graph_test_headers",
     ],
     include_dirs: [
         "packages/services/Car/computepipe",
@@ -63,7 +69,7 @@
     shared_libs: [
         "computepipe_grpc_graph",
         "libbase",
-	      "libcomputepipeprotos",
+        "libcomputepipeprotos",
         "libgrpc++",
         "libdl",
         "liblog",
@@ -71,6 +77,7 @@
     ],
     header_libs: [
         "computepipe_runner_includes",
+        "graph_test_headers",
     ],
     include_dirs: [
         "packages/services/Car/computepipe",
diff --git a/computepipe/tests/runner/graph/GrpcGraphTest.cpp b/computepipe/tests/runner/graph/GrpcGraphTest.cpp
index 883ef6f..8a0ddc9 100644
--- a/computepipe/tests/runner/graph/GrpcGraphTest.cpp
+++ b/computepipe/tests/runner/graph/GrpcGraphTest.cpp
@@ -22,6 +22,7 @@
 #include <grpc++/grpc++.h>
 
 #include "ClientConfig.pb.h"
+#include "GrpcGraphServerImpl.h"
 #include "GrpcPrebuiltGraphService.grpc.pb.h"
 #include "GrpcPrebuiltGraphService.pb.h"
 #include "Options.pb.h"
@@ -44,190 +45,6 @@
 namespace graph {
 namespace {
 
-constexpr char kGraphName[] = "Dummy graph name";
-constexpr char kSetGraphConfigMessage[] = "Dummy set config message";
-constexpr char kSetDebugOptionMessage[] = "Dummy set debug option message";
-constexpr char kStartGraphMessage[] = "Dummy start graph message";
-constexpr char kStopGraphMessage[] = "Dummy stop graph message";
-constexpr char kOutputStreamPacket[] = "Dummy output stream packet";
-constexpr char kResetGraphMessage[] = "ResetGraphMessage";
-
-// This is a barebones synchronous server implementation. A better implementation would be an
-// asynchronous implementation and it is upto the graph provider to do that. This implementation
-// is very specific to tests being conducted here.
-class GrpcGraphServerImpl : public proto::GrpcGraphService::Service {
-private:
-    std::string mServerAddress;
-    std::unique_ptr<::grpc::Server> mServer;
-    std::mutex mLock;
-    std::condition_variable mShutdownCv;
-    bool mShutdown = false;
-
-public:
-    explicit GrpcGraphServerImpl(std::string address) : mServerAddress(address) {}
-
-    virtual ~GrpcGraphServerImpl() {
-        if (mServer) {
-            mServer->Shutdown();
-            std::unique_lock lock(mLock);
-            if (!mShutdown) {
-                mShutdownCv.wait_for(lock, std::chrono::seconds(10),
-                                     [this]() { return mShutdown; });
-            }
-        }
-    }
-
-    void startServer() {
-        if (mServer == nullptr) {
-            ::grpc::ServerBuilder builder;
-            builder.RegisterService(this);
-            builder.AddListeningPort(mServerAddress, ::grpc::InsecureServerCredentials());
-            mServer = builder.BuildAndStart();
-            mServer->Wait();
-            std::lock_guard lock(mLock);
-            mShutdown = true;
-            mShutdownCv.notify_one();
-        }
-    }
-
-    ::grpc::Status GetGraphOptions(::grpc::ServerContext* context,
-                                   const proto::GraphOptionsRequest* request,
-                                   proto::GraphOptionsResponse* response) override {
-        proto::Options options;
-        options.set_graph_name(kGraphName);
-        response->set_serialized_options(options.SerializeAsString());
-        return ::grpc::Status::OK;
-    }
-
-    ::grpc::Status SetGraphConfig(::grpc::ServerContext* context,
-                                  const proto::SetGraphConfigRequest* request,
-                                  proto::StatusResponse* response) override {
-        response->set_code(proto::RemoteGraphStatusCode::SUCCESS);
-        response->set_message(kSetGraphConfigMessage);
-        return ::grpc::Status::OK;
-    }
-
-    ::grpc::Status SetDebugOption(::grpc::ServerContext* context,
-                                  const proto::SetDebugRequest* request,
-                                  proto::StatusResponse* response) override {
-        response->set_code(proto::RemoteGraphStatusCode::SUCCESS);
-        response->set_message(kSetDebugOptionMessage);
-        return ::grpc::Status::OK;
-    }
-
-    ::grpc::Status StartGraphExecution(::grpc::ServerContext* context,
-                                       const proto::StartGraphExecutionRequest* request,
-                                       proto::StatusResponse* response) override {
-        response->set_code(proto::RemoteGraphStatusCode::SUCCESS);
-        response->set_message(kStartGraphMessage);
-        return ::grpc::Status::OK;
-    }
-
-    ::grpc::Status ObserveOutputStream(
-            ::grpc::ServerContext* context, const proto::ObserveOutputStreamRequest* request,
-            ::grpc::ServerWriter<proto::OutputStreamResponse>* writer) override {
-        // Write as many output packets as stream id. This is just to test different number of
-        // packets received with each stream. Also write even numbered stream as a pixel packet
-        // and odd numbered stream as a data packet.
-        for (int i = 0; i < request->stream_id(); i++) {
-            proto::OutputStreamResponse response;
-            if (request->stream_id() % 2 == 0) {
-                response.mutable_pixel_data()->set_data(kOutputStreamPacket);
-                response.mutable_pixel_data()->set_height(1);
-                response.mutable_pixel_data()->set_width(sizeof(kOutputStreamPacket));
-                response.mutable_pixel_data()->set_step(sizeof(kOutputStreamPacket));
-                response.mutable_pixel_data()->set_format(proto::PixelFormat::GRAY);
-                EXPECT_TRUE(response.has_pixel_data());
-            } else {
-                response.set_semantic_data(kOutputStreamPacket);
-                EXPECT_TRUE(response.has_semantic_data());
-            }
-            if (!writer->Write(response)) {
-                return ::grpc::Status(::grpc::StatusCode::ABORTED, "Connection lost");
-            }
-        }
-
-        return ::grpc::Status::OK;
-    }
-
-    ::grpc::Status StopGraphExecution(::grpc::ServerContext* context,
-                                      const proto::StopGraphExecutionRequest* request,
-                                      proto::StatusResponse* response) override {
-        response->set_code(proto::RemoteGraphStatusCode::SUCCESS);
-        response->set_message(kStopGraphMessage);
-        return ::grpc::Status::OK;
-    }
-
-    ::grpc::Status ResetGraph(::grpc::ServerContext* context,
-                              const proto::ResetGraphRequest* request,
-                              proto::StatusResponse* response) override {
-        response->set_code(proto::RemoteGraphStatusCode::SUCCESS);
-        response->set_message(kResetGraphMessage);
-        return ::grpc::Status::OK;
-    }
-
-    ::grpc::Status GetProfilingData(::grpc::ServerContext* context,
-                                    const proto::ProfilingDataRequest* request,
-                                    proto::ProfilingDataResponse* response) {
-        response->set_data(kSetGraphConfigMessage);
-        return ::grpc::Status::OK;
-    }
-};
-
-class PrebuiltEngineInterfaceImpl : public PrebuiltEngineInterface {
-private:
-    std::map<int, int> mNumPacketsPerStream;
-    std::mutex mLock;
-    std::condition_variable mCv;
-    bool mGraphTerminated = false;
-
-public:
-    // Prebuilt to engine interface
-    void DispatchPixelData(int streamId, int64_t timestamp,
-                           const runner::InputFrame& frame) override {
-        ASSERT_EQ(streamId % 2, 0);
-        std::lock_guard lock(mLock);
-        if (mNumPacketsPerStream.find(streamId) == mNumPacketsPerStream.end()) {
-            mNumPacketsPerStream[streamId] = 1;
-        } else {
-            mNumPacketsPerStream[streamId]++;
-        }
-    }
-
-    void DispatchSerializedData(int streamId, int64_t timestamp, std::string&& data) override {
-        ASSERT_EQ(streamId % 2, 1);
-        std::lock_guard lock(mLock);
-        if (mNumPacketsPerStream.find(streamId) == mNumPacketsPerStream.end()) {
-            mNumPacketsPerStream[streamId] = 1;
-        } else {
-            mNumPacketsPerStream[streamId]++;
-        }
-    }
-
-    void DispatchGraphTerminationMessage(Status status, std::string&& msg) override {
-        std::lock_guard lock(mLock);
-        mGraphTerminated = true;
-        mCv.notify_one();
-    }
-
-    bool waitForTermination() {
-        std::unique_lock lock(mLock);
-        if (!mGraphTerminated) {
-            mCv.wait_for(lock, std::chrono::seconds(10), [this] { return mGraphTerminated; });
-        }
-        return mGraphTerminated;
-    }
-
-    int numPacketsForStream(int streamId) {
-        std::lock_guard lock(mLock);
-        auto it = mNumPacketsPerStream.find(streamId);
-        if (it == mNumPacketsPerStream.end()) {
-            return 0;
-        }
-        return it->second;
-    }
-};
-
 class GrpcGraphTest : public ::testing::Test {
 private:
     std::unique_ptr<GrpcGraphServerImpl> mServer;
diff --git a/computepipe/tests/runner/graph/LocalPrebuiltGraphTest.cpp b/computepipe/tests/runner/graph/LocalPrebuiltGraphTest.cpp
index d63ec51..ddc3aee 100644
--- a/computepipe/tests/runner/graph/LocalPrebuiltGraphTest.cpp
+++ b/computepipe/tests/runner/graph/LocalPrebuiltGraphTest.cpp
@@ -18,6 +18,7 @@
 #include "ClientConfig.pb.h"
 #include "LocalPrebuiltGraph.h"
 #include "PrebuiltEngineInterface.h"
+#include "PrebuiltEngineInterfaceImpl.h"
 #include "ProfilingType.pb.h"
 #include "RunnerComponent.h"
 #include "gmock/gmock-matchers.h"
@@ -36,44 +37,6 @@
 namespace graph {
 namespace {
 
-// Barebones implementation of the PrebuiltEngineInterface. This implementation should suffice for
-// basic cases. More complicated use cases might need their own implementation of it.
-typedef std::function<void(int, int64_t, const runner::InputFrame&)> PixelCallback;
-typedef std::function<void(int, int64_t, std::string&&)> SerializedStreamCallback;
-typedef std::function<void(Status, std::string&&)> GraphTerminationCallback;
-class PrebuiltEngineInterfaceImpl : public PrebuiltEngineInterface {
-private:
-    PixelCallback mPixelCallbackFn;
-    SerializedStreamCallback mSerializedStreamCallbackFn;
-    GraphTerminationCallback mGraphTerminationCallbackFn;
-
-public:
-    virtual ~PrebuiltEngineInterfaceImpl() = default;
-
-    void DispatchPixelData(int streamId, int64_t timestamp,
-                           const runner::InputFrame& frame) override {
-        mPixelCallbackFn(streamId, timestamp, frame);
-    }
-
-    void DispatchSerializedData(int streamId, int64_t timestamp, std::string&& data) override {
-        mSerializedStreamCallbackFn(streamId, timestamp, std::move(data));
-    }
-
-    void DispatchGraphTerminationMessage(Status status, std::string&& msg) override {
-        mGraphTerminationCallbackFn(status, std::move(msg));
-    }
-
-    void SetPixelCallback(PixelCallback callback) { mPixelCallbackFn = callback; }
-
-    void SetSerializedStreamCallback(SerializedStreamCallback callback) {
-        mSerializedStreamCallbackFn = callback;
-    }
-
-    void SetGraphTerminationCallback(GraphTerminationCallback callback) {
-        mGraphTerminationCallbackFn = callback;
-    }
-};
-
 // The stub graph implementation is a passthrough implementation that does not run
 // any graph and returns success for all implementations. The only useful things that
 // it does for the tests are
diff --git a/computepipe/tests/runner/graph/includes/GrpcGraphServerImpl.h b/computepipe/tests/runner/graph/includes/GrpcGraphServerImpl.h
new file mode 100644
index 0000000..a168728
--- /dev/null
+++ b/computepipe/tests/runner/graph/includes/GrpcGraphServerImpl.h
@@ -0,0 +1,233 @@
+/*
+ * Copyright 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.
+ */
+
+#ifndef CPP_COMPUTEPIPE_TESTS_RUNNER_GRAPH_INCLUDES_GRPCGRAPHSERVERIMPL_H_
+#define CPP_COMPUTEPIPE_TESTS_RUNNER_GRAPH_INCLUDES_GRPCGRAPHSERVERIMPL_H_
+
+#include <map>
+#include <memory>
+#include <string>
+#include <thread>
+
+#include <android-base/logging.h>
+#include <grpc++/grpc++.h>
+
+#include "GrpcPrebuiltGraphService.grpc.pb.h"
+#include "GrpcPrebuiltGraphService.pb.h"
+#include "Options.pb.h"
+#include "PrebuiltEngineInterface.h"
+#include "PrebuiltGraph.h"
+#include "RunnerComponent.h"
+#include "gmock/gmock-matchers.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+#include "types/Status.h"
+
+namespace android {
+namespace automotive {
+namespace computepipe {
+namespace graph {
+
+constexpr char kGraphName[] = "Stub graph name";
+constexpr char kSetGraphConfigMessage[] = "Stub set config message";
+constexpr char kSetDebugOptionMessage[] = "Stub set debug option message";
+constexpr char kStartGraphMessage[] = "Stub start graph message";
+constexpr char kStopGraphMessage[] = "Stub stop graph message";
+constexpr char kOutputStreamPacket[] = "Stub output stream packet";
+constexpr char kResetGraphMessage[] = "ResetGraphMessage";
+
+// This is a barebones synchronous server implementation. A better implementation would be an
+// asynchronous implementation and it is upto the graph provider to do that. This implementation
+// is very specific to tests being conducted here.
+class GrpcGraphServerImpl : public proto::GrpcGraphService::Service {
+private:
+    std::string mServerAddress;
+    std::unique_ptr<::grpc::Server> mServer;
+    std::mutex mLock;
+    std::condition_variable mShutdownCv;
+    bool mShutdown = false;
+
+public:
+    explicit GrpcGraphServerImpl(std::string address) : mServerAddress(address) {}
+
+    virtual ~GrpcGraphServerImpl() {
+        if (mServer) {
+            mServer->Shutdown();
+            std::unique_lock lock(mLock);
+            if (!mShutdown) {
+                mShutdownCv.wait_for(lock, std::chrono::seconds(10),
+                                     [this]() { return mShutdown; });
+            }
+        }
+    }
+
+    void startServer() {
+        if (mServer == nullptr) {
+            ::grpc::ServerBuilder builder;
+            builder.RegisterService(this);
+            builder.AddListeningPort(mServerAddress, ::grpc::InsecureServerCredentials());
+            mServer = builder.BuildAndStart();
+            mServer->Wait();
+            std::lock_guard lock(mLock);
+            mShutdown = true;
+            mShutdownCv.notify_one();
+        }
+    }
+
+    ::grpc::Status GetGraphOptions(::grpc::ServerContext* context,
+                                   const proto::GraphOptionsRequest* request,
+                                   proto::GraphOptionsResponse* response) override {
+        proto::Options options;
+        options.set_graph_name(kGraphName);
+        response->set_serialized_options(options.SerializeAsString());
+        return ::grpc::Status::OK;
+    }
+
+    ::grpc::Status SetGraphConfig(::grpc::ServerContext* context,
+                                  const proto::SetGraphConfigRequest* request,
+                                  proto::StatusResponse* response) override {
+        response->set_code(proto::RemoteGraphStatusCode::SUCCESS);
+        response->set_message(kSetGraphConfigMessage);
+        return ::grpc::Status::OK;
+    }
+
+    ::grpc::Status SetDebugOption(::grpc::ServerContext* context,
+                                  const proto::SetDebugRequest* request,
+                                  proto::StatusResponse* response) override {
+        response->set_code(proto::RemoteGraphStatusCode::SUCCESS);
+        response->set_message(kSetDebugOptionMessage);
+        return ::grpc::Status::OK;
+    }
+
+    ::grpc::Status StartGraphExecution(::grpc::ServerContext* context,
+                                       const proto::StartGraphExecutionRequest* request,
+                                       proto::StatusResponse* response) override {
+        response->set_code(proto::RemoteGraphStatusCode::SUCCESS);
+        response->set_message(kStartGraphMessage);
+        return ::grpc::Status::OK;
+    }
+
+    ::grpc::Status ObserveOutputStream(
+            ::grpc::ServerContext* context, const proto::ObserveOutputStreamRequest* request,
+            ::grpc::ServerWriter<proto::OutputStreamResponse>* writer) override {
+        // Write as many output packets as stream id. This is just to test different number of
+        // packets received with each stream. Also write even numbered stream as a pixel packet
+        // and odd numbered stream as a data packet.
+        for (int i = 0; i < request->stream_id(); i++) {
+            proto::OutputStreamResponse response;
+            if (request->stream_id() % 2 == 0) {
+                response.mutable_pixel_data()->set_data(kOutputStreamPacket);
+                response.mutable_pixel_data()->set_height(1);
+                response.mutable_pixel_data()->set_width(sizeof(kOutputStreamPacket));
+                response.mutable_pixel_data()->set_step(sizeof(kOutputStreamPacket));
+                response.mutable_pixel_data()->set_format(proto::PixelFormat::GRAY);
+                EXPECT_TRUE(response.has_pixel_data());
+            } else {
+                response.set_semantic_data(kOutputStreamPacket);
+                EXPECT_TRUE(response.has_semantic_data());
+            }
+            if (!writer->Write(response)) {
+                return ::grpc::Status(::grpc::StatusCode::ABORTED, "Connection lost");
+            }
+        }
+
+        return ::grpc::Status::OK;
+    }
+
+    ::grpc::Status StopGraphExecution(::grpc::ServerContext* context,
+                                      const proto::StopGraphExecutionRequest* request,
+                                      proto::StatusResponse* response) override {
+        response->set_code(proto::RemoteGraphStatusCode::SUCCESS);
+        response->set_message(kStopGraphMessage);
+        return ::grpc::Status::OK;
+    }
+
+    ::grpc::Status ResetGraph(::grpc::ServerContext* context,
+                              const proto::ResetGraphRequest* request,
+                              proto::StatusResponse* response) override {
+        response->set_code(proto::RemoteGraphStatusCode::SUCCESS);
+        response->set_message(kResetGraphMessage);
+        return ::grpc::Status::OK;
+    }
+
+    ::grpc::Status GetProfilingData(::grpc::ServerContext* context,
+                                    const proto::ProfilingDataRequest* request,
+                                    proto::ProfilingDataResponse* response) {
+        response->set_data(kSetGraphConfigMessage);
+        return ::grpc::Status::OK;
+    }
+};
+
+class PrebuiltEngineInterfaceImpl : public PrebuiltEngineInterface {
+private:
+    std::map<int, int> mNumPacketsPerStream;
+    std::mutex mLock;
+    std::condition_variable mCv;
+    bool mGraphTerminated = false;
+
+public:
+    // Prebuilt to engine interface
+    void DispatchPixelData(int streamId, int64_t timestamp,
+                           const runner::InputFrame& frame) override {
+        ASSERT_EQ(streamId % 2, 0);
+        std::lock_guard lock(mLock);
+        if (mNumPacketsPerStream.find(streamId) == mNumPacketsPerStream.end()) {
+            mNumPacketsPerStream[streamId] = 1;
+        } else {
+            mNumPacketsPerStream[streamId]++;
+        }
+    }
+
+    void DispatchSerializedData(int streamId, int64_t timestamp, std::string&& data) override {
+        ASSERT_EQ(streamId % 2, 1);
+        std::lock_guard lock(mLock);
+        if (mNumPacketsPerStream.find(streamId) == mNumPacketsPerStream.end()) {
+            mNumPacketsPerStream[streamId] = 1;
+        } else {
+            mNumPacketsPerStream[streamId]++;
+        }
+    }
+
+    void DispatchGraphTerminationMessage(Status status, std::string&& msg) override {
+        std::lock_guard lock(mLock);
+        mGraphTerminated = true;
+        mCv.notify_one();
+    }
+
+    bool waitForTermination() {
+        std::unique_lock lock(mLock);
+        if (!mGraphTerminated) {
+            mCv.wait_for(lock, std::chrono::seconds(10), [this] { return mGraphTerminated; });
+        }
+        return mGraphTerminated;
+    }
+
+    int numPacketsForStream(int streamId) {
+        std::lock_guard lock(mLock);
+        auto it = mNumPacketsPerStream.find(streamId);
+        if (it == mNumPacketsPerStream.end()) {
+            return 0;
+        }
+        return it->second;
+    }
+};
+
+}  // namespace graph
+}  // namespace computepipe
+}  // namespace automotive
+}  // namespace android
+
+#endif  // CPP_COMPUTEPIPE_TESTS_RUNNER_GRAPH_INCLUDES_GRPCGRAPHSERVERIMPL_H_
diff --git a/computepipe/tests/runner/graph/includes/PrebuiltEngineInterfaceImpl.h b/computepipe/tests/runner/graph/includes/PrebuiltEngineInterfaceImpl.h
new file mode 100644
index 0000000..70326ab
--- /dev/null
+++ b/computepipe/tests/runner/graph/includes/PrebuiltEngineInterfaceImpl.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright 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.
+ */
+
+#ifndef CPP_COMPUTEPIPE_TESTS_RUNNER_GRAPH_INCLUDES_PREBUILTENGINEINTERFACEIMPL_H_
+#define CPP_COMPUTEPIPE_TESTS_RUNNER_GRAPH_INCLUDES_PREBUILTENGINEINTERFACEIMPL_H_
+
+#include <string>
+
+#include "ClientConfig.pb.h"
+#include "LocalPrebuiltGraph.h"
+#include "PrebuiltEngineInterface.h"
+#include "ProfilingType.pb.h"
+#include "RunnerComponent.h"
+#include "gmock/gmock-matchers.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+#include "types/Status.h"
+
+namespace android {
+namespace automotive {
+namespace computepipe {
+namespace graph {
+
+// Barebones implementation of the PrebuiltEngineInterface. This implementation should suffice for
+// basic cases. More complicated use cases might need their own implementation of it.
+typedef std::function<void(int, int64_t, const runner::InputFrame&)> PixelCallback;
+typedef std::function<void(int, int64_t, std::string&&)> SerializedStreamCallback;
+typedef std::function<void(Status, std::string&&)> GraphTerminationCallback;
+class PrebuiltEngineInterfaceImpl : public PrebuiltEngineInterface {
+private:
+    PixelCallback mPixelCallbackFn;
+    SerializedStreamCallback mSerializedStreamCallbackFn;
+    GraphTerminationCallback mGraphTerminationCallbackFn;
+
+public:
+    virtual ~PrebuiltEngineInterfaceImpl() = default;
+
+    void DispatchPixelData(int streamId, int64_t timestamp,
+                           const runner::InputFrame& frame) override {
+        mPixelCallbackFn(streamId, timestamp, frame);
+    }
+
+    void DispatchSerializedData(int streamId, int64_t timestamp, std::string&& data) override {
+        mSerializedStreamCallbackFn(streamId, timestamp, std::move(data));
+    }
+
+    void DispatchGraphTerminationMessage(Status status, std::string&& msg) override {
+        mGraphTerminationCallbackFn(status, std::move(msg));
+    }
+
+    void SetPixelCallback(PixelCallback callback) { mPixelCallbackFn = callback; }
+
+    void SetSerializedStreamCallback(SerializedStreamCallback callback) {
+        mSerializedStreamCallbackFn = callback;
+    }
+
+    void SetGraphTerminationCallback(GraphTerminationCallback callback) {
+        mGraphTerminationCallbackFn = callback;
+    }
+};
+
+}  // namespace graph
+}  // namespace computepipe
+}  // namespace automotive
+}  // namespace android
+
+#endif  // CPP_COMPUTEPIPE_TESTS_RUNNER_GRAPH_INCLUDES_PREBUILTENGINEINTERFACEIMPL_H_
diff --git a/surround_view/OWNERS b/cpp/surround_view/OWNERS
similarity index 100%
rename from surround_view/OWNERS
rename to cpp/surround_view/OWNERS
diff --git a/surround_view/app/Android.bp b/cpp/surround_view/app/Android.bp
similarity index 100%
rename from surround_view/app/Android.bp
rename to cpp/surround_view/app/Android.bp
diff --git a/surround_view/app/SurroundViewServiceCallback.cpp b/cpp/surround_view/app/SurroundViewServiceCallback.cpp
similarity index 97%
rename from surround_view/app/SurroundViewServiceCallback.cpp
rename to cpp/surround_view/app/SurroundViewServiceCallback.cpp
index 05a598f..12dba98 100644
--- a/surround_view/app/SurroundViewServiceCallback.cpp
+++ b/cpp/surround_view/app/SurroundViewServiceCallback.cpp
@@ -144,17 +144,15 @@
         return false;
     }
 
-    // Create a dummy pbuffer so we have a surface to bind -- we never intend
+    // Create a placeholder pbuffer so we have a surface to bind -- we never intend
     // to draw to this because attachRenderTarget will be called first.
     EGLint surface_attribs[] = { EGL_WIDTH, 1, EGL_HEIGHT, 1, EGL_NONE };
-    EGLSurface sDummySurface = eglCreatePbufferSurface(display, egl_config,
-                                                       surface_attribs);
-    if (sDummySurface == EGL_NO_SURFACE) {
-        LOG(ERROR) << "Failed to create OpenGL ES Dummy surface: "
-                   << getEGLError();
+    EGLSurface sPlaceholderSurface = eglCreatePbufferSurface(display, egl_config, surface_attribs);
+    if (sPlaceholderSurface == EGL_NO_SURFACE) {
+        LOG(ERROR) << "Failed to create OpenGL ES Placeholder surface: " << getEGLError();
         return false;
     } else {
-        LOG(INFO) << "Dummy surface looks good!  :)";
+        LOG(INFO) << "Placeholder surface looks good!  :)";
     }
 
     //
@@ -169,7 +167,7 @@
     }
 
     // Activate our render target for drawing
-    if (!eglMakeCurrent(display, sDummySurface, sDummySurface, context)) {
+    if (!eglMakeCurrent(display, sPlaceholderSurface, sPlaceholderSurface, context)) {
         LOG(ERROR) << "Failed to make the OpenGL ES Context current: "
                    << getEGLError();
         return false;
diff --git a/surround_view/app/SurroundViewServiceCallback.h b/cpp/surround_view/app/SurroundViewServiceCallback.h
similarity index 100%
rename from surround_view/app/SurroundViewServiceCallback.h
rename to cpp/surround_view/app/SurroundViewServiceCallback.h
diff --git a/surround_view/app/shader.cpp b/cpp/surround_view/app/shader.cpp
similarity index 100%
rename from surround_view/app/shader.cpp
rename to cpp/surround_view/app/shader.cpp
diff --git a/surround_view/app/shader.h b/cpp/surround_view/app/shader.h
similarity index 100%
rename from surround_view/app/shader.h
rename to cpp/surround_view/app/shader.h
diff --git a/surround_view/app/shader_simpleTex.h b/cpp/surround_view/app/shader_simpleTex.h
similarity index 100%
rename from surround_view/app/shader_simpleTex.h
rename to cpp/surround_view/app/shader_simpleTex.h
diff --git a/surround_view/app/sv_app.cpp b/cpp/surround_view/app/sv_app.cpp
similarity index 70%
rename from surround_view/app/sv_app.cpp
rename to cpp/surround_view/app/sv_app.cpp
index 2fe0c86..43369c2 100644
--- a/surround_view/app/sv_app.cpp
+++ b/cpp/surround_view/app/sv_app.cpp
@@ -50,6 +50,53 @@
     DEMO_3D,
 };
 
+const float kHorizontalFov = 90;
+
+// Number of views to generate.
+const uint32_t kPoseCount = 16;
+
+// Set of pose rotations expressed in quaternions.
+// Views are generated about a circle at a height about the car, point towards the center.
+const float kPoseRot[kPoseCount][4] = {
+    {-0.251292, -0.251292, -0.660948, 0.660948},
+    {0.197439, 0.295488, 0.777193, -0.519304},
+    {0.135998, 0.328329, 0.86357, -0.357702},
+    {0.0693313, 0.348552, 0.916761, -0.182355},
+    {-7.76709e-09, 0.355381, 0.934722, 2.0429e-08},
+    {-0.0693313, 0.348552, 0.916761, 0.182355},
+    {-0.135998, 0.328329, 0.86357, 0.357702},
+    {-0.197439, 0.295488, 0.777193, 0.519304},
+    {-0.251292, 0.251292, 0.660948, 0.660948},
+    {-0.295488, 0.197439, 0.519304, 0.777193},
+    {-0.328329, 0.135998, 0.357702, 0.86357},
+    {-0.348552, 0.0693313, 0.182355, 0.916761},
+    {-0.355381, -2.11894e-09, -5.57322e-09, 0.934722},
+    {-0.348552, -0.0693313, -0.182355, 0.916761},
+    {-0.328329, -0.135998, -0.357702, 0.86357},
+    {-0.295488, -0.197439, -0.519304, 0.777193}
+};
+
+// Set of pose translations i.e. positions of the views.
+// Views are generated about a circle at a height about the car, point towards the center.
+const float kPoseTrans[kPoseCount][4] = {
+    {4, 0, 2.5},
+    {3.69552, 1.53073, 2.5},
+    {2.82843, 2.82843, 2.5},
+    {1.53073, 3.69552, 2.5},
+    {-1.74846e-07, 4, 2.5},
+    {-1.53073, 3.69552, 2.5},
+    {-2.82843, 2.82843, 2.5},
+    {-3.69552, 1.53073, 2.5},
+    {-4, -3.49691e-07, 2.5},
+    {-3.69552, -1.53073, 2.5},
+    {-2.82843, -2.82843, 2.5},
+    {-1.53073, -3.69552, 2.5},
+    {4.76995e-08, -4, 2.5},
+    {1.53073, -3.69552, 2.5},
+    {2.82843, -2.82843, 2.5},
+    {3.69552, -1.53073, 2.5}
+};
+
 bool run2dSurroundView(sp<ISurroundViewService> pSurroundViewService,
                        sp<IEvsDisplay> pDisplay) {
     LOG(INFO) << "Run 2d Surround View demo";
@@ -108,6 +155,28 @@
     return true;
 };
 
+// Given a valid sv 3d session and pose, viewid and hfov parameters, sets the view.
+bool setView(sp<ISurroundView3dSession> surroundView3dSession, uint32_t viewId,
+        uint32_t poseIndex, float hfov)
+{
+    const View3d view3d = {
+        .viewId = viewId,
+        .pose = {
+            .rotation = {.x=kPoseRot[poseIndex][0], .y=kPoseRot[poseIndex][1],
+                    .z=kPoseRot[poseIndex][2], .w=kPoseRot[poseIndex][3]},
+            .translation = {.x=kPoseTrans[poseIndex][0], .y=kPoseTrans[poseIndex][1],
+                    .z=kPoseTrans[poseIndex][2]},
+        },
+        .horizontalFov = hfov,
+    };
+
+    const std::vector<View3d> views = {view3d};
+    if (surroundView3dSession->setViews(views) != SvResult::OK) {
+        return false;
+    }
+    return true;
+}
+
 bool run3dSurroundView(sp<ISurroundViewService> pSurroundViewService,
                        sp<IEvsDisplay> pDisplay) {
     LOG(INFO) << "Run 3d Surround View demo";
@@ -130,19 +199,15 @@
         LOG(INFO) << "start3dSession succeeded";
     }
 
-    // TODO(b/150412555): now we have the dummy view here since the views are
-    // set in service. This should be fixed.
-    std::vector<View3d> singleView(1);
-    surroundView3dSession->setViews(singleView);
-
-    if (surroundView3dSession->setViews(singleView) != SvResult::OK) {
-        LOG(ERROR) << "Failed to setViews";
-        return false;
-    }
-
     sp<SurroundViewServiceCallback> sv3dCallback
         = new SurroundViewServiceCallback(pDisplay, surroundView3dSession);
 
+    // A view must be set before the 3d stream is started.
+    if (!setView(surroundView3dSession, 0, 0, kHorizontalFov)) {
+        LOG(ERROR) << "Failed to setView of pose index :" << 0;
+        return false;
+    }
+
     // Start 3d stream with callback
     if (surroundView3dSession->startStream(sv3dCallback) != SvResult::OK) {
         LOG(ERROR) << "Failed to start 3d stream";
@@ -150,7 +215,15 @@
     }
 
     // Let the SV algorithm run for 10 seconds for HIGH_QUALITY
-    std::this_thread::sleep_for(std::chrono::seconds(10));
+    const int totalViewingTimeSecs = 10;
+    const std::chrono::milliseconds
+            perPoseSleepTimeMs(totalViewingTimeSecs * 1000 / kPoseCount);
+    for(uint32_t i = 1; i < kPoseCount; i++) {
+        if (!setView(surroundView3dSession, i, i, kHorizontalFov)) {
+            LOG(WARNING) << "Failed to setView of pose index :" << i;
+        }
+        std::this_thread::sleep_for(perPoseSleepTimeMs);
+    }
 
     // Switch to low quality and lower resolution
     Sv3dConfig config;
@@ -163,7 +236,12 @@
     }
 
     // Let the SV algorithm run for 10 seconds for LOW_QUALITY
-    std::this_thread::sleep_for(std::chrono::seconds(10));
+    for(uint32_t i = 0; i < kPoseCount; i++) {
+        if(!setView(surroundView3dSession, i + kPoseCount, i, kHorizontalFov)) {
+            LOG(WARNING) << "Failed to setView of pose index :" << i;
+        }
+        std::this_thread::sleep_for(perPoseSleepTimeMs);
+    }
 
     // TODO(b/150412555): wait for the last frame
     // Stop the 3d stream and session
diff --git a/surround_view/app/sv_app.rc b/cpp/surround_view/app/sv_app.rc
similarity index 100%
rename from surround_view/app/sv_app.rc
rename to cpp/surround_view/app/sv_app.rc
diff --git a/surround_view/sepolicy/file_contexts b/cpp/surround_view/sepolicy/file_contexts
similarity index 100%
rename from surround_view/sepolicy/file_contexts
rename to cpp/surround_view/sepolicy/file_contexts
diff --git a/surround_view/sepolicy/sv_app.te b/cpp/surround_view/sepolicy/sv_app.te
similarity index 100%
rename from surround_view/sepolicy/sv_app.te
rename to cpp/surround_view/sepolicy/sv_app.te
diff --git a/surround_view/sepolicy/sv_service_impl.te b/cpp/surround_view/sepolicy/sv_service_impl.te
similarity index 100%
rename from surround_view/sepolicy/sv_service_impl.te
rename to cpp/surround_view/sepolicy/sv_service_impl.te
diff --git a/surround_view/service-impl/Android.bp b/cpp/surround_view/service-impl/Android.bp
similarity index 83%
rename from surround_view/service-impl/Android.bp
rename to cpp/surround_view/service-impl/Android.bp
index 7580795..c82857f 100644
--- a/surround_view/service-impl/Android.bp
+++ b/cpp/surround_view/service-impl/Android.bp
@@ -156,7 +156,6 @@
     vendor : true,
     srcs : [
         "CameraUtils.cpp",
-        "CoreLibSetupHelper.cpp",
         "SurroundView2dSession.cpp",
         "SurroundView3dSession.cpp",
     ],
@@ -175,9 +174,11 @@
         "libhardware",
         "libhidlbase",
         "libhidlmemory",
+        "libnativewindow",
         "libio_module",
         "libui",
         "libutils",
+        "libvulkan",
         "libvhal_handler",
     ],
     required : [
@@ -206,11 +207,11 @@
 }
 
 cc_test{
-    name : "sv_session_tests",
+    name : "sv_2d_session_tests",
     test_suites : ["device-tests"],
     vendor : true,
     srcs : [
-        "SurroundViewSessionTests.cpp",
+        "SurroundView2dSessionTests.cpp",
         "mock-evs/MockEvsCamera.cpp",
         "mock-evs/MockEvsEnumerator.cpp",
         "mock-evs/MockSurroundViewCallback.cpp",
@@ -254,6 +255,70 @@
             enabled : true,
         },
     },
+    required : [
+        "sample_car.obj",
+        "sample_car_material.mtl",
+        "sv_sample_config.xml",
+        "sv_sample_car_model_config.xml",
+    ],
+}
+
+cc_test{
+    name : "sv_3d_session_tests",
+    test_suites : ["device-tests"],
+    vendor : true,
+    srcs : [
+        "SurroundView3dSessionTests.cpp",
+        "mock-evs/MockEvsCamera.cpp",
+        "mock-evs/MockEvsEnumerator.cpp",
+        "mock-evs/MockSurroundViewCallback.cpp",
+    ],
+    include_dirs: [
+        "packages/services/Car/evs/sampleDriver",
+    ],
+    shared_libs : [
+        "android.hardware.automotive.evs@1.0",
+        "android.hardware.automotive.evs@1.1",
+        "android.hardware.automotive.sv@1.0",
+        "android.hardware.automotive.vehicle@2.0",
+        "android.hidl.memory@1.0",
+        "android.hidl.allocator@1.0",
+        "libanimation_module",
+        "libbase",
+        "libbinder",
+        "libcamera_metadata",
+        "libcore_lib_shared",
+        "libcutils",
+        "libevsconfigmanager",
+        "libhardware",
+        "libhidlbase",
+        "libhidlmemory",
+        "libio_module",
+        "libsvsession",
+        "libtinyxml2",
+        "libui",
+        "libutils",
+        "libvhal_handler",
+    ],
+    // Disable builds except for arm64 and emulator devices
+    enabled : false,
+    arch : {
+        arm64 : {
+            enabled : true,
+        },
+        x86 : {
+            enabled : true,
+        },
+        x86_64 : {
+            enabled : true,
+        },
+    },
+    required : [
+        "sample_car.obj",
+        "sample_car_material.mtl",
+        "sv_sample_config.xml",
+        "sv_sample_car_model_config.xml",
+    ],
 }
 
 cc_binary{
@@ -333,6 +398,7 @@
         "libdl",
         "libz",
         "liblog",
+        "libvulkan",
     ],
 }
 
diff --git a/surround_view/service-impl/AnimationModule.cpp b/cpp/surround_view/service-impl/AnimationModule.cpp
similarity index 100%
rename from surround_view/service-impl/AnimationModule.cpp
rename to cpp/surround_view/service-impl/AnimationModule.cpp
diff --git a/surround_view/service-impl/AnimationModule.h b/cpp/surround_view/service-impl/AnimationModule.h
similarity index 100%
rename from surround_view/service-impl/AnimationModule.h
rename to cpp/surround_view/service-impl/AnimationModule.h
diff --git a/surround_view/service-impl/AnimationModuleTests.cpp b/cpp/surround_view/service-impl/AnimationModuleTests.cpp
similarity index 100%
rename from surround_view/service-impl/AnimationModuleTests.cpp
rename to cpp/surround_view/service-impl/AnimationModuleTests.cpp
diff --git a/surround_view/service-impl/CameraUtils.cpp b/cpp/surround_view/service-impl/CameraUtils.cpp
similarity index 100%
rename from surround_view/service-impl/CameraUtils.cpp
rename to cpp/surround_view/service-impl/CameraUtils.cpp
diff --git a/surround_view/service-impl/CameraUtils.h b/cpp/surround_view/service-impl/CameraUtils.h
similarity index 100%
rename from surround_view/service-impl/CameraUtils.h
rename to cpp/surround_view/service-impl/CameraUtils.h
diff --git a/surround_view/service-impl/CarModelConfigReader.cpp b/cpp/surround_view/service-impl/CarModelConfigReader.cpp
similarity index 100%
rename from surround_view/service-impl/CarModelConfigReader.cpp
rename to cpp/surround_view/service-impl/CarModelConfigReader.cpp
diff --git a/surround_view/service-impl/CarModelConfigReader.h b/cpp/surround_view/service-impl/CarModelConfigReader.h
similarity index 100%
rename from surround_view/service-impl/CarModelConfigReader.h
rename to cpp/surround_view/service-impl/CarModelConfigReader.h
diff --git a/surround_view/service-impl/CarModelConfigReaderTests.cpp b/cpp/surround_view/service-impl/CarModelConfigReaderTests.cpp
similarity index 95%
rename from surround_view/service-impl/CarModelConfigReaderTests.cpp
rename to cpp/surround_view/service-impl/CarModelConfigReaderTests.cpp
index 916002b..81f8192 100644
--- a/surround_view/service-impl/CarModelConfigReaderTests.cpp
+++ b/cpp/surround_view/service-impl/CarModelConfigReaderTests.cpp
@@ -34,7 +34,7 @@
 
 TEST(CarModelConfigReaderTests, CarModelReadConfigSuccess) {
     AnimationConfig animationConfig;
-    EXPECT_EQ(ReadCarModelConfig("/vendor/automotive/sv/sv_sample_car_model_config.xml",
+    EXPECT_EQ(ReadCarModelConfig("/vendor/etc/automotive/sv/sv_sample_car_model_config.xml",
                                  &animationConfig),
               IOStatus::OK);
 
@@ -45,7 +45,7 @@
     {
         AnimationInfo doorAnimation = animationConfig.animations.at(0);
         EXPECT_EQ(doorAnimation.partId, "door");
-        EXPECT_EQ(doorAnimation.childIds.size(), 2);
+        EXPECT_EQ(doorAnimation.childIds.size(), 1);
         EXPECT_EQ(doorAnimation.pose, gMat4Identity);
 
         EXPECT_EQ(doorAnimation.rotationOpsMap.size(), 1);
diff --git a/surround_view/service-impl/ConfigReader.cpp b/cpp/surround_view/service-impl/ConfigReader.cpp
similarity index 97%
rename from surround_view/service-impl/ConfigReader.cpp
rename to cpp/surround_view/service-impl/ConfigReader.cpp
index cc97d4e..cc1c81b 100644
--- a/surround_view/service-impl/ConfigReader.cpp
+++ b/cpp/surround_view/service-impl/ConfigReader.cpp
@@ -132,6 +132,10 @@
             RETURN_IF_FALSE(ReadValue2dBlendType(blendingTypeElem, "LowQuality",
                                                  &sv2dParams->low_quality_blending));
         }
+
+        // GPU Acceleration enabled or not
+        RETURN_IF_FALSE(ReadValue(param2dElem, "GpuAccelerationEnabled",
+                                  &sv2dParams->gpu_acceleration_enabled));
     }
     return true;
 }
diff --git a/surround_view/service-impl/ConfigReader.h b/cpp/surround_view/service-impl/ConfigReader.h
similarity index 100%
rename from surround_view/service-impl/ConfigReader.h
rename to cpp/surround_view/service-impl/ConfigReader.h
diff --git a/surround_view/service-impl/ConfigReaderTests.cpp b/cpp/surround_view/service-impl/ConfigReaderTests.cpp
similarity index 76%
rename from surround_view/service-impl/ConfigReaderTests.cpp
rename to cpp/surround_view/service-impl/ConfigReaderTests.cpp
index ef51a5f..7d12322 100644
--- a/surround_view/service-impl/ConfigReaderTests.cpp
+++ b/cpp/surround_view/service-impl/ConfigReaderTests.cpp
@@ -36,7 +36,7 @@
 
 TEST(ConfigReaderTests, ReadConfigSuccess) {
     SurroundViewConfig svConfig;
-    EXPECT_EQ(ReadSurroundViewConfig("/vendor/automotive/sv/sv_sample_config.xml", &svConfig),
+    EXPECT_EQ(ReadSurroundViewConfig("/vendor/etc/automotive/sv/sv_sample_config.xml", &svConfig),
               IOStatus::OK);
 
     EXPECT_EQ(svConfig.version, "1.0");
@@ -45,26 +45,27 @@
     EXPECT_EQ(svConfig.cameraConfig.evsGroupId, "v4l2loopback_group0");
 
     // Camera Ids
-    EXPECT_EQ(svConfig.cameraConfig.evsCameraIds[0], "/dev/video90");
-    EXPECT_EQ(svConfig.cameraConfig.evsCameraIds[1], "/dev/video91");
-    EXPECT_EQ(svConfig.cameraConfig.evsCameraIds[2], "/dev/video92");
-    EXPECT_EQ(svConfig.cameraConfig.evsCameraIds[3], "/dev/video93");
+    EXPECT_EQ(svConfig.cameraConfig.evsCameraIds[0], "/dev/video60");
+    EXPECT_EQ(svConfig.cameraConfig.evsCameraIds[1], "/dev/video61");
+    EXPECT_EQ(svConfig.cameraConfig.evsCameraIds[2], "/dev/video62");
+    EXPECT_EQ(svConfig.cameraConfig.evsCameraIds[3], "/dev/video63");
 
     // Masks
     EXPECT_EQ(svConfig.cameraConfig.maskFilenames.size(), 4);
-    EXPECT_EQ(svConfig.cameraConfig.maskFilenames[0], "/vendor/mask_front.png");
-    EXPECT_EQ(svConfig.cameraConfig.maskFilenames[1], "/vendor/mask_right.png");
-    EXPECT_EQ(svConfig.cameraConfig.maskFilenames[2], "/vendor/mask_rear.png");
-    EXPECT_EQ(svConfig.cameraConfig.maskFilenames[3], "/vendor/mask_left.png");
+    EXPECT_EQ(svConfig.cameraConfig.maskFilenames[0], "/vendor/etc/automotive/sv/mask_front.png");
+    EXPECT_EQ(svConfig.cameraConfig.maskFilenames[1], "/vendor/etc/automotive/sv/mask_right.png");
+    EXPECT_EQ(svConfig.cameraConfig.maskFilenames[2], "/vendor/etc/automotive/sv/mask_rear.png");
+    EXPECT_EQ(svConfig.cameraConfig.maskFilenames[3], "/vendor/etc/automotive/sv/mask_left.png");
 
     // Surround view 2D
     EXPECT_EQ(svConfig.sv2dConfig.sv2dEnabled, true);
-    EXPECT_EQ(svConfig.sv2dConfig.sv2dParams.resolution.width, 600);
-    EXPECT_EQ(svConfig.sv2dConfig.sv2dParams.resolution.height, 900);
-    EXPECT_EQ(svConfig.sv2dConfig.sv2dParams.physical_size.width, 6.0);
-    EXPECT_EQ(svConfig.sv2dConfig.sv2dParams.physical_size.height, 9.0);
+    EXPECT_EQ(svConfig.sv2dConfig.sv2dParams.resolution.width, 768);
+    EXPECT_EQ(svConfig.sv2dConfig.sv2dParams.resolution.height, 1024);
+    EXPECT_EQ(svConfig.sv2dConfig.sv2dParams.physical_size.width, 9.0);
+    EXPECT_EQ(svConfig.sv2dConfig.sv2dParams.physical_size.height, 12.0);
     EXPECT_EQ(svConfig.sv2dConfig.sv2dParams.physical_center.x, 0.0);
     EXPECT_EQ(svConfig.sv2dConfig.sv2dParams.physical_center.y, 0.0);
+    EXPECT_EQ(svConfig.sv2dConfig.sv2dParams.gpu_acceleration_enabled, false);
     EXPECT_EQ(svConfig.sv2dConfig.carBoundingBox.width, 2.0);
     EXPECT_EQ(svConfig.sv2dConfig.carBoundingBox.height, 3.0);
     EXPECT_EQ(svConfig.sv2dConfig.carBoundingBox.x, 1.0);
@@ -78,12 +79,12 @@
     EXPECT_EQ(svConfig.sv3dConfig.sv3dEnabled, true);
     EXPECT_NE(svConfig.sv3dConfig.carModelConfigFile, "");
     EXPECT_NE(svConfig.sv3dConfig.carModelObjFile, "");
-    EXPECT_EQ(svConfig.sv3dConfig.sv3dParams.plane_radius, 6.0);
-    EXPECT_EQ(svConfig.sv3dConfig.sv3dParams.plane_divisions, 20);
-    EXPECT_EQ(svConfig.sv3dConfig.sv3dParams.curve_height, 5.0);
-    EXPECT_EQ(svConfig.sv3dConfig.sv3dParams.curve_divisions, 30);
-    EXPECT_EQ(svConfig.sv3dConfig.sv3dParams.angular_divisions, 50);
-    EXPECT_EQ(svConfig.sv3dConfig.sv3dParams.curve_coefficient, 2.0);
+    EXPECT_EQ(svConfig.sv3dConfig.sv3dParams.plane_radius, 8.0);
+    EXPECT_EQ(svConfig.sv3dConfig.sv3dParams.plane_divisions, 50);
+    EXPECT_EQ(svConfig.sv3dConfig.sv3dParams.curve_height, 6.0);
+    EXPECT_EQ(svConfig.sv3dConfig.sv3dParams.curve_divisions, 50);
+    EXPECT_EQ(svConfig.sv3dConfig.sv3dParams.angular_divisions, 90);
+    EXPECT_EQ(svConfig.sv3dConfig.sv3dParams.curve_coefficient, 3.0);
     EXPECT_EQ(svConfig.sv3dConfig.sv3dParams.high_details_shadows, true);
     EXPECT_EQ(svConfig.sv3dConfig.sv3dParams.high_details_reflections, true);
 }
diff --git a/surround_view/service-impl/ConfigReaderUtil.cpp b/cpp/surround_view/service-impl/ConfigReaderUtil.cpp
similarity index 100%
rename from surround_view/service-impl/ConfigReaderUtil.cpp
rename to cpp/surround_view/service-impl/ConfigReaderUtil.cpp
diff --git a/surround_view/service-impl/ConfigReaderUtil.h b/cpp/surround_view/service-impl/ConfigReaderUtil.h
similarity index 100%
rename from surround_view/service-impl/ConfigReaderUtil.h
rename to cpp/surround_view/service-impl/ConfigReaderUtil.h
diff --git a/surround_view/service-impl/IOModule.cpp b/cpp/surround_view/service-impl/IOModule.cpp
similarity index 100%
rename from surround_view/service-impl/IOModule.cpp
rename to cpp/surround_view/service-impl/IOModule.cpp
diff --git a/surround_view/service-impl/IOModule.h b/cpp/surround_view/service-impl/IOModule.h
similarity index 100%
rename from surround_view/service-impl/IOModule.h
rename to cpp/surround_view/service-impl/IOModule.h
diff --git a/surround_view/service-impl/IOModuleCommon.h b/cpp/surround_view/service-impl/IOModuleCommon.h
similarity index 100%
rename from surround_view/service-impl/IOModuleCommon.h
rename to cpp/surround_view/service-impl/IOModuleCommon.h
diff --git a/surround_view/service-impl/MathHelp.h b/cpp/surround_view/service-impl/MathHelp.h
similarity index 100%
rename from surround_view/service-impl/MathHelp.h
rename to cpp/surround_view/service-impl/MathHelp.h
diff --git a/surround_view/service-impl/Matrix4x4.h b/cpp/surround_view/service-impl/Matrix4x4.h
similarity index 100%
rename from surround_view/service-impl/Matrix4x4.h
rename to cpp/surround_view/service-impl/Matrix4x4.h
diff --git a/surround_view/service-impl/MtlReader.cpp b/cpp/surround_view/service-impl/MtlReader.cpp
similarity index 100%
rename from surround_view/service-impl/MtlReader.cpp
rename to cpp/surround_view/service-impl/MtlReader.cpp
diff --git a/surround_view/service-impl/MtlReader.h b/cpp/surround_view/service-impl/MtlReader.h
similarity index 100%
rename from surround_view/service-impl/MtlReader.h
rename to cpp/surround_view/service-impl/MtlReader.h
diff --git a/surround_view/service-impl/ObjReader.cpp b/cpp/surround_view/service-impl/ObjReader.cpp
similarity index 100%
rename from surround_view/service-impl/ObjReader.cpp
rename to cpp/surround_view/service-impl/ObjReader.cpp
diff --git a/surround_view/service-impl/ObjReader.h b/cpp/surround_view/service-impl/ObjReader.h
similarity index 100%
rename from surround_view/service-impl/ObjReader.h
rename to cpp/surround_view/service-impl/ObjReader.h
diff --git a/surround_view/service-impl/ObjReaderTests.cpp b/cpp/surround_view/service-impl/ObjReaderTests.cpp
similarity index 89%
rename from surround_view/service-impl/ObjReaderTests.cpp
rename to cpp/surround_view/service-impl/ObjReaderTests.cpp
index 9dae171..1c86737 100644
--- a/surround_view/service-impl/ObjReaderTests.cpp
+++ b/cpp/surround_view/service-impl/ObjReaderTests.cpp
@@ -33,9 +33,9 @@
 namespace implementation {
 namespace {
 
-TEST(ObjParserTests, ReadCubeSuccess) {
+TEST(ObjParserTests, ReadObjFileSuccess) {
     std::map<std::string, CarPart> carPartsMap;
-    EXPECT_TRUE(ReadObjFromFile("/etc/automotive/sv/cube.obj", &carPartsMap));
+    EXPECT_TRUE(ReadObjFromFile("vendor/etc/automotive/sv/sample_car.obj", &carPartsMap));
     EXPECT_NE(carPartsMap.size(), 0);
 }
 
diff --git a/surround_view/service-impl/SurroundView2dSession.cpp b/cpp/surround_view/service-impl/SurroundView2dSession.cpp
similarity index 60%
rename from surround_view/service-impl/SurroundView2dSession.cpp
rename to cpp/surround_view/service-impl/SurroundView2dSession.cpp
index b50049c..a92372c 100644
--- a/surround_view/service-impl/SurroundView2dSession.cpp
+++ b/cpp/surround_view/service-impl/SurroundView2dSession.cpp
@@ -13,19 +13,33 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#define ATRACE_TAG ATRACE_TAG_CAMERA
 
 #include "SurroundView2dSession.h"
 
+#include "CameraUtils.h"
+
 #include <android-base/logging.h>
+#include <android/hardware/camera/device/3.2/ICameraDevice.h>
 #include <android/hardware_buffer.h>
 #include <system/camera_metadata.h>
 #include <utils/SystemClock.h>
+#include <utils/Trace.h>
+#include <vndk/hardware_buffer.h>
 
 #include <thread>
 
-#include <android/hardware/camera/device/3.2/ICameraDevice.h>
-
-#include "CameraUtils.h"
+using ::std::adopt_lock;
+using ::std::lock;
+using ::std::lock_guard;
+using ::std::map;
+using ::std::mutex;
+using ::std::scoped_lock;
+using ::std::string;
+using ::std::thread;
+using ::std::unique_lock;
+using ::std::unique_ptr;
+using ::std::vector;
 
 using ::android::hardware::automotive::evs::V1_0::EvsResult;
 using ::android::hardware::camera::device::V3_2::Stream;
@@ -50,11 +64,12 @@
     int32_t framerate;
 } RawStreamConfig;
 
-static const size_t kStreamCfgSz = sizeof(RawStreamConfig);
-static const uint8_t kGrayColor = 128;
-static const int kNumChannels = 3;
+static const size_t kStreamCfgSz = sizeof(RawStreamConfig) / sizeof(int32_t);
+static const int kInputNumChannels = 4;
+static const int kOutputNumChannels = 3;
 static const int kNumFrames = 4;
 static const int kSv2dViewId = 0;
+static const float kUndistortionScales[4] = {1.0f, 1.0f, 1.0f, 1.0f};
 
 SurroundView2dSession::FramesHandler::FramesHandler(
     sp<IEvsCamera> pCamera, sp<SurroundView2dSession> pSession)
@@ -71,59 +86,108 @@
 
 Return<void> SurroundView2dSession::FramesHandler::deliverFrame_1_1(
     const hidl_vec<BufferDesc_1_1>& buffers) {
+    ATRACE_BEGIN(__PRETTY_FUNCTION__);
+
     LOG(INFO) << "Received " << buffers.size() << " frames from the camera";
     mSession->mSequenceId++;
 
     {
         scoped_lock<mutex> lock(mSession->mAccessLock);
         if (mSession->mProcessingEvsFrames) {
-            LOG(WARNING) << "EVS frames are being processed. Skip frames:" << mSession->mSequenceId;
+            LOG(WARNING) << "EVS frames are being processed. Skip frames:"
+                         << mSession->mSequenceId;
             mCamera->doneWithFrame_1_1(buffers);
             return {};
+        } else {
+            // Sets the flag to true immediately so the new coming frames will
+            // be skipped.
+            mSession->mProcessingEvsFrames = true;
         }
     }
 
     if (buffers.size() != kNumFrames) {
+        scoped_lock<mutex> lock(mSession->mAccessLock);
         LOG(ERROR) << "The number of incoming frames is " << buffers.size()
                    << ", which is different from the number " << kNumFrames
                    << ", specified in config file";
+        mSession->mProcessingEvsFrames = false;
+        mCamera->doneWithFrame_1_1(buffers);
         return {};
     }
 
     {
         scoped_lock<mutex> lock(mSession->mAccessLock);
-        for (int i = 0; i < kNumFrames; i++) {
-            LOG(DEBUG) << "Copying buffer No." << i
-                       << " to Surround View Service";
-            mSession->copyFromBufferToPointers(buffers[i],
-                                               mSession->mInputPointers[i]);
+        vector<int> indices;
+        for (const auto& id
+                : mSession->mIOModuleConfig->cameraConfig.evsCameraIds) {
+            for (int i = 0; i < kNumFrames; i++) {
+                if (buffers[i].deviceId == id) {
+                    indices.emplace_back(i);
+                    break;
+                }
+            }
+        }
+
+        if (indices.size() != kNumFrames) {
+            LOG(ERROR) << "The frames are not from the cameras we expected!";
+            mSession->mProcessingEvsFrames = false;
+            mCamera->doneWithFrame_1_1(buffers);
+            return {};
+        }
+
+        if (mSession->mGpuAccelerationEnabled) {
+            for (int i = 0; i < kNumFrames; i++) {
+                LOG(DEBUG) << "Importing graphic buffer from camera ["
+                           << buffers[indices[i]].deviceId << "]";
+                const AHardwareBuffer_Desc* pDesc = reinterpret_cast<const AHardwareBuffer_Desc*>(
+                        &buffers[indices[i]].buffer.description);
+
+                AHardwareBuffer* hardwareBuffer;
+                status_t status = AHardwareBuffer_createFromHandle(
+                        pDesc, buffers[indices[i]].buffer.nativeHandle,
+                        AHARDWAREBUFFER_CREATE_FROM_HANDLE_METHOD_CLONE, &hardwareBuffer);
+
+                if (status != NO_ERROR) {
+                    LOG(ERROR) << "Can't create AHardwareBuffer from handle. Error: " << status;
+                    return {};
+                }
+
+                mSession->mInputPointers[i].gpu_data_pointer = static_cast<void*>(hardwareBuffer);
+
+                // Keep a reference to the EVS graphic buffers, so we can
+                // release them after Surround View stitching is done.
+                mSession->mEvsGraphicBuffers = buffers;
+            }
+        } else {
+            for (int i = 0; i < kNumFrames; i++) {
+                LOG(DEBUG) << "Copying buffer from camera [" << buffers[indices[i]].deviceId
+                           << "] to Surround View Service";
+                mSession->copyFromBufferToPointers(buffers[indices[i]],
+                                                   mSession->mInputPointers[i]);
+            }
+
+            // On the CPU version, we do not need to hold the Graphic Buffers
+            // any more since they are copied already.
+            mCamera->doneWithFrame_1_1(buffers);
         }
     }
 
-    mCamera->doneWithFrame_1_1(buffers);
-
     // Notify the session that a new set of frames is ready
-    {
-        scoped_lock<mutex> lock(mSession->mAccessLock);
-        mSession->mProcessingEvsFrames = true;
-    }
     mSession->mFramesSignal.notify_all();
 
+    ATRACE_END();
+
     return {};
 }
 
 Return<void> SurroundView2dSession::FramesHandler::notify(const EvsEventDesc& event) {
     switch(event.aType) {
         case EvsEventType::STREAM_STOPPED:
-        {
+            // The Surround View STREAM_STOPPED event is generated when the
+            // service finished processing the queued frames. So it does not
+            // rely on the Evs STREAM_STOPPED event.
             LOG(INFO) << "Received a STREAM_STOPPED event from Evs.";
-
-            // TODO(b/158339680): There is currently an issue in EVS reference
-            // implementation that causes STREAM_STOPPED event to be delivered
-            // properly. When the bug is fixed, we should deal with this event
-            // properly in case the EVS stream is stopped unexpectly.
             break;
-        }
 
         case EvsEventType::PARAMETER_CHANGED:
             LOG(INFO) << "Camera parameter " << std::hex << event.payload[0]
@@ -149,10 +213,12 @@
 
 bool SurroundView2dSession::copyFromBufferToPointers(
     BufferDesc_1_1 buffer, SurroundViewInputBufferPointers pointers) {
+    ATRACE_BEGIN(__PRETTY_FUNCTION__);
 
     AHardwareBuffer_Desc* pDesc =
         reinterpret_cast<AHardwareBuffer_Desc *>(&buffer.buffer.description);
 
+    ATRACE_BEGIN("Create Graphic Buffer");
     // create a GraphicBuffer from the existing handle
     sp<GraphicBuffer> inputBuffer = new GraphicBuffer(
         buffer.buffer.nativeHandle, GraphicBuffer::CLONE_HANDLE, pDesc->width,
@@ -172,7 +238,9 @@
                   << " format: " << pDesc->format
                   << " stride: " << pDesc->stride;
     }
+    ATRACE_END();
 
+    ATRACE_BEGIN("Lock input buffer (gpu to cpu)");
     // Lock the input GraphicBuffer and map it to a pointer.  If we failed to
     // lock, return false.
     void* inputDataPtr;
@@ -186,30 +254,28 @@
     } else {
         LOG(INFO) << "Managed to get read access to GraphicBuffer";
     }
+    ATRACE_END();
 
-    int stride = pDesc->stride;
+    ATRACE_BEGIN("Copy input data");
+    // Both source and destination are with 4 channels
+    memcpy(pointers.cpu_data_pointer, inputDataPtr,
+           pDesc->height * pDesc->width * kInputNumChannels);
+    LOG(DEBUG) << "Buffer copying finished";
+    ATRACE_END();
 
-    // readPtr comes from EVS, and it is with 4 channels
-    uint8_t* readPtr = static_cast<uint8_t*>(inputDataPtr);
+    ATRACE_BEGIN("Unlock input buffer (cpu to gpu)");
+    inputBuffer->unlock();
+    ATRACE_END();
 
-    // writePtr comes from CV imread, and it is with 3 channels
-    uint8_t* writePtr = static_cast<uint8_t*>(pointers.cpu_data_pointer);
-
-    for (int i=0; i<pDesc->width; i++)
-        for (int j=0; j<pDesc->height; j++) {
-            writePtr[(i + j * stride) * 3 + 0] =
-                readPtr[(i + j * stride) * 4 + 0];
-            writePtr[(i + j * stride) * 3 + 1] =
-                readPtr[(i + j * stride) * 4 + 1];
-            writePtr[(i + j * stride) * 3 + 2] =
-                readPtr[(i + j * stride) * 4 + 2];
-        }
-    LOG(INFO) << "Brute force copying finished";
+    // Paired with ATRACE_BEGIN in the beginning of the method.
+    ATRACE_END();
 
     return true;
 }
 
 void SurroundView2dSession::processFrames() {
+    ATRACE_BEGIN(__PRETTY_FUNCTION__);
+
     while (true) {
         {
             unique_lock<mutex> lock(mAccessLock);
@@ -240,15 +306,15 @@
         mStream = nullptr;
         LOG(DEBUG) << "Stream marked STOPPED.";
     }
+
+    ATRACE_END();
 }
 
 SurroundView2dSession::SurroundView2dSession(sp<IEvsEnumerator> pEvs,
                                              IOModuleConfig* pConfig)
     : mEvs(pEvs),
       mIOModuleConfig(pConfig),
-      mStreamState(STOPPED) {
-    mEvsCameraIds = {"0", "1", "2", "3"};
-}
+      mStreamState(STOPPED) {}
 
 SurroundView2dSession::~SurroundView2dSession() {
     // In case the client did not call stopStream properly, we should stop the
@@ -262,6 +328,8 @@
     }
 
     mEvs->closeCamera(mCamera);
+
+    // TODO(b/175176576): properly release the mInputPointers and mOutputPointer
 }
 
 // Methods from ::android::hardware::automotive::sv::V1_0::ISurroundViewSession
@@ -428,9 +496,12 @@
     return {};
 }
 
+// TODO(b/175176765): implement a GPU version of this method separately.
 bool SurroundView2dSession::handleFrames(int sequenceId) {
     LOG(INFO) << __FUNCTION__ << "Handling sequenceId " << sequenceId << ".";
 
+    ATRACE_BEGIN(__PRETTY_FUNCTION__);
+
     // TODO(b/157498592): Now only one sets of EVS input frames and one SV
     // output frame is supported. Implement buffer queue for both of them.
     {
@@ -439,92 +510,111 @@
         if (mFramesRecord.inUse) {
             LOG(DEBUG) << "Notify SvEvent::FRAME_DROPPED";
             mStream->notify(SvEvent::FRAME_DROPPED);
+
+            // For GPU solution only (the frames were released already for CPU solution).
+            if (mGpuAccelerationEnabled) {
+                mCamera->doneWithFrame_1_1(mEvsGraphicBuffers);
+            }
             return true;
         }
     }
 
-    if (mOutputWidth != mConfig.width || mOutputHeight != mHeight) {
-        LOG(DEBUG) << "Config changed. Re-allocate memory."
-                   << " Old width: "
-                   << mOutputWidth
-                   << " Old height: "
-                   << mOutputHeight
-                   << " New width: "
-                   << mConfig.width
-                   << " New height: "
-                   << mHeight;
-        delete[] static_cast<char*>(mOutputPointer.data_pointer);
-        mOutputWidth = mConfig.width;
-        mOutputHeight = mHeight;
-        mOutputPointer.height = mOutputHeight;
-        mOutputPointer.width = mOutputWidth;
-        mOutputPointer.format = Format::RGB;
-        mOutputPointer.data_pointer =
-            new char[mOutputHeight * mOutputWidth * kNumChannels];
+    // TODO(b/175177030): modifying the width/length on the fly is not supported by the GPU approach
+    // yet.
+    if (!mGpuAccelerationEnabled) {
+        if (mOutputWidth != mConfig.width || mOutputHeight != mHeight) {
+            LOG(DEBUG) << "Config changed. Re-allocate memory."
+                       << " Old width: " << mOutputWidth << " Old height: " << mOutputHeight
+                       << " New width: " << mConfig.width << " New height: " << mHeight;
+            delete[] static_cast<char*>(mOutputPointer.cpu_data_pointer);
+            mOutputWidth = mConfig.width;
+            mOutputHeight = mHeight;
+            mOutputPointer.height = mOutputHeight;
+            mOutputPointer.width = mOutputWidth;
+            mOutputPointer.format = Format::RGB;
+            mOutputPointer.cpu_data_pointer =
+                    static_cast<void*>(new char[mOutputHeight * mOutputWidth * kOutputNumChannels]);
 
-        if (!mOutputPointer.data_pointer) {
-            LOG(ERROR) << "Memory allocation failed. Exiting.";
-            return false;
+            if (!mOutputPointer.cpu_data_pointer) {
+                LOG(ERROR) << "Memory allocation failed. Exiting.";
+                return false;
+            }
+
+            Size2dInteger size = Size2dInteger(mOutputWidth, mOutputHeight);
+            mSurroundView->Update2dOutputResolution(size);
+
+            mSvTexture = new GraphicBuffer(mOutputWidth, mOutputHeight, HAL_PIXEL_FORMAT_RGB_888, 1,
+                                           GRALLOC_USAGE_HW_TEXTURE, "SvTexture");
+            if (mSvTexture->initCheck() == OK) {
+                LOG(INFO) << "Successfully allocated Graphic Buffer";
+            } else {
+                LOG(ERROR) << "Failed to allocate Graphic Buffer";
+                return false;
+            }
         }
-
-        Size2dInteger size = Size2dInteger(mOutputWidth, mOutputHeight);
-        mSurroundView->Update2dOutputResolution(size);
-
-        mSvTexture = new GraphicBuffer(mOutputWidth,
-                                       mOutputHeight,
-                                       HAL_PIXEL_FORMAT_RGB_888,
-                                       1,
-                                       GRALLOC_USAGE_HW_TEXTURE,
-                                       "SvTexture");
-        if (mSvTexture->initCheck() == OK) {
-            LOG(INFO) << "Successfully allocated Graphic Buffer";
-        } else {
-            LOG(ERROR) << "Failed to allocate Graphic Buffer";
-            return false;
-        }
+        LOG(INFO) << "Output Pointer data format: " << mOutputPointer.format;
     }
 
+    ATRACE_BEGIN("SV core lib method: Get2dSurroundView");
+    const string gpuEnabledText = mGpuAccelerationEnabled ? " with GPU acceleration flag enabled"
+                                                          : " with GPU acceleration flag disabled";
     if (mSurroundView->Get2dSurroundView(mInputPointers, &mOutputPointer)) {
-        LOG(INFO) << "Get2dSurroundView succeeded";
+        LOG(INFO) << "Get2dSurroundView succeeded" << gpuEnabledText;
     } else {
-        LOG(ERROR) << "Get2dSurroundView failed. "
-                   << "Using memset to initialize to gray";
-        memset(mOutputPointer.data_pointer, kGrayColor,
-               mOutputHeight * mOutputWidth * kNumChannels);
+        LOG(ERROR) << "Get2dSurroundView failed" << gpuEnabledText;
+    }
+    ATRACE_END();
+
+    // For GPU solution only (the frames were released already for CPU solution).
+    if (mGpuAccelerationEnabled) {
+        ATRACE_BEGIN("Release the evs frames");
+        mCamera->doneWithFrame_1_1(mEvsGraphicBuffers);
+        ATRACE_END();
     }
 
-    void* textureDataPtr = nullptr;
-    mSvTexture->lock(GRALLOC_USAGE_SW_WRITE_OFTEN
-                     | GRALLOC_USAGE_SW_READ_NEVER,
-                     &textureDataPtr);
-    if (!textureDataPtr) {
-        LOG(ERROR) << "Failed to gain write access to GraphicBuffer!";
-        return false;
-    }
-
-    // Note: there is a chance that the stride of the texture is not the same
-    // as the width. For example, when the input frame is 1920 * 1080, the
-    // width is 1080, but the stride is 2048. So we'd better copy the data line
-    // by line, instead of single memcpy.
-    uint8_t* writePtr = static_cast<uint8_t*>(textureDataPtr);
-    uint8_t* readPtr = static_cast<uint8_t*>(mOutputPointer.data_pointer);
-    const int readStride = mOutputWidth * kNumChannels;
-    const int writeStride = mSvTexture->getStride() * kNumChannels;
-    if (readStride == writeStride) {
-        memcpy(writePtr, readPtr, readStride * mSvTexture->getHeight());
+    ANativeWindowBuffer* buffer;
+    if (mGpuAccelerationEnabled) {
+        buffer = mOutputHolder->getNativeBuffer();
     } else {
-        for (int i=0; i<mSvTexture->getHeight(); i++) {
-            memcpy(writePtr, readPtr, readStride);
-            writePtr = writePtr + writeStride;
-            readPtr = readPtr + readStride;
+        ATRACE_BEGIN("Lock output texture (gpu to cpu)");
+        void* textureDataPtr = nullptr;
+        mSvTexture->lock(GRALLOC_USAGE_SW_WRITE_OFTEN | GRALLOC_USAGE_SW_READ_NEVER,
+                         &textureDataPtr);
+        ATRACE_END();
+
+        if (!textureDataPtr) {
+            LOG(ERROR) << "Failed to gain write access to GraphicBuffer!";
+            return false;
         }
-    }
-    LOG(DEBUG) << "memcpy finished";
-    mSvTexture->unlock();
 
-    ANativeWindowBuffer* buffer = mSvTexture->getNativeBuffer();
-    LOG(DEBUG) << "ANativeWindowBuffer->handle: "
-               << buffer->handle;
+        ATRACE_BEGIN("Copy output result");
+        // Note: there is a chance that the stride of the texture is not the same
+        // as the width. For example, when the input frame is 1920 * 1080, the
+        // width is 1080, but the stride is 2048. So we'd better copy the data line
+        // by line, instead of single memcpy.
+        uint8_t* writePtr = static_cast<uint8_t*>(textureDataPtr);
+        uint8_t* readPtr = static_cast<uint8_t*>(mOutputPointer.cpu_data_pointer);
+        const int readStride = mOutputWidth * kOutputNumChannels;
+        const int writeStride = mSvTexture->getStride() * kOutputNumChannels;
+        if (readStride == writeStride) {
+            memcpy(writePtr, readPtr, readStride * mSvTexture->getHeight());
+        } else {
+            for (int i = 0; i < mSvTexture->getHeight(); i++) {
+                memcpy(writePtr, readPtr, readStride);
+                writePtr = writePtr + writeStride;
+                readPtr = readPtr + readStride;
+            }
+        }
+        LOG(DEBUG) << "memcpy finished";
+        ATRACE_END();
+
+        ATRACE_BEGIN("Unlock output texture (cpu to gpu)");
+        mSvTexture->unlock();
+        ATRACE_END();
+
+        buffer = mSvTexture->getNativeBuffer();
+        LOG(DEBUG) << "ANativeWindowBuffer->handle: " << buffer->handle;
+    }
 
     {
         scoped_lock<mutex> lock(mAccessLock);
@@ -536,12 +626,19 @@
         AHardwareBuffer_Desc* pDesc =
             reinterpret_cast<AHardwareBuffer_Desc*>(
                 &svBuffer.hardwareBuffer.description);
-        pDesc->width = mOutputWidth;
-        pDesc->height = mOutputHeight;
+        if (mGpuAccelerationEnabled) {
+            pDesc->width = mOutputPointer.width;
+            pDesc->height = mOutputPointer.height;
+            pDesc->stride = mOutputHolder->getStride();
+            pDesc->format = HAL_PIXEL_FORMAT_RGBA_8888;
+        } else {
+            pDesc->width = mOutputWidth;
+            pDesc->height = mOutputHeight;
+            pDesc->stride = mSvTexture->getStride();
+            pDesc->format = HAL_PIXEL_FORMAT_RGB_888;
+        }
         pDesc->layers = 1;
         pDesc->usage = GRALLOC_USAGE_HW_TEXTURE;
-        pDesc->stride = mSvTexture->getStride();
-        pDesc->format = HAL_PIXEL_FORMAT_RGB_888;
         mFramesRecord.frames.timestampNs = elapsedRealtimeNano();
         mFramesRecord.frames.sequenceId = sequenceId;
 
@@ -549,12 +646,18 @@
         mStream->receiveFrames(mFramesRecord.frames);
     }
 
+    ATRACE_END();
+
     return true;
 }
 
+// TODO(b/175176765): consider to HW-specific initialization procedures into
+// separate methods.
 bool SurroundView2dSession::initialize() {
     lock_guard<mutex> lock(mAccessLock, adopt_lock);
 
+    ATRACE_BEGIN(__PRETTY_FUNCTION__);
+
     if (!setupEvs()) {
         LOG(ERROR) << "Failed to setup EVS components for 2d session";
         return false;
@@ -567,31 +670,46 @@
     mSurroundView = unique_ptr<SurroundView>(Create());
 
     SurroundViewStaticDataParams params =
-            SurroundViewStaticDataParams(
-                    mCameraParams,
-                    mIOModuleConfig->sv2dConfig.sv2dParams,
-                    mIOModuleConfig->sv3dConfig.sv3dParams,
-                    GetUndistortionScales(),
-                    mIOModuleConfig->sv2dConfig.carBoundingBox,
-                    mIOModuleConfig->carModelConfig.carModel.texturesMap,
-                    mIOModuleConfig->carModelConfig.carModel.partsMap);
+            SurroundViewStaticDataParams(mCameraParams,
+                                         mIOModuleConfig->sv2dConfig.sv2dParams,
+                                         mIOModuleConfig->sv3dConfig.sv3dParams,
+                                         vector<float>(std::begin(kUndistortionScales),
+                                                       std::end(kUndistortionScales)),
+                                         mIOModuleConfig->sv2dConfig.carBoundingBox,
+                                         mIOModuleConfig->carModelConfig.carModel.texturesMap,
+                                         mIOModuleConfig->carModelConfig.carModel.partsMap);
+    mGpuAccelerationEnabled = mIOModuleConfig->sv2dConfig.sv2dParams.gpu_acceleration_enabled;
+
+    ATRACE_BEGIN("SV core lib method: SetStaticData");
     mSurroundView->SetStaticData(params);
+    ATRACE_END();
+
+    ATRACE_BEGIN("SV core lib method: Start2dPipeline");
+    const string gpuEnabledText = mGpuAccelerationEnabled ? "with GPU acceleration flag enabled"
+                                                          : "with GPU acceleration flag disabled";
     if (mSurroundView->Start2dPipeline()) {
-        LOG(INFO) << "Start2dPipeline succeeded";
+        LOG(INFO) << "Start2dPipeline succeeded " << gpuEnabledText;
     } else {
-        LOG(ERROR) << "Start2dPipeline failed";
+        LOG(ERROR) << "Start2dPipeline failed " << gpuEnabledText;
         return false;
     }
+    ATRACE_END();
 
+    ATRACE_BEGIN("Allocate cpu buffers");
     mInputPointers.resize(kNumFrames);
     for (int i = 0; i < kNumFrames; i++) {
         mInputPointers[i].width = mCameraParams[i].size.width;
         mInputPointers[i].height = mCameraParams[i].size.height;
-        mInputPointers[i].format = Format::RGB;
-        mInputPointers[i].cpu_data_pointer =
-                (void*)new uint8_t[mInputPointers[i].width *
-                                   mInputPointers[i].height *
-                                   kNumChannels];
+
+        // Only allocate CPU memory for CPU solution
+        // For GPU solutions, the Graphic Buffers from EVS will be converted and
+        // stored in gpu_data_pointer
+        if (!mGpuAccelerationEnabled) {
+            mInputPointers[i].format = Format::RGBA;
+            mInputPointers[i].cpu_data_pointer =
+                    static_cast<void*>(new char[mInputPointers[i].width * mInputPointers[i].height *
+                                                kInputNumChannels]);
+        }
     }
     LOG(INFO) << "Allocated " << kNumFrames << " input pointers";
 
@@ -604,21 +722,41 @@
 
     mOutputPointer.height = mOutputHeight;
     mOutputPointer.width = mOutputWidth;
-    mOutputPointer.format = mInputPointers[0].format;
-    mOutputPointer.data_pointer = new char[
-        mOutputHeight * mOutputWidth * kNumChannels];
 
-    if (!mOutputPointer.data_pointer) {
-        LOG(ERROR) << "Memory allocation failed. Exiting.";
-        return false;
+    // Only allocate CPU memory for CPU solution
+    if (!mGpuAccelerationEnabled) {
+        mOutputPointer.format = Format::RGB;
+        mOutputPointer.cpu_data_pointer =
+                static_cast<void*>(new char[mOutputHeight * mOutputWidth * kOutputNumChannels]);
+
+        if (!mOutputPointer.cpu_data_pointer) {
+            LOG(ERROR) << "Memory allocation failed. Exiting.";
+            return false;
+        }
     }
+    ATRACE_END();
 
-    mSvTexture = new GraphicBuffer(mOutputWidth,
-                                   mOutputHeight,
-                                   HAL_PIXEL_FORMAT_RGB_888,
-                                   1,
-                                   GRALLOC_USAGE_HW_TEXTURE,
-                                   "SvTexture");
+    ATRACE_BEGIN("Allocate output texture");
+    if (mGpuAccelerationEnabled) {
+        mOutputHolder = new GraphicBuffer(mOutputWidth, mOutputHeight, HAL_PIXEL_FORMAT_RGBA_8888,
+                                          1, GRALLOC_USAGE_HW_TEXTURE, "SvOutputHolder");
+        if (mOutputHolder->initCheck() == OK) {
+            LOG(INFO) << "Successfully allocated Graphic Buffer for SvOutputHolder";
+        } else {
+            LOG(ERROR) << "Failed to allocate Graphic Buffer for SvOutputHolder";
+            return false;
+        }
+        mOutputPointer.gpu_data_pointer = static_cast<void*>(mOutputHolder->toAHardwareBuffer());
+    } else {
+        mSvTexture = new GraphicBuffer(mOutputWidth, mOutputHeight, HAL_PIXEL_FORMAT_RGB_888, 1,
+                                       GRALLOC_USAGE_HW_TEXTURE, "SvTexture");
+        if (mSvTexture->initCheck() == OK) {
+            LOG(INFO) << "Successfully allocated Graphic Buffer";
+        } else {
+            LOG(ERROR) << "Failed to allocate Graphic Buffer";
+            return false;
+        }
+    }
 
     // Note: sv2dParams is in meters while mInfo must be in milli-meters.
     mInfo.width = mIOModuleConfig->sv2dConfig.sv2dParams.physical_size.width * 1000.0;
@@ -627,18 +765,16 @@
     mInfo.center.x = mIOModuleConfig->sv2dConfig.sv2dParams.physical_center.x * 1000.0;
     mInfo.center.y = mIOModuleConfig->sv2dConfig.sv2dParams.physical_center.y * 1000.0;
 
-    if (mSvTexture->initCheck() == OK) {
-        LOG(INFO) << "Successfully allocated Graphic Buffer";
-    } else {
-        LOG(ERROR) << "Failed to allocate Graphic Buffer";
-        return false;
-    }
-
     mIsInitialized = true;
+
+    ATRACE_END();
+
     return true;
 }
 
 bool SurroundView2dSession::setupEvs() {
+    ATRACE_BEGIN(__PRETTY_FUNCTION__);
+
     // Reads the camera related information from the config object
     const string evsGroupId = mIOModuleConfig->cameraConfig.evsGroupId;
 
@@ -708,11 +844,17 @@
         LOG(ERROR) << "Failed to allocate EVS Camera interface for " << camId;
         return false;
     } else {
-        LOG(INFO) << "Camera " << camId << " is opened successfully";
+        LOG(INFO) << "Logical camera " << camId << " is opened successfully";
+    }
+
+    mEvsCameraIds = mIOModuleConfig->cameraConfig.evsCameraIds;
+    if (mEvsCameraIds.size() < kNumFrames) {
+        LOG(ERROR) << "Incorrect camera info is stored in the camera config";
+        return false;
     }
 
     map<string, AndroidCameraParams> cameraIdToAndroidParameters;
-    for (const auto& id : mIOModuleConfig->cameraConfig.evsCameraIds) {
+    for (const auto& id : mEvsCameraIds) {
         AndroidCameraParams params;
         if (getAndroidCameraParams(mCamera, id, params)) {
             cameraIdToAndroidParameters.emplace(id, params);
@@ -734,10 +876,17 @@
         camera.circular_fov = 179;
     }
 
+    // Add validity mask filenames.
+    for (int i = 0; i < mCameraParams.size(); i++) {
+        mCameraParams[i].validity_mask_filename = mIOModuleConfig->cameraConfig.maskFilenames[i];
+    }
+    ATRACE_END();
     return true;
 }
 
 bool SurroundView2dSession::startEvs() {
+    ATRACE_BEGIN(__PRETTY_FUNCTION__);
+
     mFramesHandler = new FramesHandler(mCamera, this);
     Return<EvsResult> result = mCamera->startVideoStream(mFramesHandler);
     if (result != EvsResult::OK) {
@@ -747,6 +896,8 @@
         LOG(INFO) << "Video stream was started successfully";
     }
 
+    ATRACE_END();
+
     return true;
 }
 
diff --git a/surround_view/service-impl/SurroundView2dSession.h b/cpp/surround_view/service-impl/SurroundView2dSession.h
similarity index 92%
rename from surround_view/service-impl/SurroundView2dSession.h
rename to cpp/surround_view/service-impl/SurroundView2dSession.h
index 5a74c20..e7a9e17 100644
--- a/surround_view/service-impl/SurroundView2dSession.h
+++ b/cpp/surround_view/service-impl/SurroundView2dSession.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#include "CoreLibSetupHelper.h"
 #include "IOModule.h"
 
 #include <android/hardware/automotive/evs/1.1/IEvsCamera.h>
@@ -128,13 +127,13 @@
     // Instance and metadata for the opened Evs Camera
     sp<IEvsCamera> mCamera;
     CameraDesc mCameraDesc;
-    vector<SurroundViewCameraParams> mCameraParams;
+    std::vector<SurroundViewCameraParams> mCameraParams;
 
     // Stream subscribed for the session.
     sp<ISurroundViewStream> mStream GUARDED_BY(mAccessLock);
     StreamStateValues mStreamState GUARDED_BY(mAccessLock);
 
-    thread mProcessThread; // The thread we'll use to process frames
+    std::thread mProcessThread; // The thread we'll use to process frames
 
     // Reference to the inner class, to handle the incoming Evs frames
     sp<FramesHandler> mFramesHandler;
@@ -154,13 +153,13 @@
 
     // Synchronization necessary to deconflict mCaptureThread from the main
     // service thread
-    mutex mAccessLock;
+    std::mutex mAccessLock;
 
-    vector<string> mEvsCameraIds GUARDED_BY(mAccessLock);
+    std::vector<std::string> mEvsCameraIds GUARDED_BY(mAccessLock);
 
-    unique_ptr<SurroundView> mSurroundView GUARDED_BY(mAccessLock);
+    std::unique_ptr<SurroundView> mSurroundView GUARDED_BY(mAccessLock);
 
-    vector<SurroundViewInputBufferPointers>
+    std::vector<SurroundViewInputBufferPointers>
         mInputPointers GUARDED_BY(mAccessLock);
     SurroundViewResultPointer mOutputPointer GUARDED_BY(mAccessLock);
 
@@ -170,10 +169,14 @@
     // TODO(b/158479099): Rename it to mMappingInfo
     Sv2dMappingInfo mInfo GUARDED_BY(mAccessLock);
     int mOutputWidth, mOutputHeight GUARDED_BY(mAccessLock);
+    sp<GraphicBuffer> mOutputHolder;
 
     sp<GraphicBuffer> mSvTexture GUARDED_BY(mAccessLock);
 
     bool mIsInitialized GUARDED_BY(mAccessLock) = false;
+
+    bool mGpuAccelerationEnabled;
+    hidl_vec<BufferDesc_1_1> mEvsGraphicBuffers;
 };
 
 }  // namespace implementation
diff --git a/cpp/surround_view/service-impl/SurroundView2dSessionTests.cpp b/cpp/surround_view/service-impl/SurroundView2dSessionTests.cpp
new file mode 100644
index 0000000..a452ddf
--- /dev/null
+++ b/cpp/surround_view/service-impl/SurroundView2dSessionTests.cpp
@@ -0,0 +1,142 @@
+/*
+ * Copyright 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.
+ */
+
+#define LOG_TAG "SurroundView2dSessionTests"
+
+#include "mock-evs/MockEvsEnumerator.h"
+#include "mock-evs/MockSurroundViewCallback.h"
+
+#include "IOModule.h"
+#include "SurroundView2dSession.h"
+
+#include <android/hardware/automotive/vehicle/2.0/IVehicle.h>
+
+#include <android-base/logging.h>
+
+#include <gtest/gtest.h>
+#include <time.h>
+
+namespace android {
+namespace hardware {
+namespace automotive {
+namespace sv {
+namespace V1_0 {
+namespace implementation {
+namespace {
+
+const char* kSvConfigFilename = "vendor/etc/automotive/sv/sv_sample_config.xml";
+
+using android::hardware::automotive::sv::V1_0::Sv2dMappingInfo;
+using android::hardware::automotive::sv::V1_0::SvQuality;
+
+// Sv 2D output height and width set by the config file.
+const int kSv2dWidth = 768;
+const int kSv2dHeight = 1024;
+
+class SurroundView2dSessionTests : public ::testing::Test {
+protected:
+    void SetUp() override {
+        sp<IEvsEnumerator> fakeEvs = new MockEvsEnumerator();
+        mIoModule = new IOModule(kSvConfigFilename);
+        EXPECT_EQ(mIoModule->initialize(), IOStatus::OK);
+
+        mIoModule->getConfig(&mIoModuleConfig);
+
+        mSv2dSession = new SurroundView2dSession(fakeEvs, &mIoModuleConfig);
+        EXPECT_TRUE(mSv2dSession->initialize());
+    }
+
+    IOModule* mIoModule;
+    IOModuleConfig mIoModuleConfig;
+    sp<SurroundView2dSession> mSv2dSession;
+};
+
+TEST_F(SurroundView2dSessionTests, startAndStopSurroundView2dSession) {
+    sp<MockSurroundViewCallback> sv2dCallback =
+            new MockSurroundViewCallback(mSv2dSession);
+
+    EXPECT_EQ(mSv2dSession->startStream(sv2dCallback), SvResult::OK);
+
+    sleep(5);
+
+    mSv2dSession->stopStream();
+}
+
+TEST_F(SurroundView2dSessionTests, get2dMappingInfoSuccess) {
+    Sv2dMappingInfo sv2dMappingInfo;
+    mSv2dSession->get2dMappingInfo(
+        [&sv2dMappingInfo](const Sv2dMappingInfo& mappingInfo) {
+            sv2dMappingInfo = mappingInfo;
+        });
+
+    EXPECT_NE(sv2dMappingInfo.width, 0);
+    EXPECT_NE(sv2dMappingInfo.height, 0);
+    EXPECT_EQ(sv2dMappingInfo.center.x, 0.0f);
+    EXPECT_EQ(sv2dMappingInfo.center.y, 0.0f);
+}
+
+TEST_F(SurroundView2dSessionTests, get2dConfigSuccess) {
+    Sv2dConfig sv2dConfig;
+    mSv2dSession->get2dConfig(
+        [&sv2dConfig](const Sv2dConfig& config) {
+            sv2dConfig = config;
+        });
+
+    EXPECT_EQ(sv2dConfig.width, kSv2dWidth);
+    EXPECT_EQ(sv2dConfig.blending, SvQuality::HIGH);
+}
+
+// Sets a different config and checks of the received config matches.
+TEST_F(SurroundView2dSessionTests, setAndGet2dConfigSuccess) {
+    // Set config.
+    Sv2dConfig sv2dConfigSet = {kSv2dWidth / 2, SvQuality::LOW};
+    EXPECT_EQ(mSv2dSession->set2dConfig(sv2dConfigSet), SvResult::OK);
+
+    // Get config.
+    Sv2dConfig sv2dConfigReceived;
+    mSv2dSession->get2dConfig(
+        [&sv2dConfigReceived](const Sv2dConfig& config) {
+            sv2dConfigReceived = config;
+        });
+
+    EXPECT_EQ(sv2dConfigReceived.width, sv2dConfigSet.width);
+    EXPECT_EQ(sv2dConfigReceived.blending, sv2dConfigSet.blending);
+}
+
+// Projects center of each cameras and checks if valid projected point is received.
+TEST_F(SurroundView2dSessionTests, projectPoints2dSuccess) {
+    hidl_vec<Point2dInt> points2dCamera = {
+        /*Center point*/{.x = kSv2dWidth / 2, .y = kSv2dHeight /2}
+    };
+
+    std::vector<hidl_string> cameraIds = {"/dev/video60", "/dev/video61", "/dev/video62" ,
+            "/dev/video63"};
+
+    for (int i = 0; i < cameraIds.size(); i++) {
+        mSv2dSession->projectCameraPoints(points2dCamera, cameraIds[i],
+            [](const hidl_vec<Point2dFloat>& projectedPoints) {
+                EXPECT_TRUE(projectedPoints[0].isValid);
+            });
+    }
+}
+
+}  // namespace
+}  // namespace implementation
+}  // namespace V1_0
+}  // namespace sv
+}  // namespace automotive
+}  // namespace hardware
+}  // namespace android
diff --git a/surround_view/service-impl/SurroundView3dSession.cpp b/cpp/surround_view/service-impl/SurroundView3dSession.cpp
similarity index 76%
rename from surround_view/service-impl/SurroundView3dSession.cpp
rename to cpp/surround_view/service-impl/SurroundView3dSession.cpp
index 1a91e0d..c6f1ab1 100644
--- a/surround_view/service-impl/SurroundView3dSession.cpp
+++ b/cpp/surround_view/service-impl/SurroundView3dSession.cpp
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#define ATRACE_TAG ATRACE_TAG_CAMERA
 
 #include "SurroundView3dSession.h"
 
@@ -22,6 +23,7 @@
 #include <hidlmemory/mapping.h>
 #include <system/camera_metadata.h>
 #include <utils/SystemClock.h>
+#include <utils/Trace.h>
 
 #include <array>
 #include <thread>
@@ -32,6 +34,20 @@
 #include "CameraUtils.h"
 #include "sv_3d_params.h"
 
+using ::std::adopt_lock;
+using ::std::array;
+using ::std::lock;
+using ::std::lock_guard;
+using ::std::map;
+using ::std::mutex;
+using ::std::scoped_lock;
+using ::std::set;
+using ::std::string;
+using ::std::thread;
+using ::std::unique_lock;
+using ::std::unique_ptr;
+using ::std::vector;
+
 using ::android::hardware::automotive::evs::V1_0::EvsResult;
 using ::android::hardware::camera::device::V3_2::Stream;
 using ::android::hardware::hidl_memory;
@@ -55,10 +71,12 @@
     int32_t framerate;
 } RawStreamConfig;
 
-static const size_t kStreamCfgSz = sizeof(RawStreamConfig);
+static const size_t kStreamCfgSz = sizeof(RawStreamConfig) / sizeof(int32_t);
 static const uint8_t kGrayColor = 128;
 static const int kNumFrames = 4;
-static const int kNumChannels = 4;
+static const int kInputNumChannels = 4;
+static const int kOutputNumChannels = 4;
+static const float kUndistortionScales[4] = {1.0f, 1.0f, 1.0f, 1.0f};
 
 SurroundView3dSession::FramesHandler::FramesHandler(
     sp<IEvsCamera> pCamera, sp<SurroundView3dSession> pSession)
@@ -75,6 +93,8 @@
 
 Return<void> SurroundView3dSession::FramesHandler::deliverFrame_1_1(
     const hidl_vec<BufferDesc_1_1>& buffers) {
+    ATRACE_BEGIN(__PRETTY_FUNCTION__);
+
     LOG(INFO) << "Received " << buffers.size() << " frames from the camera";
     mSession->mSequenceId++;
 
@@ -85,22 +105,55 @@
                          << mSession->mSequenceId;
             mCamera->doneWithFrame_1_1(buffers);
             return {};
+        } else {
+            // Sets the flag to true immediately so the new coming frames will
+            // be skipped.
+            mSession->mProcessingEvsFrames = true;
         }
     }
 
     if (buffers.size() != kNumFrames) {
+        scoped_lock<mutex> lock(mSession->mAccessLock);
         LOG(ERROR) << "The number of incoming frames is " << buffers.size()
                    << ", which is different from the number " << kNumFrames
                    << ", specified in config file";
+        mSession->mProcessingEvsFrames = false;
+        mCamera->doneWithFrame_1_1(buffers);
         return {};
     }
 
     {
         scoped_lock<mutex> lock(mSession->mAccessLock);
+
+        // The incoming frames may not follow the same order as listed cameras.
+        // We should re-order them following the camera ids listed in camera
+        // config.
+        vector<int> indices;
+        for (const auto& id
+                : mSession->mIOModuleConfig->cameraConfig.evsCameraIds) {
+            for (int i = 0; i < kNumFrames; i++) {
+                if (buffers[i].deviceId == id) {
+                    indices.emplace_back(i);
+                    break;
+                }
+            }
+        }
+
+        // If the size of indices is smaller than the kNumFrames, it means that
+        // there is frame(s) that comes from different camera(s) than we
+        // expected.
+        if (indices.size() != kNumFrames) {
+            LOG(ERROR) << "The frames are not from the cameras we expected!";
+            mSession->mProcessingEvsFrames = false;
+            mCamera->doneWithFrame_1_1(buffers);
+            return {};
+        }
+
         for (int i = 0; i < kNumFrames; i++) {
-            LOG(DEBUG) << "Copying buffer No." << i
-                       << " to Surround View Service";
-            mSession->copyFromBufferToPointers(buffers[i],
+            LOG(DEBUG) << "Copying buffer from camera ["
+                       << buffers[indices[i]].deviceId
+                       << "] to Surround View Service";
+            mSession->copyFromBufferToPointers(buffers[indices[i]],
                                                mSession->mInputPointers[i]);
         }
     }
@@ -108,24 +161,20 @@
     mCamera->doneWithFrame_1_1(buffers);
 
     // Notify the session that a new set of frames is ready
-    {
-        scoped_lock<mutex> lock(mSession->mAccessLock);
-        mSession->mProcessingEvsFrames = true;
-    }
     mSession->mFramesSignal.notify_all();
 
+    ATRACE_END();
+
     return {};
 }
 
 Return<void> SurroundView3dSession::FramesHandler::notify(const EvsEventDesc& event) {
     switch(event.aType) {
         case EvsEventType::STREAM_STOPPED:
+            // The Surround View STREAM_STOPPED event is generated when the
+            // service finished processing the queued frames. So it does not
+            // rely on the Evs STREAM_STOPPED event.
             LOG(INFO) << "Received a STREAM_STOPPED event from Evs.";
-
-            // TODO(b/158339680): There is currently an issue in EVS reference
-            // implementation that causes STREAM_STOPPED event to be delivered
-            // properly. When the bug is fixed, we should deal with this event
-            // properly in case the EVS stream is stopped unexpectly.
             break;
 
         case EvsEventType::PARAMETER_CHANGED:
@@ -153,9 +202,12 @@
 bool SurroundView3dSession::copyFromBufferToPointers(
     BufferDesc_1_1 buffer, SurroundViewInputBufferPointers pointers) {
 
+    ATRACE_BEGIN(__PRETTY_FUNCTION__);
+
     AHardwareBuffer_Desc* pDesc =
         reinterpret_cast<AHardwareBuffer_Desc *>(&buffer.buffer.description);
 
+    ATRACE_BEGIN("Create Graphic Buffer");
     // create a GraphicBuffer from the existing handle
     sp<GraphicBuffer> inputBuffer = new GraphicBuffer(
         buffer.buffer.nativeHandle, GraphicBuffer::CLONE_HANDLE, pDesc->width,
@@ -175,7 +227,9 @@
                   << " format: " << pDesc->format
                   << " stride: " << pDesc->stride;
     }
+    ATRACE_END();
 
+    ATRACE_BEGIN("Lock input buffer (gpu to cpu)");
     // Lock the input GraphicBuffer and map it to a pointer.  If we failed to
     // lock, return false.
     void* inputDataPtr;
@@ -189,36 +243,36 @@
     } else {
         LOG(INFO) << "Managed to get read access to GraphicBuffer";
     }
+    ATRACE_END();
 
-    int stride = pDesc->stride;
+    ATRACE_BEGIN("Copy input data");
+    // Both source and destination are with 4 channels
+    memcpy(pointers.cpu_data_pointer, inputDataPtr,
+           pDesc->height * pDesc->width * kInputNumChannels);
+    LOG(INFO) << "Buffer copying finished";
+    ATRACE_END();
 
-    // readPtr comes from EVS, and it is with 4 channels
-    uint8_t* readPtr = static_cast<uint8_t*>(inputDataPtr);
+    ATRACE_BEGIN("Unlock input buffer (cpu to gpu)");
+    inputBuffer->unlock();
+    ATRACE_END();
 
-    // writePtr is with 3 channels, since that is what SV core lib expects.
-    uint8_t* writePtr = static_cast<uint8_t*>(pointers.cpu_data_pointer);
-
-    for (int i = 0; i < pDesc->width; i++)
-        for (int j = 0; j < pDesc->height; j++) {
-            writePtr[(i + j * stride) * 3 + 0] =
-                readPtr[(i + j * stride) * 4 + 0];
-            writePtr[(i + j * stride) * 3 + 1] =
-                readPtr[(i + j * stride) * 4 + 1];
-            writePtr[(i + j * stride) * 3 + 2] =
-                readPtr[(i + j * stride) * 4 + 2];
-        }
-    LOG(INFO) << "Brute force copying finished";
+    // Paired with ATRACE_BEGIN in the beginning of the method.
+    ATRACE_END();
 
     return true;
 }
 
 void SurroundView3dSession::processFrames() {
+    ATRACE_BEGIN(__PRETTY_FUNCTION__);
+
+    ATRACE_BEGIN("SV core lib method: Start3dPipeline");
     if (mSurroundView->Start3dPipeline()) {
         LOG(INFO) << "Start3dPipeline succeeded";
     } else {
         LOG(ERROR) << "Start3dPipeline failed";
         return;
     }
+    ATRACE_END();
 
     while (true) {
         {
@@ -250,6 +304,8 @@
         mStream = nullptr;
         LOG(DEBUG) << "Stream marked STOPPED.";
     }
+
+    ATRACE_END();
 }
 
 SurroundView3dSession::SurroundView3dSession(sp<IEvsEnumerator> pEvs,
@@ -260,9 +316,7 @@
       mStreamState(STOPPED),
       mVhalHandler(vhalHandler),
       mAnimationModule(animationModule),
-      mIOModuleConfig(pConfig) {
-    mEvsCameraIds = {"0" , "1", "2", "3"};
-}
+      mIOModuleConfig(pConfig) {}
 
 SurroundView3dSession::~SurroundView3dSession() {
     // In case the client did not call stopStream properly, we should stop the
@@ -271,7 +325,9 @@
     stopStream();
 
     // Waiting for the process thread to finish the buffered frames.
-    mProcessThread.join();
+    if (mProcessThread.joinable()) {
+        mProcessThread.join();
+    }
 
     mEvs->closeCamera(mCamera);
 }
@@ -373,6 +429,11 @@
     LOG(DEBUG) << __FUNCTION__;
     scoped_lock <mutex> lock(mAccessLock);
 
+    if (views.size() == 0) {
+        LOG(ERROR) << "Empty view argument, at-least one view is required.";
+        return SvResult::VIEW_NOT_SET;
+    }
+
     mViews.resize(views.size());
     for (int i=0; i<views.size(); i++) {
         mViews[i] = views[i];
@@ -416,7 +477,10 @@
     return {};
 }
 
-bool VerifyOverlayData(const OverlaysData& overlaysData) {
+bool VerifyAndGetOverlays(const OverlaysData& overlaysData, std::vector<Overlay>* svCoreOverlays) {
+    // Clear the overlays.
+    svCoreOverlays->clear();
+
     // Check size of shared memory matches overlaysMemoryDesc.
     const int kVertexSize = 16;
     const int kIdSize = 2;
@@ -424,8 +488,8 @@
     for (auto& overlayMemDesc : overlaysData.overlaysMemoryDesc) {
         memDescSize += kIdSize + kVertexSize * overlayMemDesc.verticesCount;
     }
-    if (memDescSize != overlaysData.overlaysMemory.size()) {
-        LOG(ERROR) << "shared memory and overlaysMemoryDesc size mismatch.";
+    if (overlaysData.overlaysMemory.size() < memDescSize) {
+        LOG(ERROR) << "Allocated shared memory size is less than overlaysMemoryDesc size.";
         return false;
     }
 
@@ -450,12 +514,14 @@
 
         if (overlayIdSet.find(overlayMemDesc.id) != overlayIdSet.end()) {
             LOG(ERROR) << "Duplicate id within memory descriptor.";
+            svCoreOverlays->clear();
             return false;
         }
         overlayIdSet.insert(overlayMemDesc.id);
 
         if(overlayMemDesc.verticesCount < 3) {
             LOG(ERROR) << "Less than 3 vertices.";
+            svCoreOverlays->clear();
             return false;
         }
 
@@ -463,34 +529,43 @@
                 overlayMemDesc.verticesCount % 3 != 0) {
             LOG(ERROR) << "Triangles primitive does not have vertices "
                        << "multiple of 3.";
+            svCoreOverlays->clear();
             return false;
         }
 
         const uint16_t overlayId = *((uint16_t*)(pData + idOffset));
 
         if (overlayId != overlayMemDesc.id) {
-            LOG(ERROR) << "Overlay id mismatch "
-                       << overlayId
-                       << ", "
-                       << overlayMemDesc.id;
+            LOG(ERROR) << "Overlay id mismatch " << overlayId << ", " << overlayMemDesc.id;
+            svCoreOverlays->clear();
             return false;
         }
 
+        // Copy over shared memory data to sv core overlays.
+        Overlay svCoreOverlay;
+        svCoreOverlay.id = overlayMemDesc.id;
+        svCoreOverlay.vertices.resize(overlayMemDesc.verticesCount);
+        uint8_t* verticesDataPtr = pData + idOffset + kIdSize;
+        memcpy(svCoreOverlay.vertices.data(), verticesDataPtr,
+                kVertexSize * overlayMemDesc.verticesCount);
+        svCoreOverlays->push_back(svCoreOverlay);
+
         idOffset += kIdSize + (kVertexSize * overlayMemDesc.verticesCount);
     }
 
     return true;
 }
 
-// TODO(b/150412555): the overlay related methods are incomplete.
-Return<SvResult>  SurroundView3dSession::updateOverlays(
-        const OverlaysData& overlaysData) {
+Return<SvResult>  SurroundView3dSession::updateOverlays(const OverlaysData& overlaysData) {
+    LOG(DEBUG) << __FUNCTION__;
 
-    if(!VerifyOverlayData(overlaysData)) {
-        LOG(ERROR) << "VerifyOverlayData failed.";
+    scoped_lock <mutex> lock(mAccessLock);
+    if(!VerifyAndGetOverlays(overlaysData, &mOverlays)) {
+        LOG(ERROR) << "VerifyAndGetOverlays failed.";
         return SvResult::INVALID_ARG;
     }
 
+    mOverlayIsUpdated = true;
     return SvResult::OK;
 }
 
@@ -522,8 +597,9 @@
         Point3dFloat point3d = {false, 0.0, 0.0, 0.0};
 
         // Verify if camera point is within the camera resolution bounds.
-        point3d.isValid = (cameraPoint.x >= 0 && cameraPoint.x < mConfig.width &&
-                           cameraPoint.y >= 0 && cameraPoint.y < mConfig.height);
+        const Size2dInteger cameraSize = mCameraParams[cameraIndex].size;
+        point3d.isValid = (cameraPoint.x >= 0 && cameraPoint.x < cameraSize.width &&
+                           cameraPoint.y >= 0 && cameraPoint.y < cameraSize.height);
         if (!point3d.isValid) {
             LOG(WARNING) << "Camera point (" << cameraPoint.x << ", " << cameraPoint.y
                          << ") is out of camera resolution bounds.";
@@ -551,6 +627,8 @@
 bool SurroundView3dSession::handleFrames(int sequenceId) {
     LOG(INFO) << __FUNCTION__ << "Handling sequenceId " << sequenceId << ".";
 
+    ATRACE_BEGIN(__PRETTY_FUNCTION__);
+
     // TODO(b/157498592): Now only one sets of EVS input frames and one SV
     // output frame is supported. Implement buffer queue for both of them.
     {
@@ -575,16 +653,16 @@
                    << mConfig.width
                    << ", new height: "
                    << mConfig.height;
-        delete[] static_cast<char*>(mOutputPointer.data_pointer);
+        delete[] static_cast<char*>(mOutputPointer.cpu_data_pointer);
         mOutputWidth = mConfig.width;
         mOutputHeight = mConfig.height;
         mOutputPointer.height = mOutputHeight;
         mOutputPointer.width = mOutputWidth;
         mOutputPointer.format = Format::RGBA;
-        mOutputPointer.data_pointer =
-            new char[mOutputHeight * mOutputWidth * kNumChannels];
+        mOutputPointer.cpu_data_pointer =
+                static_cast<void*>(new char[mOutputHeight * mOutputWidth * kOutputNumChannels]);
 
-        if (!mOutputPointer.data_pointer) {
+        if (!mOutputPointer.cpu_data_pointer) {
             LOG(ERROR) << "Memory allocation failed. Exiting.";
             return false;
         }
@@ -606,18 +684,20 @@
         }
     }
 
-    // TODO(b/150412555): do not use the setViews for frames generation
-    // since there is a discrepancy between the HIDL APIs and core lib APIs.
-    array<array<float, 4>, 4> matrix;
-
-    // TODO(b/150412555): use hard-coded views for now. Change view every
-    // frame.
-    int recViewId = sequenceId % 16;
-    for (int i=0; i<4; i++)
-        for (int j=0; j<4; j++) {
-            matrix[i][j] = kRecViews[recViewId][i*4+j];
+    ATRACE_BEGIN("SV core lib method: Set3dOverlay");
+    // Set 3d overlays.
+    {
+        scoped_lock<mutex> lock(mAccessLock);
+        if (mOverlayIsUpdated) {
+            if (!mSurroundView->Set3dOverlay(mOverlays)) {
+                LOG(ERROR) << "Set 3d overlays failed.";
+            }
+            mOverlayIsUpdated = false;
+        }
     }
+    ATRACE_END();
 
+    ATRACE_BEGIN("VhalHandler method: getPropertyValues");
     // Get the latest VHal property values
     if (mVhalHandler != nullptr) {
         if (!mVhalHandler->getPropertyValues(&mPropertyValues)) {
@@ -626,47 +706,66 @@
     } else {
         LOG(WARNING) << "VhalHandler is null. Ignored";
     }
+    ATRACE_END();
 
+    ATRACE_BEGIN("AnimationModule method: getUpdatedAnimationParams");
     vector<AnimationParam> params;
     if (mAnimationModule != nullptr) {
         params = mAnimationModule->getUpdatedAnimationParams(mPropertyValues);
     } else {
         LOG(WARNING) << "AnimationModule is null. Ignored";
     }
+    ATRACE_END();
 
+    ATRACE_BEGIN("SV core lib method: SetAnimations");
     if (!params.empty()) {
         mSurroundView->SetAnimations(params);
     } else {
         LOG(INFO) << "AnimationParams is empty. Ignored";
     }
+    ATRACE_END();
 
+    // Get the view.
+    // TODO(161399517): Only single view is currently supported, add support for multiple views.
+    const View3d view3d = mViews[0];
+    const RotationQuat quat = view3d.pose.rotation;
+    const Translation trans = view3d.pose.translation;
+    const std::array<float, 4> viewQuaternion = {quat.x, quat.y, quat.z, quat.w};
+    const std::array<float, 3> viewTranslation = {trans.x, trans.y, trans.z};
+
+    ATRACE_BEGIN("SV core lib method: Get3dSurroundView");
     if (mSurroundView->Get3dSurroundView(
-        mInputPointers, matrix, &mOutputPointer)) {
+            mInputPointers, viewQuaternion, viewTranslation, &mOutputPointer)) {
         LOG(INFO) << "Get3dSurroundView succeeded";
     } else {
         LOG(ERROR) << "Get3dSurroundView failed. "
                    << "Using memset to initialize to gray.";
-        memset(mOutputPointer.data_pointer, kGrayColor,
-               mOutputHeight * mOutputWidth * kNumChannels);
+        memset(mOutputPointer.cpu_data_pointer, kGrayColor,
+               mOutputHeight * mOutputWidth * kOutputNumChannels);
     }
+    ATRACE_END();
 
+    ATRACE_BEGIN("Lock output texture (gpu to cpu)");
     void* textureDataPtr = nullptr;
     mSvTexture->lock(GRALLOC_USAGE_SW_WRITE_OFTEN
                     | GRALLOC_USAGE_SW_READ_NEVER,
                     &textureDataPtr);
+    ATRACE_END();
+
     if (!textureDataPtr) {
         LOG(ERROR) << "Failed to gain write access to GraphicBuffer!";
         return false;
     }
 
+    ATRACE_BEGIN("Copy output result");
     // Note: there is a chance that the stride of the texture is not the
     // same as the width. For example, when the input frame is 1920 * 1080,
     // the width is 1080, but the stride is 2048. So we'd better copy the
     // data line by line, instead of single memcpy.
     uint8_t* writePtr = static_cast<uint8_t*>(textureDataPtr);
-    uint8_t* readPtr = static_cast<uint8_t*>(mOutputPointer.data_pointer);
-    const int readStride = mOutputWidth * kNumChannels;
-    const int writeStride = mSvTexture->getStride() * kNumChannels;
+    uint8_t* readPtr = static_cast<uint8_t*>(mOutputPointer.cpu_data_pointer);
+    const int readStride = mOutputWidth * kOutputNumChannels;
+    const int writeStride = mSvTexture->getStride() * kOutputNumChannels;
     if (readStride == writeStride) {
         memcpy(writePtr, readPtr, readStride * mSvTexture->getHeight());
     } else {
@@ -677,7 +776,11 @@
         }
     }
     LOG(INFO) << "memcpy finished!";
+    ATRACE_END();
+
+    ATRACE_BEGIN("Unlock output texture (cpu to gpu)");
     mSvTexture->unlock();
+    ATRACE_END();
 
     ANativeWindowBuffer* buffer = mSvTexture->getNativeBuffer();
     LOG(DEBUG) << "ANativeWindowBuffer->handle: " << buffer->handle;
@@ -705,12 +808,16 @@
         mStream->receiveFrames(mFramesRecord.frames);
     }
 
+    ATRACE_END();
+
     return true;
 }
 
 bool SurroundView3dSession::initialize() {
     lock_guard<mutex> lock(mAccessLock, adopt_lock);
 
+    ATRACE_BEGIN(__PRETTY_FUNCTION__);
+
     if (!setupEvs()) {
         LOG(ERROR) << "Failed to setup EVS components for 3d session";
         return false;
@@ -727,21 +834,24 @@
                     mCameraParams,
                     mIOModuleConfig->sv2dConfig.sv2dParams,
                     mIOModuleConfig->sv3dConfig.sv3dParams,
-                    GetUndistortionScales(),
+                    vector<float>(std::begin(kUndistortionScales),
+                                  std::end(kUndistortionScales)),
                     mIOModuleConfig->sv2dConfig.carBoundingBox,
                     mIOModuleConfig->carModelConfig.carModel.texturesMap,
                     mIOModuleConfig->carModelConfig.carModel.partsMap);
+    ATRACE_BEGIN("SV core lib method: SetStaticData");
     mSurroundView->SetStaticData(params);
+    ATRACE_END();
 
+    ATRACE_BEGIN("Allocate cpu buffers");
     mInputPointers.resize(kNumFrames);
     for (int i = 0; i < kNumFrames; i++) {
         mInputPointers[i].width = mCameraParams[i].size.width;
         mInputPointers[i].height = mCameraParams[i].size.height;
-        mInputPointers[i].format = Format::RGB;
+        mInputPointers[i].format = Format::RGBA;
         mInputPointers[i].cpu_data_pointer =
-                (void*)new uint8_t[mInputPointers[i].width *
-                                   mInputPointers[i].height *
-                                   kNumChannels];
+                static_cast<void*>(new uint8_t[mInputPointers[i].width * mInputPointers[i].height *
+                                               kInputNumChannels]);
     }
     LOG(INFO) << "Allocated " << kNumFrames << " input pointers";
 
@@ -755,14 +865,16 @@
     mOutputPointer.height = mOutputHeight;
     mOutputPointer.width = mOutputWidth;
     mOutputPointer.format = Format::RGBA;
-    mOutputPointer.data_pointer = new char[
-        mOutputHeight * mOutputWidth * kNumChannels];
+    mOutputPointer.cpu_data_pointer =
+            static_cast<void*>(new char[mOutputHeight * mOutputWidth * kOutputNumChannels]);
 
-    if (!mOutputPointer.data_pointer) {
+    if (!mOutputPointer.cpu_data_pointer) {
         LOG(ERROR) << "Memory allocation failed. Exiting.";
         return false;
     }
+    ATRACE_END();
 
+    ATRACE_BEGIN("Allocate output texture");
     mSvTexture = new GraphicBuffer(mOutputWidth,
                                    mOutputHeight,
                                    HAL_PIXEL_FORMAT_RGBA_8888,
@@ -776,13 +888,18 @@
         LOG(ERROR) << "Failed to allocate Graphic Buffer";
         return false;
     }
-
+    ATRACE_END();
 
     mIsInitialized = true;
+
+    ATRACE_END();
+
     return true;
 }
 
 bool SurroundView3dSession::setupEvs() {
+    ATRACE_BEGIN(__PRETTY_FUNCTION__);
+
     // Reads the camera related information from the config object
     const string evsGroupId = mIOModuleConfig->cameraConfig.evsGroupId;
 
@@ -852,11 +969,17 @@
         LOG(ERROR) << "Failed to allocate EVS Camera interface for " << camId;
         return false;
     } else {
-        LOG(INFO) << "Camera " << camId << " is opened successfully";
+        LOG(INFO) << "Logical camera " << camId << " is opened successfully";
+    }
+
+    mEvsCameraIds = mIOModuleConfig->cameraConfig.evsCameraIds;
+    if (mEvsCameraIds.size() < kNumFrames) {
+        LOG(ERROR) << "Incorrect camera info is stored in the camera config";
+        return false;
     }
 
     map<string, AndroidCameraParams> cameraIdToAndroidParameters;
-    for (const auto& id : mIOModuleConfig->cameraConfig.evsCameraIds) {
+    for (const auto& id : mEvsCameraIds) {
         AndroidCameraParams params;
         if (getAndroidCameraParams(mCamera, id, params)) {
             cameraIdToAndroidParameters.emplace(id, params);
@@ -878,10 +1001,17 @@
         camera.circular_fov = 179;
     }
 
+    // Add validity mask filenames.
+    for (int i = 0; i < mCameraParams.size(); i++) {
+        mCameraParams[i].validity_mask_filename = mIOModuleConfig->cameraConfig.maskFilenames[i];
+    }
+    ATRACE_END();
     return true;
 }
 
 bool SurroundView3dSession::startEvs() {
+    ATRACE_BEGIN(__PRETTY_FUNCTION__);
+
     mFramesHandler = new FramesHandler(mCamera, this);
     Return<EvsResult> result = mCamera->startVideoStream(mFramesHandler);
     if (result != EvsResult::OK) {
@@ -891,6 +1021,8 @@
         LOG(INFO) << "Video stream was started successfully";
     }
 
+    ATRACE_END();
+
     return true;
 }
 
diff --git a/surround_view/service-impl/SurroundView3dSession.h b/cpp/surround_view/service-impl/SurroundView3dSession.h
similarity index 91%
rename from surround_view/service-impl/SurroundView3dSession.h
rename to cpp/surround_view/service-impl/SurroundView3dSession.h
index 09f4c90..6c2b8ce 100644
--- a/surround_view/service-impl/SurroundView3dSession.h
+++ b/cpp/surround_view/service-impl/SurroundView3dSession.h
@@ -27,7 +27,6 @@
 #include <hidl/Status.h>
 
 #include "AnimationModule.h"
-#include "CoreLibSetupHelper.h"
 #include "VhalHandler.h"
 
 #include <thread>
@@ -133,13 +132,13 @@
     // Instance and metadata for the opened Evs Camera
     sp<IEvsCamera> mCamera;
     CameraDesc mCameraDesc;
-    vector<SurroundViewCameraParams> mCameraParams;
+    std::vector<SurroundViewCameraParams> mCameraParams;
 
     // Stream subscribed for the session.
     sp<ISurroundViewStream> mStream GUARDED_BY(mAccessLock);
     StreamStateValues mStreamState GUARDED_BY(mAccessLock);
 
-    thread mProcessThread; // The thread we'll use to process frames
+    std::thread mProcessThread; // The thread we'll use to process frames
 
     // Reference to the inner class, to handle the incoming Evs frames
     sp<FramesHandler> mFramesHandler;
@@ -158,17 +157,17 @@
     FramesRecord mFramesRecord GUARDED_BY(mAccessLock);
 
     // Synchronization necessary to deconflict mCaptureThread from the main service thread
-    mutex mAccessLock;
+    std::mutex mAccessLock;
 
-    vector<View3d> mViews GUARDED_BY(mAccessLock);
+    std::vector<View3d> mViews GUARDED_BY(mAccessLock);
 
     Sv3dConfig mConfig GUARDED_BY(mAccessLock);
 
-    vector<string> mEvsCameraIds GUARDED_BY(mAccessLock);
+    std::vector<std::string> mEvsCameraIds GUARDED_BY(mAccessLock);
 
-    unique_ptr<SurroundView> mSurroundView GUARDED_BY(mAccessLock);
+    std::unique_ptr<SurroundView> mSurroundView GUARDED_BY(mAccessLock);
 
-    vector<SurroundViewInputBufferPointers>
+    std::vector<SurroundViewInputBufferPointers>
         mInputPointers GUARDED_BY(mAccessLock);
     SurroundViewResultPointer mOutputPointer GUARDED_BY(mAccessLock);
     int mOutputWidth, mOutputHeight GUARDED_BY(mAccessLock);
@@ -181,6 +180,9 @@
     AnimationModule* mAnimationModule;
     IOModuleConfig* mIOModuleConfig;
 
+    std::vector<Overlay> mOverlays GUARDED_BY(mAccessLock);
+    bool mOverlayIsUpdated GUARDED_BY(mAccessLock) = false;
+
     std::vector<VehiclePropValue> mPropertyValues;
 };
 
diff --git a/cpp/surround_view/service-impl/SurroundView3dSessionTests.cpp b/cpp/surround_view/service-impl/SurroundView3dSessionTests.cpp
new file mode 100644
index 0000000..afe8f07
--- /dev/null
+++ b/cpp/surround_view/service-impl/SurroundView3dSessionTests.cpp
@@ -0,0 +1,350 @@
+/*
+ * Copyright 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.
+ */
+
+#define LOG_TAG "SurroundView3dSessionTests"
+
+#include "AnimationModule.h"
+#include "IOModule.h"
+#include "SurroundView3dSession.h"
+#include "VhalHandler.h"
+#include "mock-evs/MockEvsEnumerator.h"
+#include "mock-evs/MockSurroundViewCallback.h"
+
+#include <android-base/logging.h>
+#include <android/hardware/automotive/vehicle/2.0/IVehicle.h>
+#include <android/hidl/allocator/1.0/IAllocator.h>
+#include <android/hidl/memory/1.0/IMemory.h>
+#include <gtest/gtest.h>
+#include <hidlmemory/mapping.h>
+
+#include <time.h>
+
+namespace android {
+namespace hardware {
+namespace automotive {
+namespace sv {
+namespace V1_0 {
+namespace implementation {
+namespace {
+
+using ::android::sp;
+using ::android::hardware::hidl_memory;
+using ::android::hardware::hidl_string;
+using ::android::hardware::hidl_vec;
+using ::android::hardware::automotive::sv::V1_0::OverlayMemoryDesc;
+using ::android::hidl::allocator::V1_0::IAllocator;
+using ::android::hidl::memory::V1_0::IMemory;
+
+const char* kSvConfigFilename = "vendor/etc/automotive/sv/sv_sample_config.xml";
+
+// Sv 3D output height and width set by the config file.
+const int kSv3dWidth = 1920;
+const int kSv3dHeight = 1080;
+
+// Constants for overlays.
+const int kVertexByteSize = (3 * sizeof(float)) + 4;
+const int kIdByteSize = 2;
+
+class SurroundView3dSessionTests : public ::testing::Test {
+protected:
+    // Setup sv3d session without vhal and animations.
+    void SetupSv3dSession() {
+        mFakeEvs = new MockEvsEnumerator();
+        mIoModule = new IOModule(kSvConfigFilename);
+        EXPECT_EQ(mIoModule->initialize(), IOStatus::OK);
+
+        mIoModule->getConfig(&mIoModuleConfig);
+
+        mSv3dSession = new SurroundView3dSession(mFakeEvs, nullptr,
+                                                 nullptr,
+                                                 &mIoModuleConfig);
+
+        EXPECT_TRUE(mSv3dSession->initialize());
+        mSv3dCallback = new MockSurroundViewCallback(mSv3dSession);
+        vector<View3d> views = {
+        {
+            .viewId = 0,
+            .pose = {
+                .rotation = {.x = 0, .y = 0, .z = 0, .w = 1.0f},
+                .translation = {.x = 0, .y = 0, .z = 0},
+            },
+            .horizontalFov = 90,
+        }};
+        mSv3dSession->setViews(views);
+    }
+
+    // Setup sv3d session with vhal and animations.
+    void SetupSv3dSessionVhalAnimation() {
+        mFakeEvs = new MockEvsEnumerator();
+        mIoModule = new IOModule(kSvConfigFilename);
+        EXPECT_EQ(mIoModule->initialize(), IOStatus::OK);
+
+        mIoModule->getConfig(&mIoModuleConfig);
+
+        mVhalHandler = new VhalHandler();
+        ASSERT_TRUE(mVhalHandler->initialize(VhalHandler::UpdateMethod::GET, 10));
+
+        mAnimationModule = new AnimationModule(mIoModuleConfig.carModelConfig.carModel.partsMap,
+                                    mIoModuleConfig.carModelConfig.carModel.texturesMap,
+                                    mIoModuleConfig.carModelConfig.animationConfig.animations);
+
+        const std::vector<uint64_t> animationPropertiesToRead =
+                getAnimationPropertiesToRead(mIoModuleConfig.carModelConfig.animationConfig);
+        ASSERT_TRUE(mVhalHandler->setPropertiesToRead(animationPropertiesToRead));
+
+        mSv3dSessionAnimations = new SurroundView3dSession(mFakeEvs, mVhalHandler,
+                                                 mAnimationModule,
+                                                 &mIoModuleConfig);
+
+        EXPECT_TRUE(mSv3dSessionAnimations->initialize());
+
+        mSv3dCallbackAnimations = new MockSurroundViewCallback(mSv3dSessionAnimations);
+        vector<View3d> views = {
+        // View 0
+        {
+            .viewId = 0,
+            .pose = {
+                .rotation = {.x = 0, .y = 0, .z = 0, .w = 1.0f},
+                .translation = {.x = 0, .y = 0, .z = 0},
+            },
+            .horizontalFov = 90,
+        }};
+
+        mSv3dSessionAnimations->setViews(views);
+    }
+
+    // Helper function to get list of vhal properties to read from car config file for animations.
+    std::vector<uint64_t> getAnimationPropertiesToRead(const AnimationConfig& animationConfig) {
+        std::set<uint64_t> propertiesSet;
+        for (const auto& animation : animationConfig.animations) {
+            for (const auto& opPair : animation.gammaOpsMap) {
+                propertiesSet.insert(opPair.first);
+            }
+
+            for (const auto& opPair : animation.textureOpsMap) {
+                propertiesSet.insert(opPair.first);
+            }
+
+            for (const auto& opPair : animation.rotationOpsMap) {
+                propertiesSet.insert(opPair.first);
+            }
+
+            for (const auto& opPair : animation.translationOpsMap) {
+                propertiesSet.insert(opPair.first);
+            }
+        }
+        std::vector<uint64_t> propertiesToRead;
+        propertiesToRead.assign(propertiesSet.begin(), propertiesSet.end());
+        return propertiesToRead;
+    }
+
+    void TearDown() override {
+        mSv3dSession = nullptr;
+        mFakeEvs = nullptr;
+        mSv3dCallback = nullptr;
+        delete mVhalHandler;
+        delete mAnimationModule;
+        delete mIoModule;
+    }
+
+    sp<IEvsEnumerator> mFakeEvs;
+    IOModule* mIoModule;
+    IOModuleConfig mIoModuleConfig;
+    sp<SurroundView3dSession> mSv3dSession;
+    sp<MockSurroundViewCallback> mSv3dCallback;
+
+    VhalHandler* mVhalHandler;
+    AnimationModule* mAnimationModule;
+    sp<SurroundView3dSession> mSv3dSessionAnimations;
+    sp<MockSurroundViewCallback> mSv3dCallbackAnimations;
+};
+
+TEST_F(SurroundView3dSessionTests, startAndStop3dSession) {
+    SetupSv3dSession();
+    EXPECT_EQ(mSv3dSession->startStream(mSv3dCallback), SvResult::OK);
+    sleep(5);
+    mSv3dSession->stopStream();
+    EXPECT_GT(mSv3dCallback->getReceivedFramesCount(), 0);
+}
+
+TEST_F(SurroundView3dSessionTests, get3dConfigSuccess) {
+    SetupSv3dSession();
+    Sv3dConfig sv3dConfig;
+    mSv3dSession->get3dConfig([&sv3dConfig](const Sv3dConfig& config) { sv3dConfig = config; });
+
+    EXPECT_EQ(sv3dConfig.width, kSv3dWidth);
+    EXPECT_EQ(sv3dConfig.height, kSv3dHeight);
+    EXPECT_EQ(sv3dConfig.carDetails, SvQuality::HIGH);
+}
+
+// Sets a different config and checks of the received config matches.
+TEST_F(SurroundView3dSessionTests, setAndGet3dConfigSuccess) {
+    SetupSv3dSession();
+    Sv3dConfig sv3dConfigSet = {kSv3dWidth / 2, kSv3dHeight / 2, SvQuality::LOW};
+
+    EXPECT_EQ(mSv3dSession->set3dConfig(sv3dConfigSet), SvResult::OK);
+
+    Sv3dConfig sv3dConfigReceived;
+    mSv3dSession->get3dConfig(
+            [&sv3dConfigReceived](const Sv3dConfig& config) { sv3dConfigReceived = config; });
+
+    EXPECT_EQ(sv3dConfigReceived.width, sv3dConfigSet.width);
+    EXPECT_EQ(sv3dConfigReceived.height, sv3dConfigSet.height);
+    EXPECT_EQ(sv3dConfigReceived.carDetails, sv3dConfigSet.carDetails);
+}
+
+// Projects center of each cameras and checks if valid projected point is received.
+TEST_F(SurroundView3dSessionTests, projectPoints3dSuccess) {
+    SetupSv3dSession();
+    hidl_vec<Point2dInt> points2dCamera = {
+            /*Center point*/ {.x = kSv3dWidth / 2, .y = kSv3dHeight / 2}};
+
+    std::vector<hidl_string> cameraIds = {"/dev/video60", "/dev/video61", "/dev/video62",
+                                          "/dev/video63"};
+
+    for (int i = 0; i < cameraIds.size(); i++) {
+        mSv3dSession
+                ->projectCameraPointsTo3dSurface(points2dCamera, cameraIds[i],
+                                                 [](const hidl_vec<Point3dFloat>& projectedPoints) {
+                                                     EXPECT_TRUE(projectedPoints[0].isValid);
+                                                 });
+    }
+}
+
+std::pair<hidl_memory, sp<IMemory>> GetMappedSharedMemory(int bytesSize) {
+    const auto nullResult = std::make_pair(hidl_memory(), nullptr);
+
+    sp<IAllocator> ashmemAllocator = IAllocator::getService("ashmem");
+    if (ashmemAllocator.get() == nullptr) {
+        return nullResult;
+    }
+
+    // Allocate shared memory.
+    hidl_memory hidlMemory;
+    bool allocateSuccess = false;
+    Return<void> result =
+            ashmemAllocator->allocate(bytesSize, [&](bool success, const hidl_memory& hidlMem) {
+                if (!success) {
+                    return;
+                }
+                allocateSuccess = success;
+                hidlMemory = hidlMem;
+            });
+
+    // Check result of allocated memory.
+    if (!result.isOk() || !allocateSuccess) {
+        return nullResult;
+    }
+
+    // Map shared memory.
+    sp<IMemory> pIMemory = mapMemory(hidlMemory);
+    if (pIMemory.get() == nullptr) {
+        return nullResult;
+    }
+
+    return std::make_pair(hidlMemory, pIMemory);
+}
+
+void SetIndexOfOverlaysMemory(const std::vector<OverlayMemoryDesc>& overlaysMemDesc,
+                              sp<IMemory> pIMemory, int indexPosition, uint16_t indexValue) {
+    // Count the number of vertices until the index.
+    int totalVerticesCount = 0;
+    for (int i = 0; i < indexPosition; i++) {
+        totalVerticesCount += overlaysMemDesc[i].verticesCount;
+    }
+
+    const int indexBytePosition =
+            (indexPosition * kIdByteSize) + (kVertexByteSize * totalVerticesCount);
+
+    uint8_t* pSharedMemoryData = reinterpret_cast<uint8_t*>((void*)pIMemory->getPointer());
+    pSharedMemoryData += indexBytePosition;
+    uint16_t* pIndex16bit = reinterpret_cast<uint16_t*>(pSharedMemoryData);
+
+    // Modify shared memory.
+    pIMemory->update();
+    *pIndex16bit = indexValue;
+    pIMemory->commit();
+}
+
+std::pair<OverlaysData, sp<IMemory>> GetSampleOverlaysData() {
+    OverlaysData overlaysData;
+    overlaysData.overlaysMemoryDesc.resize(2);
+
+    int sharedMemBytesSize = 0;
+    OverlayMemoryDesc overlayMemDesc1, overlayMemDesc2;
+    overlayMemDesc1.id = 0;
+    overlayMemDesc1.verticesCount = 6;
+    overlayMemDesc1.overlayPrimitive = OverlayPrimitive::TRIANGLES;
+    overlaysData.overlaysMemoryDesc[0] = overlayMemDesc1;
+    sharedMemBytesSize += kIdByteSize + kVertexByteSize * overlayMemDesc1.verticesCount;
+
+    overlayMemDesc2.id = 1;
+    overlayMemDesc2.verticesCount = 4;
+    overlayMemDesc2.overlayPrimitive = OverlayPrimitive::TRIANGLES_STRIP;
+    overlaysData.overlaysMemoryDesc[1] = overlayMemDesc2;
+    sharedMemBytesSize += kIdByteSize + kVertexByteSize * overlayMemDesc2.verticesCount;
+
+    std::pair<hidl_memory, sp<IMemory>> sharedMem = GetMappedSharedMemory(sharedMemBytesSize);
+    sp<IMemory> pIMemory = sharedMem.second;
+    if (pIMemory.get() == nullptr) {
+        return std::make_pair(OverlaysData(), nullptr);
+    }
+
+    // Get pointer to shared memory data and set all bytes to 0.
+    uint8_t* pSharedMemoryData = reinterpret_cast<uint8_t*>((void*)pIMemory->getPointer());
+    pIMemory->update();
+    memset(pSharedMemoryData, 0, sharedMemBytesSize);
+    pIMemory->commit();
+
+    std::vector<OverlayMemoryDesc> overlaysDesc = {overlayMemDesc1, overlayMemDesc2};
+
+    // Set indexes in shared memory.
+    SetIndexOfOverlaysMemory(overlaysDesc, pIMemory, 0, overlayMemDesc1.id);
+    SetIndexOfOverlaysMemory(overlaysDesc, pIMemory, 1, overlayMemDesc2.id);
+
+    overlaysData.overlaysMemoryDesc = overlaysDesc;
+    overlaysData.overlaysMemory = sharedMem.first;
+
+    return std::make_pair(overlaysData, pIMemory);
+}
+
+// Verifies a valid overlay can be updated while streaming.
+TEST_F(SurroundView3dSessionTests, updateOverlaysSuccess) {
+    SetupSv3dSession();
+    std::pair<OverlaysData, sp<IMemory>> overlaysData = GetSampleOverlaysData();
+    ASSERT_NE(overlaysData.second, nullptr);
+    EXPECT_EQ(mSv3dSession->startStream(mSv3dCallback), SvResult::OK);
+    SvResult result = mSv3dSession->updateOverlays(overlaysData.first);
+    mSv3dSession->stopStream();
+    EXPECT_EQ(result, SvResult::OK);
+}
+
+// Setup sv 3d sessin with vhal and animations and verify frames are received successfully.
+TEST_F(SurroundView3dSessionTests, vhalAnimationSuccess) {
+    SetupSv3dSessionVhalAnimation();
+    EXPECT_EQ(mSv3dSessionAnimations->startStream(mSv3dCallbackAnimations), SvResult::OK);
+    sleep(5);
+    mSv3dSessionAnimations->stopStream();
+    EXPECT_GT(mSv3dCallbackAnimations->getReceivedFramesCount(), 0);
+}
+
+}  // namespace
+}  // namespace implementation
+}  // namespace V1_0
+}  // namespace sv
+}  // namespace automotive
+}  // namespace hardware
+}  // namespace android
diff --git a/surround_view/service-impl/SurroundViewService.cpp b/cpp/surround_view/service-impl/SurroundViewService.cpp
similarity index 95%
rename from surround_view/service-impl/SurroundViewService.cpp
rename to cpp/surround_view/service-impl/SurroundViewService.cpp
index 910b0ae..e8a2ffd 100644
--- a/surround_view/service-impl/SurroundViewService.cpp
+++ b/cpp/surround_view/service-impl/SurroundViewService.cpp
@@ -16,7 +16,6 @@
 
 #include <android-base/logging.h>
 
-#include "CoreLibSetupHelper.h"
 #include "SurroundViewService.h"
 
 using namespace android_auto::surround_view;
@@ -36,14 +35,24 @@
 const std::string kCameraIds[] = {"0", "1", "2", "3"};
 static const int kVhalUpdateRate = 10;
 
-SurroundViewService::SurroundViewService() {
+SurroundViewService::SurroundViewService() :
+      mVhalHandler(nullptr), mAnimationModule(nullptr), mIOModule(nullptr) {
     mVhalHandler = new VhalHandler();
     mIOModule = new IOModule("/vendor/etc/automotive/sv/sv_sample_config.xml");
 }
 
 SurroundViewService::~SurroundViewService() {
-    delete mVhalHandler;
-    delete mAnimationModule;
+    if (mVhalHandler != nullptr) {
+        delete mVhalHandler;
+    }
+
+    if (mIOModule != nullptr) {
+        delete mIOModule;
+    }
+
+    if (mAnimationModule != nullptr) {
+        delete mAnimationModule;
+    }
 }
 
 sp<SurroundViewService> SurroundViewService::getInstance() {
diff --git a/surround_view/service-impl/SurroundViewService.h b/cpp/surround_view/service-impl/SurroundViewService.h
similarity index 100%
rename from surround_view/service-impl/SurroundViewService.h
rename to cpp/surround_view/service-impl/SurroundViewService.h
diff --git a/surround_view/service-impl/SurroundViewSessionTests.cpp b/cpp/surround_view/service-impl/SurroundViewSessionTests.cpp
similarity index 89%
rename from surround_view/service-impl/SurroundViewSessionTests.cpp
rename to cpp/surround_view/service-impl/SurroundViewSessionTests.cpp
index b694aaf..a6abd04 100644
--- a/surround_view/service-impl/SurroundViewSessionTests.cpp
+++ b/cpp/surround_view/service-impl/SurroundViewSessionTests.cpp
@@ -28,6 +28,7 @@
 #include <android-base/logging.h>
 
 #include <gtest/gtest.h>
+#include <time.h>
 
 namespace android {
 namespace hardware {
@@ -39,6 +40,7 @@
 
 const char* kSvConfigFilename = "vendor/etc/automotive/sv/sv_sample_config.xml";
 
+// TODO(b/159733690): Verify the callbacks using help/mock methods
 TEST(SurroundViewSessionTests, startAndStopSurroundView2dSession) {
     sp<IEvsEnumerator> fakeEvs = new MockEvsEnumerator();
     IOModule* ioModule = new IOModule(kSvConfigFilename);
@@ -57,6 +59,8 @@
 
     EXPECT_EQ(sv2dSession->startStream(sv2dCallback), SvResult::OK);
 
+    sleep(5);
+
     sv2dSession->stopStream();
 }
 
@@ -79,13 +83,22 @@
     sp<MockSurroundViewCallback> sv3dCallback =
             new MockSurroundViewCallback(sv3dSession);
 
-    View3d view = {};
+    View3d view = {
+        .viewId = 0,
+        .pose = {
+            .rotation = {.x=0, .y=0, .z=0, .w=1.0f},
+            .translation = {.x=0, .y=0, .z=0},
+        },
+        .horizontalFov = 90,
+    };
     vector<View3d> views;
     views.emplace_back(view);
     sv3dSession->setViews(views);
 
     EXPECT_EQ(sv3dSession->startStream(sv3dCallback), SvResult::OK);
 
+    sleep(5);
+
     sv3dSession->stopStream();
 }
 
diff --git a/surround_view/service-impl/VhalHandler.cpp b/cpp/surround_view/service-impl/VhalHandler.cpp
similarity index 100%
rename from surround_view/service-impl/VhalHandler.cpp
rename to cpp/surround_view/service-impl/VhalHandler.cpp
diff --git a/surround_view/service-impl/VhalHandler.h b/cpp/surround_view/service-impl/VhalHandler.h
similarity index 100%
rename from surround_view/service-impl/VhalHandler.h
rename to cpp/surround_view/service-impl/VhalHandler.h
diff --git a/surround_view/service-impl/VhalHandlerTests.cpp b/cpp/surround_view/service-impl/VhalHandlerTests.cpp
similarity index 100%
rename from surround_view/service-impl/VhalHandlerTests.cpp
rename to cpp/surround_view/service-impl/VhalHandlerTests.cpp
diff --git a/surround_view/service-impl/android.automotive.sv.service@1.0-impl.rc b/cpp/surround_view/service-impl/android.automotive.sv.service@1.0-impl.rc
similarity index 100%
rename from surround_view/service-impl/android.automotive.sv.service@1.0-impl.rc
rename to cpp/surround_view/service-impl/android.automotive.sv.service@1.0-impl.rc
diff --git a/surround_view/service-impl/core_lib.h b/cpp/surround_view/service-impl/core_lib.h
similarity index 92%
rename from surround_view/service-impl/core_lib.h
rename to cpp/surround_view/service-impl/core_lib.h
index 7a9e67d..fd8f1ec 100644
--- a/surround_view/service-impl/core_lib.h
+++ b/cpp/surround_view/service-impl/core_lib.h
@@ -200,20 +200,26 @@
     // Blending type for low quality preset.
     BlendingType low_quality_blending;
 
+    // whether gpu acceleration is enabled or not
+    bool gpu_acceleration_enabled;
+
     SurroundView2dParams() :
           resolution{0, 0},
           physical_size{0.0f, 0.0f},
           physical_center{0.0f, 0.0f},
           high_quality_blending(BlendingType::MULTIBAND),
-          low_quality_blending(BlendingType::ALPHA) {}
+          low_quality_blending(BlendingType::ALPHA),
+          gpu_acceleration_enabled(false) {}
 
     SurroundView2dParams(Size2dInteger resolution_, Size2dFloat physical_size_,
-                         Coordinate2dFloat physical_center_) :
+                         Coordinate2dFloat physical_center_,
+                         bool gpu_acceleration_enabled_ = false) :
           resolution(resolution_),
           physical_size(physical_size_),
           physical_center(physical_center_),
           high_quality_blending(BlendingType::MULTIBAND),
-          low_quality_blending(BlendingType::ALPHA) {}
+          low_quality_blending(BlendingType::ALPHA),
+          gpu_acceleration_enabled(gpu_acceleration_enabled_) {}
 
     // Checks if data is valid.
     bool IsValid() const { return resolution.IsValid() && physical_size.IsValid(); }
@@ -222,7 +228,8 @@
         return resolution == rhs.resolution && physical_size == rhs.physical_size &&
                 physical_center == rhs.physical_center &&
                 high_quality_blending == rhs.high_quality_blending &&
-                low_quality_blending == rhs.low_quality_blending;
+                low_quality_blending == rhs.low_quality_blending &&
+                gpu_acceleration_enabled == rhs.gpu_acceleration_enabled;
     }
 
     SurroundView2dParams& operator=(const SurroundView2dParams& rhs) {
@@ -231,6 +238,7 @@
         physical_center = rhs.physical_center;
         high_quality_blending = rhs.high_quality_blending;
         low_quality_blending = rhs.low_quality_blending;
+        gpu_acceleration_enabled = rhs.gpu_acceleration_enabled;
         return *this;
     }
 };
@@ -354,6 +362,10 @@
     // fisheye circular fov.
     float circular_fov;
 
+    // Full path and filename to the validity mask image file.
+    // Mask specifies the valid region of pixels within input camera image.
+    std::string validity_mask_filename;
+
     bool operator==(const SurroundViewCameraParams& rhs) const {
         return (0 == std::memcmp(intrinsics, rhs.intrinsics, 9 * sizeof(float))) &&
                 (0 == std::memcmp(distorion, rhs.distorion, 4 * sizeof(float))) &&
@@ -675,42 +687,57 @@
           height(height_) {}
 };
 
+// Currently we keep both cpu and gpu data pointers, and only one of them should
+// be valid at a certain point. Users need to check null before they make use of
+// the data pointers.
+// TODO(b/174778117): consider use only one data pointer once GPU migration is
+// done. If we are going to keep both cpu and gpu data pointer, specify the type
+// of data for cpu data pointer, instead of using a void pointer.
 struct SurroundViewResultPointer {
-    void* data_pointer;
+    void* gpu_data_pointer;
+    void* cpu_data_pointer;
     Format format;
     int width;
     int height;
     bool is_data_preallocated;
     SurroundViewResultPointer() :
-          data_pointer(nullptr), width(0), height(0), is_data_preallocated(false) {}
+          gpu_data_pointer(nullptr),
+          cpu_data_pointer(nullptr),
+          width(0),
+          height(0),
+          is_data_preallocated(false) {}
 
     // Constructor with result data pointer being allocated within core lib.
     // Use for cases when no already existing buffer is available.
     SurroundViewResultPointer(Format format_, int width_, int height_) :
-          format(format_), width(width_), height(height_) {
+          gpu_data_pointer(nullptr),
+          format(format_),
+          width(width_),
+          height(height_),
+          is_data_preallocated(false) {
         // default formate is gray.
         const int byte_per_pixel = format_ == RGB ? 3 : format_ == RGBA ? 4 : 1;
-        data_pointer = static_cast<void*>(new char[width * height * byte_per_pixel]);
-        is_data_preallocated = false;
+        cpu_data_pointer = static_cast<void*>(new char[width * height * byte_per_pixel]);
     }
 
     // Constructor with pre-allocated data.
     // Use for cases when results must be added to an existing allocated buffer.
     // Example, pre-allocated buffer of a display.
-    SurroundViewResultPointer(void* data_pointer_, Format format_, int width_, int height_) :
-          data_pointer(data_pointer_),
+    SurroundViewResultPointer(void* gpu_data_pointer_, void* cpu_data_pointer_, Format format_,
+                              int width_, int height_) :
+          gpu_data_pointer(gpu_data_pointer_),
+          cpu_data_pointer(cpu_data_pointer_),
           format(format_),
           width(width_),
           height(height_),
           is_data_preallocated(true) {}
 
     ~SurroundViewResultPointer() {
-        if (data_pointer) {
-            // TODO(b/154365307): Fix freeing up of pre-allocated memory.
-            // if (!is_data_preallocated) {
-            //   delete[] static_cast<char*>(data_pointer);
-            // }
-            data_pointer = nullptr;
+        if (cpu_data_pointer) {
+            if (!is_data_preallocated) {
+                delete[] static_cast<char*>(cpu_data_pointer);
+            }
+            cpu_data_pointer = nullptr;
         }
     }
 };
diff --git a/cpp/surround_view/service-impl/lib/arm64/libcore_lib_shared.so b/cpp/surround_view/service-impl/lib/arm64/libcore_lib_shared.so
new file mode 100755
index 0000000..76456ea
--- /dev/null
+++ b/cpp/surround_view/service-impl/lib/arm64/libcore_lib_shared.so
Binary files differ
diff --git a/cpp/surround_view/service-impl/lib/x86-64/libcore_lib_shared.so b/cpp/surround_view/service-impl/lib/x86-64/libcore_lib_shared.so
new file mode 100755
index 0000000..d84ab5c
--- /dev/null
+++ b/cpp/surround_view/service-impl/lib/x86-64/libcore_lib_shared.so
Binary files differ
diff --git a/cpp/surround_view/service-impl/lib/x86/libcore_lib_shared.so b/cpp/surround_view/service-impl/lib/x86/libcore_lib_shared.so
new file mode 100755
index 0000000..ce5bca1
--- /dev/null
+++ b/cpp/surround_view/service-impl/lib/x86/libcore_lib_shared.so
Binary files differ
diff --git a/surround_view/service-impl/manifest_android.hardware.automotive.sv@1.0.xml b/cpp/surround_view/service-impl/manifest_android.hardware.automotive.sv@1.0.xml
similarity index 100%
rename from surround_view/service-impl/manifest_android.hardware.automotive.sv@1.0.xml
rename to cpp/surround_view/service-impl/manifest_android.hardware.automotive.sv@1.0.xml
diff --git a/cpp/surround_view/service-impl/mock-evs/MockEvsCamera.cpp b/cpp/surround_view/service-impl/mock-evs/MockEvsCamera.cpp
new file mode 100644
index 0000000..dd59ebf
--- /dev/null
+++ b/cpp/surround_view/service-impl/mock-evs/MockEvsCamera.cpp
@@ -0,0 +1,308 @@
+/*
+ * Copyright 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.
+ */
+
+#include "MockEvsCamera.h"
+
+#include <stdlib.h>
+
+namespace android {
+namespace hardware {
+namespace automotive {
+namespace sv {
+namespace V1_0 {
+namespace implementation {
+
+// TODO(b/159733690): the number should come from xml
+const int kFramesCount = 4;
+const int kFrameGenerationDelayMillis = 30;
+
+MockEvsCamera::MockEvsCamera(const string& cameraId, const Stream& streamCfg) {
+    mConfigManager = ConfigManager::Create();
+
+    mStreamCfg.height = streamCfg.height;
+    mStreamCfg.width = streamCfg.width;
+
+    mCameraDesc.v1.cameraId = cameraId;
+    unique_ptr<ConfigManager::CameraGroupInfo>& cameraGroupInfo =
+            mConfigManager->getCameraGroupInfo(mCameraDesc.v1.cameraId);
+    if (cameraGroupInfo != nullptr) {
+        mCameraDesc.metadata.setToExternal(
+                (uint8_t*)cameraGroupInfo->characteristics,
+                get_camera_metadata_size(cameraGroupInfo->characteristics));
+    }
+}
+
+Return<void> MockEvsCamera::getCameraInfo(getCameraInfo_cb _hidl_cb) {
+    // Not implemented.
+
+    (void)_hidl_cb;
+    return {};
+}
+
+Return<EvsResult> MockEvsCamera::setMaxFramesInFlight(uint32_t bufferCount) {
+    // Not implemented.
+
+    (void)bufferCount;
+    return EvsResult::OK;
+}
+
+Return<EvsResult> MockEvsCamera::startVideoStream(
+        const ::android::sp<IEvsCameraStream_1_0>& stream) {
+    LOG(INFO) << __FUNCTION__;
+    scoped_lock<mutex> lock(mAccessLock);
+
+    mStream = IEvsCameraStream_1_1::castFrom(stream).withDefault(nullptr);
+
+    if (mStreamState != STOPPED) {
+        LOG(ERROR) << "Ignoring startVideoStream call when a stream is "
+                   << "already running.";
+        return EvsResult::STREAM_ALREADY_RUNNING;
+    }
+
+    // Start the frame generation thread
+    mStreamState = RUNNING;
+    mCaptureThread = thread([this]() { generateFrames(); });
+
+    return EvsResult::OK;
+}
+
+Return<void> MockEvsCamera::doneWithFrame(const BufferDesc_1_0& buffer) {
+    // Not implemented.
+
+    (void)buffer;
+    return {};
+}
+
+Return<void> MockEvsCamera::stopVideoStream() {
+    LOG(INFO) << __FUNCTION__;
+
+    unique_lock<mutex> lock(mAccessLock);
+    if (mStreamState == RUNNING) {
+        // Tell the GenerateFrames loop we want it to stop
+        mStreamState = STOPPING;
+        // Block outside the mutex until the "stop" flag has been acknowledged
+        // We won't send any more frames, but the client might still get some
+        // already in flight
+        LOG(DEBUG) << __FUNCTION__ << ": Waiting for stream thread to end...";
+        lock.unlock();
+        mCaptureThread.join();
+        lock.lock();
+        mStreamState = STOPPED;
+        mStream = nullptr;
+        LOG(DEBUG) << "Stream marked STOPPED.";
+    }
+    return {};
+}
+
+Return<int32_t> MockEvsCamera::getExtendedInfo(uint32_t opaqueIdentifier) {
+    // Not implemented.
+
+    (void)opaqueIdentifier;
+    return 0;
+}
+
+Return<EvsResult> MockEvsCamera::setExtendedInfo(uint32_t opaqueIdentifier,
+                                                 int32_t opaqueValue) {
+    // Not implemented.
+
+    (void)opaqueIdentifier;
+    (void)opaqueValue;
+    return EvsResult::OK;
+}
+
+Return<void> MockEvsCamera::getCameraInfo_1_1(getCameraInfo_1_1_cb _hidl_cb) {
+    _hidl_cb(mCameraDesc);
+    return {};
+}
+
+Return<void> MockEvsCamera::getPhysicalCameraInfo(
+        const hidl_string& deviceId, getPhysicalCameraInfo_cb _hidl_cb) {
+    CameraDesc_1_1 desc = {};
+    desc.v1.cameraId = deviceId;
+
+    unique_ptr<ConfigManager::CameraInfo>& cameraInfo =
+            mConfigManager->getCameraInfo(deviceId);
+    if (cameraInfo != nullptr) {
+        desc.metadata.setToExternal(
+                (uint8_t*)cameraInfo->characteristics,
+                get_camera_metadata_size(cameraInfo->characteristics));
+    }
+
+    _hidl_cb(desc);
+
+    return {};
+}
+
+Return<EvsResult> MockEvsCamera::doneWithFrame_1_1(
+        const hardware::hidl_vec<BufferDesc_1_1>& buffer) {
+    // Not implemented.
+
+    (void)buffer;
+    return EvsResult::OK;
+}
+
+Return<EvsResult> MockEvsCamera::setMaster() {
+    // Not implemented.
+
+    return EvsResult::OK;
+}
+
+Return<EvsResult> MockEvsCamera::forceMaster(
+        const sp<IEvsDisplay_1_0>& display) {
+    // Not implemented.
+
+    (void)display;
+    return EvsResult::OK;
+}
+
+Return<EvsResult> MockEvsCamera::unsetMaster() {
+    // Not implemented.
+
+    return EvsResult::OK;
+}
+
+Return<void> MockEvsCamera::getParameterList(getParameterList_cb _hidl_cb) {
+    // Not implemented.
+
+    (void)_hidl_cb;
+    return {};
+}
+
+Return<void> MockEvsCamera::getIntParameterRange(
+        CameraParam id, getIntParameterRange_cb _hidl_cb) {
+    // Not implemented.
+
+    (void)id;
+    (void)_hidl_cb;
+    return {};
+}
+
+Return<void> MockEvsCamera::setIntParameter(CameraParam id, int32_t value,
+                                            setIntParameter_cb _hidl_cb) {
+    // Not implemented.
+
+    (void)id;
+    (void)value;
+    (void)_hidl_cb;
+    return {};
+}
+
+Return<void> MockEvsCamera::getIntParameter(
+        CameraParam id, getIntParameter_cb _hidl_cb) {
+    // Not implemented.
+
+    (void)id;
+    (void)_hidl_cb;
+    return {};
+}
+
+Return<EvsResult> MockEvsCamera::setExtendedInfo_1_1(
+    uint32_t opaqueIdentifier, const hidl_vec<uint8_t>& opaqueValue) {
+    // Not implemented.
+
+    (void)opaqueIdentifier;
+    (void)opaqueValue;
+    return EvsResult::OK;
+}
+
+Return<void> MockEvsCamera::getExtendedInfo_1_1(
+        uint32_t opaqueIdentifier, getExtendedInfo_1_1_cb _hidl_cb) {
+    // Not implemented.
+
+    (void)opaqueIdentifier;
+    (void)_hidl_cb;
+    return {};
+}
+
+Return<void> MockEvsCamera::importExternalBuffers(
+        const hidl_vec<BufferDesc_1_1>& buffers,
+        importExternalBuffers_cb _hidl_cb) {
+    // Not implemented.
+
+    (void)buffers;
+    (void)_hidl_cb;
+    return {};
+}
+
+void MockEvsCamera::initializeFrames(int framesCount) {
+    LOG(INFO) << "StreamCfg width: " << mStreamCfg.width
+              << " height: " << mStreamCfg.height;
+
+    string label = "EmptyBuffer_";
+    mGraphicBuffers.resize(framesCount);
+    mBufferDescs.resize(framesCount);
+    for (int i = 0; i < framesCount; i++) {
+        mGraphicBuffers[i] = new GraphicBuffer(mStreamCfg.width,
+                                               mStreamCfg.height,
+                                               HAL_PIXEL_FORMAT_RGBA_8888,
+                                               1,
+                                               GRALLOC_USAGE_HW_TEXTURE,
+                                               label + (char)(i + 48));
+        mBufferDescs[i].buffer.nativeHandle =
+                mGraphicBuffers[i]->getNativeBuffer()->handle;
+        AHardwareBuffer_Desc* pDesc =
+                reinterpret_cast<AHardwareBuffer_Desc*>(
+                        &mBufferDescs[i].buffer.description);
+        pDesc->width = mStreamCfg.width;
+        pDesc->height = mStreamCfg.height;
+        pDesc->layers = 1;
+        pDesc->usage = GRALLOC_USAGE_HW_TEXTURE;
+        pDesc->stride = mGraphicBuffers[i]->getStride();
+        pDesc->format = HAL_PIXEL_FORMAT_RGBA_8888;
+    }
+}
+
+void MockEvsCamera::generateFrames() {
+    initializeFrames(kFramesCount);
+
+    while (true) {
+        {
+            scoped_lock<mutex> lock(mAccessLock);
+            if (mStreamState != RUNNING) {
+                // Break out of our main thread loop
+                LOG(INFO) << "StreamState does not equal to RUNNING. "
+                          << "Exiting the loop";
+                break;
+            }
+        }
+
+        mStream->deliverFrame_1_1(mBufferDescs);
+        std::this_thread::sleep_for(
+                std::chrono::milliseconds(kFrameGenerationDelayMillis));
+    }
+
+    {
+        scoped_lock<mutex> lock(mAccessLock);
+
+        if (mStream != nullptr) {
+            LOG(DEBUG) << "Notify EvsEventType::STREAM_STOPPED";
+
+            EvsEventDesc evsEventDesc;
+            evsEventDesc.aType = EvsEventType::STREAM_STOPPED;
+            mStream->notify(evsEventDesc);
+        } else {
+            LOG(WARNING) << "EVS stream is not valid any more. "
+                         << "The notify call is ignored.";
+        }
+    }
+}
+
+}  // namespace implementation
+}  // namespace V1_0
+}  // namespace sv
+}  // namespace automotive
+}  // namespace hardware
+}  // namespace android
diff --git a/surround_view/service-impl/mock-evs/MockEvsCamera.h b/cpp/surround_view/service-impl/mock-evs/MockEvsCamera.h
similarity index 81%
rename from surround_view/service-impl/mock-evs/MockEvsCamera.h
rename to cpp/surround_view/service-impl/mock-evs/MockEvsCamera.h
index d393702..e06a474 100644
--- a/surround_view/service-impl/mock-evs/MockEvsCamera.h
+++ b/cpp/surround_view/service-impl/mock-evs/MockEvsCamera.h
@@ -17,13 +17,21 @@
 #pragma once
 
 #include <android/hardware/automotive/evs/1.1/IEvsCamera.h>
+#include <android/hardware/automotive/evs/1.1/IEvsCameraStream.h>
 #include <android/hardware/automotive/evs/1.1/IEvsDisplay.h>
 #include <android/hardware/automotive/evs/1.1/IEvsEnumerator.h>
 
 #include <ConfigManager.h>
 
+#include <ui/GraphicBuffer.h>
+
+#include <mutex>
+#include <thread>
+
 using ::android::hardware::automotive::evs::V1_0::EvsResult;
 using ::android::hardware::automotive::evs::V1_1::CameraParam;
+using ::android::hardware::automotive::evs::V1_1::EvsEventDesc;
+using ::android::hardware::automotive::evs::V1_1::EvsEventType;
 
 namespace android {
 namespace hardware {
@@ -38,6 +46,7 @@
 using IEvsCamera_1_0 = ::android::hardware::automotive::evs::V1_0::IEvsCamera;
 using IEvsCamera_1_1 = ::android::hardware::automotive::evs::V1_1::IEvsCamera;
 using IEvsCameraStream_1_0 = ::android::hardware::automotive::evs::V1_0::IEvsCameraStream;
+using IEvsCameraStream_1_1 = ::android::hardware::automotive::evs::V1_1::IEvsCameraStream;
 using IEvsDisplay_1_0 = ::android::hardware::automotive::evs::V1_0::IEvsDisplay;
 using IEvsEnumerator_1_1 = ::android::hardware::automotive::evs::V1_1::IEvsEnumerator;
 
@@ -45,7 +54,7 @@
 // implemented.
 class MockEvsCamera : public IEvsCamera_1_1 {
 public:
-    MockEvsCamera();
+    MockEvsCamera(const std::string& cameraId, const Stream& streamCfg);
 
     // Methods from ::android::hardware::automotive::evs::V1_0::IEvsCamera follow.
     Return<void> getCameraInfo(getCameraInfo_cb _hidl_cb) override;
@@ -79,7 +88,30 @@
                                        importExternalBuffers_cb _hidl_cb) override;
 
 private:
+    void initializeFrames(int framesCount);
+    void generateFrames();
+
     std::unique_ptr<ConfigManager> mConfigManager;
+
+    std::mutex mAccessLock;
+
+    enum StreamStateValues {
+        STOPPED,
+        RUNNING,
+        STOPPING,
+        DEAD,
+    };
+    StreamStateValues mStreamState GUARDED_BY(mAccessLock);
+    Stream mStreamCfg;
+
+    std::vector<android::sp<GraphicBuffer>> mGraphicBuffers;
+    std::vector<BufferDesc_1_1> mBufferDescs;
+    CameraDesc_1_1 mCameraDesc;
+
+    std::string mCameraId;
+    std::thread mCaptureThread;  // The thread we'll use to synthesize frames
+
+    android::sp<IEvsCameraStream_1_1> mStream;
 };
 
 }  // namespace implementation
diff --git a/surround_view/service-impl/mock-evs/MockEvsEnumerator.cpp b/cpp/surround_view/service-impl/mock-evs/MockEvsEnumerator.cpp
similarity index 95%
rename from surround_view/service-impl/mock-evs/MockEvsEnumerator.cpp
rename to cpp/surround_view/service-impl/mock-evs/MockEvsEnumerator.cpp
index 946083c..136a81a 100644
--- a/surround_view/service-impl/mock-evs/MockEvsEnumerator.cpp
+++ b/cpp/surround_view/service-impl/mock-evs/MockEvsEnumerator.cpp
@@ -30,8 +30,7 @@
 using CameraDesc_1_1 = ::android::hardware::automotive::evs::V1_1::CameraDesc;
 
 MockEvsEnumerator::MockEvsEnumerator() {
-    mConfigManager = ConfigManager::Create(
-            "/vendor/etc/automotive/evs/evs_sample_configuration.xml");
+    mConfigManager = ConfigManager::Create();
 }
 
 Return<void> MockEvsEnumerator::getCameraList(getCameraList_cb _hidl_cb) {
@@ -109,11 +108,8 @@
 
 Return<sp<IEvsCamera_1_1>> MockEvsEnumerator::openCamera_1_1(
         const hidl_string& cameraId, const Stream& streamCfg) {
-    // Not implemented.
-
-    (void)cameraId;
-    (void)streamCfg;
-    return new MockEvsCamera();
+    LOG(INFO) << __FUNCTION__ << ": " << streamCfg.width << ", " << streamCfg.height;
+    return new MockEvsCamera(cameraId, streamCfg);
 }
 
 Return<void> MockEvsEnumerator::getDisplayIdList(getDisplayIdList_cb _list_cb) {
diff --git a/surround_view/service-impl/mock-evs/MockEvsEnumerator.h b/cpp/surround_view/service-impl/mock-evs/MockEvsEnumerator.h
similarity index 100%
rename from surround_view/service-impl/mock-evs/MockEvsEnumerator.h
rename to cpp/surround_view/service-impl/mock-evs/MockEvsEnumerator.h
diff --git a/surround_view/service-impl/mock-evs/MockSurroundViewCallback.cpp b/cpp/surround_view/service-impl/mock-evs/MockSurroundViewCallback.cpp
similarity index 62%
rename from surround_view/service-impl/mock-evs/MockSurroundViewCallback.cpp
rename to cpp/surround_view/service-impl/mock-evs/MockSurroundViewCallback.cpp
index d059f72..60108e6 100644
--- a/surround_view/service-impl/mock-evs/MockSurroundViewCallback.cpp
+++ b/cpp/surround_view/service-impl/mock-evs/MockSurroundViewCallback.cpp
@@ -18,9 +18,13 @@
 
 #include <android-base/logging.h>
 
+#include <thread>
+
 using ::android::sp;
 using ::android::hardware::Return;
 
+using ::std::thread;
+
 namespace android {
 namespace hardware {
 namespace automotive {
@@ -29,9 +33,8 @@
 namespace implementation {
 
 MockSurroundViewCallback::MockSurroundViewCallback(
-        sp<ISurroundViewSession> pSession) {
-    (void)pSession;
-}
+        sp<ISurroundViewSession> pSession) :
+        mSession(pSession) {}
 
 Return<void> MockSurroundViewCallback::notify(SvEvent svEvent) {
     LOG(INFO) << __FUNCTION__ << "SvEvent received: " << (int)svEvent;
@@ -42,9 +45,36 @@
         const SvFramesDesc& svFramesDesc) {
     LOG(INFO) << __FUNCTION__ << svFramesDesc.svBuffers.size()
               << " frames are received";
+
+    // Increment the count of received frames.
+    {
+        std::scoped_lock<std::mutex> lock(mAccessLock);
+        mReceivedFramesCount++;
+    }
+
+    // Create a separate thread to return the frames to the session. This
+    // simulates the behavior of oneway HIDL method call.
+    thread mockHidlThread([this, &svFramesDesc]() {
+        mSession->doneWithFrames(svFramesDesc);
+    });
+    mockHidlThread.detach();
     return {};
 }
 
+int MockSurroundViewCallback::getReceivedFramesCount() {
+    {
+        std::scoped_lock<std::mutex> lock(mAccessLock);
+        return mReceivedFramesCount;
+    }
+}
+
+void MockSurroundViewCallback::clearReceivedFramesCount() {
+    {
+        std::scoped_lock<std::mutex> lock(mAccessLock);
+        mReceivedFramesCount = 0;
+    }
+}
+
 }  // namespace implementation
 }  // namespace V1_0
 }  // namespace sv
diff --git a/surround_view/service-impl/mock-evs/MockSurroundViewCallback.h b/cpp/surround_view/service-impl/mock-evs/MockSurroundViewCallback.h
similarity index 78%
rename from surround_view/service-impl/mock-evs/MockSurroundViewCallback.h
rename to cpp/surround_view/service-impl/mock-evs/MockSurroundViewCallback.h
index 7239bf6..238e41a 100644
--- a/surround_view/service-impl/mock-evs/MockSurroundViewCallback.h
+++ b/cpp/surround_view/service-impl/mock-evs/MockSurroundViewCallback.h
@@ -19,6 +19,11 @@
 #include <android/hardware/automotive/sv/1.0/ISurroundViewService.h>
 #include <android/hardware/automotive/sv/1.0/ISurroundViewStream.h>
 
+#include <ui/GraphicBuffer.h>
+
+#include <mutex>
+#include <thread>
+
 using namespace android::hardware::automotive::sv::V1_0;
 
 namespace android {
@@ -35,6 +40,16 @@
     // Methods from ::android::hardware::automotive::sv::V1_0::ISurroundViewStream.
     android::hardware::Return<void> notify(SvEvent svEvent) override;
     android::hardware::Return<void> receiveFrames(const SvFramesDesc& svFramesDesc) override;
+
+    // Methods to get and clear the mReceivedFramesCount.
+    int getReceivedFramesCount();
+    void clearReceivedFramesCount();
+private:
+    std::mutex mAccessLock;
+    android::sp<ISurroundViewSession> mSession;
+
+    // Keeps a count of the number of calls made to receiveFrames().
+    int mReceivedFramesCount GUARDED_BY(mAccessLock) = 0;
 };
 
 }  // namespace implementation
diff --git a/surround_view/service-impl/service.cpp b/cpp/surround_view/service-impl/service.cpp
similarity index 92%
rename from surround_view/service-impl/service.cpp
rename to cpp/surround_view/service-impl/service.cpp
index 3ccc68f..b7d82f7 100644
--- a/surround_view/service-impl/service.cpp
+++ b/cpp/surround_view/service-impl/service.cpp
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#define ATRACE_TAG ATRACE_TAG_CAMERA
+
 #include <android-base/logging.h>
 #include <android/hardware/automotive/sv/1.0/ISurroundViewStream.h>
 #include <android/hardware_buffer.h>
@@ -23,6 +25,7 @@
 #include <utils/Errors.h>
 #include <utils/StrongPointer.h>
 #include <utils/SystemClock.h>
+#include <utils/Trace.h>
 
 #include "SurroundViewService.h"
 
@@ -39,6 +42,8 @@
 
     configureRpcThreadpool(1, true /* callerWillJoin */);
 
+    ATRACE_BEGIN("SurroundViewServiceImpl: registerAsService");
+
     // Register our service -- if somebody is already registered by our name,
     // they will be killed (their thread pool will throw an exception).
     android::status_t status = service->registerAsService();
@@ -48,6 +53,8 @@
                    << status;
     }
 
+    ATRACE_END();
+
     joinRpcThreadpool();
 
     // In normal operation, we don't expect the thread pool to exit
diff --git a/surround_view/service-impl/sv_3d_params.h b/cpp/surround_view/service-impl/sv_3d_params.h
similarity index 100%
rename from surround_view/service-impl/sv_3d_params.h
rename to cpp/surround_view/service-impl/sv_3d_params.h
diff --git a/surround_view/service-impl/test_data/0.png b/cpp/surround_view/service-impl/test_data/0.png
similarity index 100%
rename from surround_view/service-impl/test_data/0.png
rename to cpp/surround_view/service-impl/test_data/0.png
Binary files differ
diff --git a/surround_view/service-impl/test_data/1.png b/cpp/surround_view/service-impl/test_data/1.png
similarity index 100%
rename from surround_view/service-impl/test_data/1.png
rename to cpp/surround_view/service-impl/test_data/1.png
Binary files differ
diff --git a/surround_view/service-impl/test_data/2.png b/cpp/surround_view/service-impl/test_data/2.png
similarity index 100%
rename from surround_view/service-impl/test_data/2.png
rename to cpp/surround_view/service-impl/test_data/2.png
Binary files differ
diff --git a/surround_view/service-impl/test_data/3.png b/cpp/surround_view/service-impl/test_data/3.png
similarity index 100%
rename from surround_view/service-impl/test_data/3.png
rename to cpp/surround_view/service-impl/test_data/3.png
Binary files differ
diff --git a/surround_view/service-impl/test_data/sample_car.obj b/cpp/surround_view/service-impl/test_data/sample_car.obj
similarity index 100%
rename from surround_view/service-impl/test_data/sample_car.obj
rename to cpp/surround_view/service-impl/test_data/sample_car.obj
diff --git a/surround_view/service-impl/test_data/sample_car_material.mtl b/cpp/surround_view/service-impl/test_data/sample_car_material.mtl
similarity index 100%
rename from surround_view/service-impl/test_data/sample_car_material.mtl
rename to cpp/surround_view/service-impl/test_data/sample_car_material.mtl
diff --git a/surround_view/service-impl/test_data/sv_sample_car_model_config.xml b/cpp/surround_view/service-impl/test_data/sv_sample_car_model_config.xml
similarity index 100%
rename from surround_view/service-impl/test_data/sv_sample_car_model_config.xml
rename to cpp/surround_view/service-impl/test_data/sv_sample_car_model_config.xml
diff --git a/surround_view/service-impl/test_data/sv_sample_config.xml b/cpp/surround_view/service-impl/test_data/sv_sample_config.xml
similarity index 78%
rename from surround_view/service-impl/test_data/sv_sample_config.xml
rename to cpp/surround_view/service-impl/test_data/sv_sample_config.xml
index 88a5413..9a4b124 100644
--- a/surround_view/service-impl/test_data/sv_sample_config.xml
+++ b/cpp/surround_view/service-impl/test_data/sv_sample_config.xml
@@ -11,22 +11,22 @@
             <Left>/dev/video63</Left>
         </EvsCameraIds>
         <Masks>
-            <Front>/vendor/mask_front.png</Front>
-            <Right>/vendor/mask_right.png</Right>
-            <Rear>/vendor/mask_rear.png</Rear>
-            <Left>/vendor/mask_left.png</Left>
+            <Front>/vendor/etc/automotive/sv/mask_front.png</Front>
+            <Right>/vendor/etc/automotive/sv/mask_right.png</Right>
+            <Rear>/vendor/etc/automotive/sv/mask_rear.png</Rear>
+            <Left>/vendor/etc/automotive/sv/mask_left.png</Left>
         </Masks>
     </CameraConfig>
 
     <Sv2dEnabled>true</Sv2dEnabled>
     <Sv2dParams>
         <OutputResolution>
-            <Width>1024</Width>
-            <Height>768</Height>
+            <Width>768</Width>
+            <Height>1024</Height>
         </OutputResolution>
         <GroundMapping>
-            <Width>8.0</Width>
-            <Height>6.0</Height>
+            <Width>9.0</Width>
+            <Height>12.0</Height>
             <Center>
                 <X>0.0</X>
                 <Y>0.0</Y>
@@ -44,6 +44,7 @@
             <HighQuality>multiband</HighQuality>
             <LowQuality>alpha</LowQuality>
         </BlendingType>
+        <GpuAccelerationEnabled>false</GpuAccelerationEnabled>
     </Sv2dParams>
 
     <Sv3dEnabled>true</Sv3dEnabled>
@@ -52,8 +53,8 @@
     <CarModelObjFile>/vendor/etc/automotive/sv/sample_car.obj</CarModelObjFile>
     <Sv3dParams>
         <OutputResolution>
-            <Width>1024</Width>
-            <Height>768</Height>
+            <Width>1920</Width>
+            <Height>1080</Height>
         </OutputResolution>
         <BowlParams>
             <PlaneRadius>8.0</PlaneRadius>
diff --git a/evs/apps/default/ConfigManager.cpp b/evs/apps/default/ConfigManager.cpp
index 76c142c..cc55518 100644
--- a/evs/apps/default/ConfigManager.cpp
+++ b/evs/apps/default/ConfigManager.cpp
@@ -142,8 +142,11 @@
 
             float yaw   = node.get("yaw", 0).asFloat();
             float pitch = node.get("pitch", 0).asFloat();
+            float roll  = node.get("roll", 0).asFloat();
             float hfov  = node.get("hfov", 0).asFloat();
             float vfov  = node.get("vfov", 0).asFloat();
+            bool  hflip = node.get("hflip", false).asBool();
+            bool  vflip = node.get("vflip", false).asBool();
 
             // Wrap the direction angles to be in the 180deg to -180deg range
             // Rotate 180 in yaw if necessary to flip the pitch into the +/-90degree range
@@ -157,6 +160,7 @@
                 pitch = -180.0f + pitch;
             }
             yaw = normalizeToPlusMinus180degrees(yaw);
+            roll = normalizeToPlusMinus180degrees(roll);
 
             // Range check the FOV values to ensure they are postive and less than 180degrees
             if (hfov > 179.0f) {
@@ -183,8 +187,11 @@
             info.position[2] = node.get("z", 0).asFloat();
             info.yaw         = yaw   * kDegreesToRadians;
             info.pitch       = pitch * kDegreesToRadians;
+            info.roll        = roll  * kDegreesToRadians;
             info.hfov        = hfov  * kDegreesToRadians;
             info.vfov        = vfov  * kDegreesToRadians;
+            info.hflip       = hflip;
+            info.vflip       = vflip;
             info.cameraId    = cameraId;
             info.function    = function;
 
diff --git a/evs/apps/default/ConfigManager.h b/evs/apps/default/ConfigManager.h
index 7c2186d..bf22d0c 100644
--- a/evs/apps/default/ConfigManager.h
+++ b/evs/apps/default/ConfigManager.h
@@ -31,8 +31,11 @@
         float position[3] = {0};    // x, y, z -> right, fwd, up in the units of car space
         float yaw   = 0;    // radians positive to the left (right hand rule about global z axis)
         float pitch = 0;    // positive upward (ie: right hand rule about local x axis)
+        float roll  = 0;    // radians positively increasing clockwisely around the optical axis
         float hfov  = 0;    // radians
         float vfov  = 0;    // radians
+        bool  hflip = false;// boolean to flip the preview horizontally
+        bool  vflip = false;// boolean to flip the preview vertically
     };
 
     struct DisplayInfo {
@@ -111,6 +114,8 @@
     android_pixel_format_t getExternalMemoryFormat() const {
         return mExternalMemoryFormat;
     }
+    void    setMockGearSignal(int32_t signal) { mMockGearSignal = signal; }
+    int32_t getMockGearSignal() const { return mMockGearSignal; }
 
 private:
     // Camera information
@@ -126,6 +131,9 @@
     // Format of external memory
     android_pixel_format_t mExternalMemoryFormat;
 
+    // Gear signal to simulate in test mode
+    int32_t mMockGearSignal;
+
     // Car body information (assumes front wheel steering and origin at center of rear axel)
     // Note that units aren't specified and don't matter as long as all length units are consistent
     // within the JSON file from which we parse.  That is, if everything is in meters, that's fine.
diff --git a/evs/apps/default/EvsStateControl.cpp b/evs/apps/default/EvsStateControl.cpp
index 06af502..5e81022 100644
--- a/evs/apps/default/EvsStateControl.cpp
+++ b/evs/apps/default/EvsStateControl.cpp
@@ -219,7 +219,7 @@
 
 
 bool EvsStateControl::selectStateForCurrentConditions() {
-    static int32_t sDummyGear   = int32_t(VehicleGear::GEAR_REVERSE);
+    static int32_t sDummyGear   = mConfig.getMockGearSignal();
     static int32_t sDummySignal = int32_t(VehicleTurnSignal::NONE);
 
     if (mVehicle != nullptr) {
@@ -245,7 +245,7 @@
             sDummyGear = int32_t(VehicleGear::GEAR_DRIVE);
         }
 
-        // Build the dummy vehicle state values (treating single values as 1 element vectors)
+        // Build the placeholder vehicle state values (treating single values as 1 element vectors)
         mGearValue.value.int32Values.setToExternal(&sDummyGear, 1);
         mTurnSignalValue.value.int32Values.setToExternal(&sDummySignal, 1);
     }
diff --git a/evs/apps/default/RenderDirectView.cpp b/evs/apps/default/RenderDirectView.cpp
index 68b731e..c2263ce 100644
--- a/evs/apps/default/RenderDirectView.cpp
+++ b/evs/apps/default/RenderDirectView.cpp
@@ -15,15 +15,16 @@
  */
 
 #include "RenderDirectView.h"
+
 #include "VideoTex.h"
 #include "glError.h"
 #include "shader.h"
 #include "shader_simpleTex.h"
 
+#include <android-base/logging.h>
+#include <android/hardware/camera/device/3.2/ICameraDevice.h>
 #include <math/mat4.h>
 #include <system/camera_metadata.h>
-#include <android/hardware/camera/device/3.2/ICameraDevice.h>
-#include <android-base/logging.h>
 
 using ::android::hardware::camera::device::V3_2::Stream;
 using ::android::hardware::graphics::common::V1_0::PixelFormat;
@@ -38,7 +39,7 @@
     int32_t framerate;
 } RawStreamConfig;
 
-const size_t kStreamCfgSz = sizeof(RawStreamConfig);
+const size_t kStreamCfgSz = sizeof(RawStreamConfig) / sizeof(int32_t);
 
 
 RenderDirectView::RenderDirectView(sp<IEvsEnumerator> enumerator,
@@ -47,7 +48,21 @@
     mEnumerator(enumerator),
     mCameraDesc(camDesc),
     mConfig(config) {
-    /* Nothing to do */
+    // Find and store the target camera configuration
+    const auto& camList = mConfig.getCameras();
+    const auto target = std::find_if(camList.begin(), camList.end(),
+                                     [this](const ConfigManager::CameraInfo& info) {
+                                         return info.cameraId == mCameraDesc.v1.cameraId;
+                                     });
+    if (target != camList.end()) {
+        // Store the info
+        mCameraInfo = *target;
+
+        // Calculate a rotation matrix
+        float sinRoll, cosRoll;
+        sincosf(mCameraInfo.roll, &sinRoll, &cosRoll);
+        mRotationMat = {cosRoll, -sinRoll, sinRoll, cosRoll};
+    }
 }
 
 
@@ -148,6 +163,10 @@
     glUseProgram(mShaderProgram);
 
     // Set up the model to clip space transform (identity matrix if we're modeling in screen space)
+    android::vec2 leftTop = {-0.5f, 0.5f};
+    android::vec2 rightTop = {0.5f, 0.5f};
+    android::vec2 leftBottom = {-0.5f, -0.5f};
+    android::vec2 rightBottom = {0.5f, -0.5f};
     GLint loc = glGetUniformLocation(mShaderProgram, "cameraMat");
     if (loc < 0) {
         LOG(ERROR) << "Couldn't set shader parameter 'cameraMat'";
@@ -155,8 +174,13 @@
     } else {
         const android::mat4 identityMatrix;
         glUniformMatrix4fv(loc, 1, false, identityMatrix.asArray());
-    }
 
+        // Rotate the preview
+        leftTop     = mRotationMat * leftTop;
+        leftBottom  = mRotationMat * leftBottom;
+        rightTop    = mRotationMat * rightTop;
+        rightBottom = mRotationMat * rightBottom;
+    }
 
     // Bind the texture and assign it to the shader's sampler
     mTexture->refresh();
@@ -183,11 +207,22 @@
                               -1.0, -1.0, 0.0f,   // left bottom
                                1.0, -1.0, 0.0f    // right bottom
     };
-    // TODO:  We're flipping horizontally here, but should do it only for specified cameras!
-    GLfloat vertsCarTex[] = { 1.0f, 1.0f,   // left top
-                              0.0f, 1.0f,   // right top
-                              1.0f, 0.0f,   // left bottom
-                              0.0f, 0.0f    // right bottom
+
+    // Flip the preview if needed
+    if (mCameraInfo.hflip) {
+        std::swap(leftTop.x, rightTop.x);
+        std::swap(leftBottom.x, rightBottom.x);
+    }
+
+    if (mCameraInfo.vflip) {
+        std::swap(leftTop.y, leftBottom.y);
+        std::swap(rightTop.y, rightBottom.y);
+    }
+
+    GLfloat vertsCarTex[] = { leftTop.x + 0.5f, leftTop.y + 0.5f,
+                              rightTop.x + 0.5f, rightTop.y + 0.5f,
+                              leftBottom.x + 0.5f, leftBottom.y + 0.5f,
+                              rightBottom.x + 0.5f, rightBottom.y + 0.5f
     };
     glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, vertsCarPos);
     glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 0, vertsCarTex);
diff --git a/evs/apps/default/RenderDirectView.h b/evs/apps/default/RenderDirectView.h
index 65a94e2..2f9c11e 100644
--- a/evs/apps/default/RenderDirectView.h
+++ b/evs/apps/default/RenderDirectView.h
@@ -17,13 +17,12 @@
 #ifndef CAR_EVS_APP_RENDERDIRECTVIEW_H
 #define CAR_EVS_APP_RENDERDIRECTVIEW_H
 
-
-#include "RenderBase.h"
-
-#include <android/hardware/automotive/evs/1.1/IEvsEnumerator.h>
 #include "ConfigManager.h"
+#include "RenderBase.h"
 #include "VideoTex.h"
 
+#include <android/hardware/automotive/evs/1.1/IEvsEnumerator.h>
+#include <math/mat2.h>
 
 using namespace ::android::hardware::automotive::evs::V1_1;
 using ::android::hardware::camera::device::V3_2::Stream;
@@ -52,6 +51,8 @@
     std::unique_ptr<VideoTex>       mTexture;
 
     GLuint                          mShaderProgram = 0;
+
+    android::mat2                   mRotationMat;
 };
 
 
diff --git a/evs/apps/default/StreamHandler.cpp b/evs/apps/default/StreamHandler.cpp
index d350af1..a442b77 100644
--- a/evs/apps/default/StreamHandler.cpp
+++ b/evs/apps/default/StreamHandler.cpp
@@ -193,7 +193,10 @@
     hidl_vec<BufferDesc_1_1> frames;
     frames.resize(1);
     frames[0] = mBuffers[mHeldBuffer];
-    mCamera->doneWithFrame_1_1(frames);
+    auto ret = mCamera->doneWithFrame_1_1(frames);
+    if (!ret.isOk()) {
+        LOG(WARNING) << __FUNCTION__ << " fails to return a buffer";
+    }
 
     // Clear the held position
     mHeldBuffer = -1;
@@ -202,7 +205,10 @@
 
 Return<void> StreamHandler::deliverFrame(const BufferDesc_1_0& bufDesc_1_0) {
     LOG(INFO) << "Ignores a frame delivered from v1.0 EVS service.";
-    mCamera->doneWithFrame(bufDesc_1_0);
+    auto ret = mCamera->doneWithFrame(bufDesc_1_0);
+    if (!ret.isOk()) {
+        LOG(WARNING) << __FUNCTION__ << " fails to return a buffer";
+    }
 
     return Void();
 }
@@ -225,7 +231,10 @@
             hidl_vec<BufferDesc_1_1> frames;
             frames.resize(1);
             frames[0] = mBuffers[mReadyBuffer];
-            mCamera->doneWithFrame_1_1(frames);
+            auto ret = mCamera->doneWithFrame_1_1(frames);
+            if (!ret.isOk()) {
+                LOG(WARNING) << __FUNCTION__ << " fails to return a buffer";
+            }
 
             // We'll reuse the same ready buffer index
         } else if (mHeldBuffer >= 0) {
diff --git a/evs/apps/default/config.json b/evs/apps/default/config.json
index 1762e86..16148a7 100644
--- a/evs/apps/default/config.json
+++ b/evs/apps/default/config.json
@@ -8,31 +8,76 @@
   },
   "displays" : [
     {
-      "displayPort" : 1,
+      "displayPort" : 136,
       "frontRange" : 100,
       "rearRange" : 100
     },
     {
-      "displayPort" : 2,
+      "displayPort" : 130,
       "frontRange" : 100,
       "rearRange" : 100
     }
   ],
   "graphic" : {
-    "frontPixel" : 23,
-    "rearPixel" : 223
+    "frontPixel" : -20,
+    "rearPixel" : 260
   },
   "cameras" : [
     {
-      "cameraId" : "/dev/video3",
-      "function" : "reverse, park",
+      "cameraId" : "/dev/video10",
+      "function" : "reverse,park",
       "x" : 0.0,
-      "y" : -40.0,
+      "y" : 20.0,
       "z" : 48,
       "yaw" : 180,
-      "pitch" : -30,
-      "hfov" : 125,
-      "vfov" : 103
+      "pitch" : -10,
+      "roll" : 0,
+      "hfov" : 115,
+      "vfov" : 80,
+      "hflip" : true,
+      "vflip" : false
+    },
+    {
+      "cameraId" : "/dev/video11",
+      "function" : "front,park",
+      "x" : 0.0,
+      "y" : 100.0,
+      "z" : 48,
+      "yaw" : 0,
+      "pitch" : -10,
+      "roll" : 0,
+      "hfov" : 115,
+      "vfov" : 80,
+      "hflip" : false,
+      "vflip" : false
+    },
+    {
+      "cameraId" : "/dev/video12",
+      "function" : "right,park",
+      "x" : -25.0,
+      "y" : 60.0,
+      "z" : 88,
+      "yaw" : -90,
+      "pitch" : -10,
+      "roll" : 0,
+      "hfov" : 60,
+      "vfov" : 62,
+      "hflip" : false,
+      "vflip" : false
+    },
+    {
+      "cameraId" : "/dev/video13",
+      "function" : "left, park",
+      "x" : 20.0,
+      "y" : 60.0,
+      "z" : 88,
+      "yaw" : 90,
+      "pitch" : -10,
+      "roll" : 0,
+      "hfov" : 60,
+      "vfov" : 62,
+      "hflip" : false,
+      "vflip" : false
     }
   ]
 }
diff --git a/evs/apps/default/config.json.readme b/evs/apps/default/config.json.readme
index 561adcc..893eb86 100644
--- a/evs/apps/default/config.json.readme
+++ b/evs/apps/default/config.json.readme
@@ -38,8 +38,11 @@
       "z" : 48,                     // Optical center distance above ground
       "yaw" : 180,                  // Optical axis degrees to the left of straight ahead
       "pitch" : -30,                // Optical axis degrees above the horizon
+      "roll" : 0,                   // Rotation degrees around the optical axis
       "hfov" : 125,                 // Horizontal field of view in degrees
-      "vfov" :103                   // Vertical field of view in degrees
+      "vfov" :103,                  // Vertical field of view in degrees
+      "hflip" : true,               // Flip the view horizontally
+      "vflip" : true,               // Flip the view vertically
     }
   ]
 }
diff --git a/evs/apps/default/evs_app.cpp b/evs/apps/default/evs_app.cpp
index 92d4b7a..a3062fd 100644
--- a/evs/apps/default/evs_app.cpp
+++ b/evs/apps/default/evs_app.cpp
@@ -42,6 +42,9 @@
 
 namespace {
 
+const char* CONFIG_DEFAULT_PATH = "/system/etc/automotive/evs/config.json";
+const char* CONFIG_OVERRIDE_PATH = "/system/etc/automotive/evs/config_override.json";
+
 android::sp<IEvsEnumerator> pEvs;
 android::sp<IEvsDisplay> pDisplay;
 EvsStateControl *pStateController;
@@ -133,6 +136,7 @@
     int displayId = -1;
     bool useExternalMemory = false;
     android_pixel_format_t extMemoryFormat = HAL_PIXEL_FORMAT_RGBA_8888;
+    int32_t mockGearSignal = static_cast<int32_t>(VehicleGear::GEAR_REVERSE);
     for (int i=1; i< argc; i++) {
         if (strcmp(argv[i], "--test") == 0) {
             useVehicleHal = false;
@@ -159,6 +163,15 @@
                     ++i;
                 }
             }
+        } else if (strcmp(argv[i], "--gear") == 0) {
+            // Gear signal to simulate
+            i += 1; // increase an index to next argument
+            if (strcasecmp(argv[i], "Park") == 0) {
+                mockGearSignal = static_cast<int32_t>(VehicleGear::GEAR_PARK);
+            } else if (strcasecmp(argv[i], "Reverse") != 0) {
+                LOG(WARNING) << "Unknown gear signal, " << argv[i] << ", is ignored "
+                             << "and the reverse signal will be used instead";
+            }
         } else {
             printf("Ignoring unrecognized command line arg '%s'\n", argv[i]);
             printHelp = true;
@@ -166,7 +179,10 @@
     }
     if (printHelp) {
         printf("Options include:\n");
-        printf("  --test\n\tDo not talk to Vehicle Hal, but simulate 'reverse' instead\n");
+        printf("  --test\n\tDo not talk to Vehicle Hal, "
+               "but simulate a given mock gear signal instead\n");
+        printf("  --gear\n\tMock gear signal for the test mode.");
+        printf("  Available options are Reverse and Park (case insensitive)\n");
         printf("  --hw\n\tBypass EvsManager by connecting directly to EvsEnumeratorHw\n");
         printf("  --mock\n\tConnect directly to EvsEnumeratorHw-Mock\n");
         printf("  --display\n\tSpecify the display to use.  If this is not set, the first"
@@ -188,9 +204,11 @@
 
     // Load our configuration information
     ConfigManager config;
-    if (!config.initialize("/system/etc/automotive/evs/config.json")) {
-        LOG(ERROR) << "Missing or improper configuration for the EVS application.  Exiting.";
-        return EXIT_FAILURE;
+    if (!config.initialize(CONFIG_OVERRIDE_PATH)) {
+        if (!config.initialize(CONFIG_DEFAULT_PATH)) {
+            LOG(ERROR) << "Missing or improper configuration for the EVS application.  Exiting.";
+            return EXIT_FAILURE;
+        }
     }
 
     // Set thread pool size to one to avoid concurrent events from the HAL.
@@ -230,6 +248,9 @@
     config.useExternalMemory(useExternalMemory);
     config.setExternalMemoryFormat(extMemoryFormat);
 
+    // Set a mock gear signal for the test mode
+    config.setMockGearSignal(mockGearSignal);
+
     // Connect to the Vehicle HAL so we can monitor state
     sp<IVehicle> pVnet;
     if (useVehicleHal) {
diff --git a/evs/manager/1.1/Android.bp b/evs/manager/1.1/Android.bp
index 891d615..8fc47a4 100644
--- a/evs/manager/1.1/Android.bp
+++ b/evs/manager/1.1/Android.bp
@@ -14,6 +14,56 @@
 //
 //
 
+cc_library {
+    name: "android.automotive.evs.manager.fuzzlib",
+
+    srcs: [
+        "Enumerator.cpp",
+        "HalCamera.cpp",
+        "HalDisplay.cpp",
+        "VirtualCamera.cpp",
+        "stats/CameraUsageStats.cpp",
+        "stats/LooperWrapper.cpp",
+        "stats/StatsCollector.cpp",
+    ],
+
+    shared_libs: [
+        "android.hardware.automotive.evs@1.0",
+        "android.hardware.automotive.evs@1.1",
+        "libbase",
+        "libcamera_metadata",
+        "libcutils",
+        "libhardware",
+        "libhidlbase",
+        "libprocessgroup",
+        "libstatslog",
+        "libui",
+        "libutils",
+    ],
+
+    cflags: ["-DLOG_TAG=\"EvsManagerFuzzlibV1_1\""] + [
+        "-D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS",
+        "-Wall",
+        "-Werror",
+        "-Wunused",
+        "-Wunreachable-code",
+        "-Wthread-safety",
+    ],
+
+    export_include_dirs: [
+        "./",
+        "stats/",
+    ],
+
+    product_variables: {
+        debuggable: {
+            cflags: [
+                "-DEVS_DEBUG",
+            ]
+        }
+    },
+}
+
 
 //#################################
 cc_binary {
@@ -28,9 +78,6 @@
         "stats/CameraUsageStats.cpp",
         "stats/LooperWrapper.cpp",
         "stats/StatsCollector.cpp",
-        "sync/unique_fd.cpp",
-        "sync/unique_fence.cpp",
-        "sync/unique_timeline.cpp",
     ],
 
     shared_libs: [
@@ -43,7 +90,6 @@
         "libhidlbase",
         "libprocessgroup",
         "libstatslog",
-        "libsync",
         "libui",
         "libutils",
     ],
@@ -51,8 +97,6 @@
     init_rc: ["android.automotive.evs.manager@1.1.rc"],
 
     cflags: ["-DLOG_TAG=\"EvsManagerV1_1\""] + [
-        "-DGL_GLEXT_PROTOTYPES",
-        "-DEGL_EGLEXT_PROTOTYPES",
         "-D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS",
         "-Wall",
         "-Werror",
@@ -61,10 +105,6 @@
         "-Wthread-safety",
     ],
 
-    include_dirs: [
-        "system/core/libsync",
-    ],
-
     product_variables: {
         debuggable: {
             cflags: [
diff --git a/evs/manager/1.1/Enumerator.cpp b/evs/manager/1.1/Enumerator.cpp
index fdf3500..f733803 100644
--- a/evs/manager/1.1/Enumerator.cpp
+++ b/evs/manager/1.1/Enumerator.cpp
@@ -61,6 +61,12 @@
 using CameraDesc_1_0 = ::android::hardware::automotive::evs::V1_0::CameraDesc;
 using CameraDesc_1_1 = ::android::hardware::automotive::evs::V1_1::CameraDesc;
 
+Enumerator::~Enumerator() {
+    if (mClientsMonitor != nullptr) {
+        mClientsMonitor->stopCollection();
+    }
+}
+
 bool Enumerator::init(const char* hardwareServiceName) {
     LOG(DEBUG) << "init";
 
@@ -337,13 +343,6 @@
                     mHwEnumerator->closeCamera(device);
                     success = false;
                     break;
-                } else if (!hwCamera->isSyncSupported()) {
-                    LOG(INFO) << id << " does not support a sw_sync.";
-                    if (physicalCameras.size() > 1) {
-                        LOG(ERROR) << "sw_sync is required for logical camera devices.";
-                        success = false;
-                        break;
-                    }
                 }
             }
 
diff --git a/evs/manager/1.1/Enumerator.h b/evs/manager/1.1/Enumerator.h
index 7708295..3d3a253 100644
--- a/evs/manager/1.1/Enumerator.h
+++ b/evs/manager/1.1/Enumerator.h
@@ -78,6 +78,9 @@
     // Implementation details
     bool init(const char* hardwareServiceName);
 
+    // Destructor
+    virtual ~Enumerator();
+
 private:
     bool inline                     checkPermission();
     bool                            isLogicalCamera(const camera_metadata_t *metadata);
diff --git a/evs/manager/1.1/HalCamera.cpp b/evs/manager/1.1/HalCamera.cpp
index 38297bb..017a924 100644
--- a/evs/manager/1.1/HalCamera.cpp
+++ b/evs/manager/1.1/HalCamera.cpp
@@ -77,19 +77,6 @@
         return false;
     }
 
-    if (mSyncSupported) {
-        // Create a timeline
-        std::lock_guard<std::mutex> lock(mFrameMutex);
-        auto timeline = make_unique<UniqueTimeline>(0);
-        if (timeline != nullptr) {
-            mTimelines[(uint64_t)virtualCamera.get()] = std::move(timeline);
-        } else {
-            LOG(WARNING) << "Failed to create a timeline. "
-                         << "Client " << std::hex << virtualCamera.get()
-                         << " will use v1.0 frame delivery mechanism.";
-        }
-    }
-
     // Add this virtualCamera to our ownership list via weak pointer
     mClients.emplace_back(virtualCamera);
 
@@ -220,28 +207,24 @@
 }
 
 
-UniqueFence HalCamera::requestNewFrame(sp<VirtualCamera> client,
-                                       const int64_t lastTimestamp) {
-    if (!mSyncSupported) {
-        LOG(ERROR) << "This HalCamera does not support a fence-based "
-                   << "frame delivery.";
-        return {};
-    }
-
+void HalCamera::requestNewFrame(sp<VirtualCamera> client,
+                                const int64_t lastTimestamp) {
     FrameRequest req;
     req.client = client;
     req.timestamp = lastTimestamp;
 
-    const uint64_t id = (uint64_t)client.get();
-
     std::lock_guard<std::mutex> lock(mFrameMutex);
 
+    if (mTimelines.find(id) == mTimelines.end()) {
+        // Timeline for this client either does not exist or is deleted.
+        LOG(ERROR) << "Timeline for this client does not exist.";
+        return {};
+    }
+
     mTimelines[id]->BumpFenceEventCounter();
     UniqueFence fence = mTimelines[id]->CreateFence("FrameFence");
 
     mNextRequests->push_back(req);
-
-    return fence.Dup();
 }
 
 
@@ -269,15 +252,8 @@
             }
         }
 
-        const uint64_t clientId = reinterpret_cast<const uint64_t>(client);
         if (itReq != mNextRequests->end()) {
             mNextRequests->erase(itReq);
-
-            // Signal a pending fence and delete associated timeline.
-            if (mTimelines.find(clientId) != mTimelines.end()) {
-                mTimelines[clientId]->BumpTimelineEventCounter();
-                mTimelines.erase(clientId);
-            }
         }
 
         auto itCam = mClients.begin();
@@ -393,7 +369,8 @@
     //           but this must be derived from current framerate.
     constexpr int64_t kThreshold = 16 * 1e+3; // ms
     unsigned frameDeliveriesV1 = 0;
-    if (mSyncSupported) {
+    {
+        // Handle frame requests from v1.1 clients
         std::lock_guard<std::mutex> lock(mFrameMutex);
         std::swap(mCurrentRequests, mNextRequests);
         while (!mCurrentRequests->empty()) {
@@ -412,7 +389,6 @@
             } else if (vCam != nullptr && vCam->deliverFrame(buffer[0])) {
                 // Forward a frame and move a timeline.
                 LOG(DEBUG) << getId() << " forwarded the buffer #" << buffer[0].bufferId;
-                mTimelines[(uint64_t)vCam.get()]->BumpTimelineEventCounter();
                 ++frameDeliveriesV1;
             }
         }
@@ -426,7 +402,7 @@
     unsigned frameDeliveries = 0;
     for (auto&& client : mClients) {
         sp<VirtualCamera> vCam = client.promote();
-        if (vCam == nullptr || (mSyncSupported && vCam->getVersion() > 0)) {
+        if (vCam == nullptr || vCam->getVersion() > 0) {
             continue;
         }
 
@@ -624,10 +600,8 @@
         buffer += handle->toString(double_indent.c_str());
     }
 
-    StringAppendF(&buffer, "%sMaster client: %p\n"
-                           "%sSynchronization support: %s\n",
-                           indent, mMaster.promote().get(),
-                           indent, mSyncSupported ? "T":"F");
+    StringAppendF(&buffer, "%sMaster client: %p\n",
+                           indent, mMaster.promote().get());
 
     buffer += HalCamera::toString(mStreamConfig, indent);
 
diff --git a/evs/manager/1.1/HalCamera.h b/evs/manager/1.1/HalCamera.h
index efc5c25..2f707ff 100644
--- a/evs/manager/1.1/HalCamera.h
+++ b/evs/manager/1.1/HalCamera.h
@@ -18,9 +18,6 @@
 #define ANDROID_AUTOMOTIVE_EVS_V1_1_HALCAMERA_H
 
 #include "stats/CameraUsageStats.h"
-#include "sync/unique_fd.h"
-#include "sync/unique_fence.h"
-#include "sync/unique_timeline.h"
 
 #include <deque>
 #include <list>
@@ -68,7 +65,6 @@
         : mHwCamera(hwCamera),
           mId(deviceId),
           mStreamConfig(cfg),
-          mSyncSupported(UniqueTimeline::Supported()),
           mTimeCreatedMs(android::uptimeMillis()),
           mUsageStats(new CameraUsageStats(recordId)) {
         mCurrentRequests = &mFrameRequests[0];
@@ -90,7 +86,7 @@
     bool                changeFramesInFlight(int delta);
     bool                changeFramesInFlight(const hardware::hidl_vec<BufferDesc_1_1>& buffers,
                                              int* delta);
-    UniqueFence         requestNewFrame(sp<VirtualCamera> virtualCamera,
+    void                requestNewFrame(sp<VirtualCamera> virtualCamera,
                                         const int64_t timestamp);
 
     Return<EvsResult>   clientStreamStarting();
@@ -103,7 +99,6 @@
     Return<EvsResult>   setParameter(sp<VirtualCamera> virtualCamera,
                                      CameraParam id, int32_t& value);
     Return<EvsResult>   getParameter(CameraParam id, int32_t& value);
-    bool                isSyncSupported() const { return mSyncSupported; }
 
     // Returns a snapshot of collected usage statistics
     CameraUsageStatsRecord getStats() const;
@@ -154,9 +149,6 @@
     std::deque<FrameRequest>  mFrameRequests[2] GUARDED_BY(mFrameMutex);
     std::deque<FrameRequest>* mCurrentRequests  PT_GUARDED_BY(mFrameMutex);
     std::deque<FrameRequest>* mNextRequests     PT_GUARDED_BY(mFrameMutex);
-    std::unordered_map<uint64_t,
-                       std::unique_ptr<UniqueTimeline>> mTimelines GUARDED_BY(mFrameMutex);
-    bool                      mSyncSupported;
 
     // Time this object was created
     int64_t mTimeCreatedMs;
diff --git a/evs/manager/1.1/VirtualCamera.cpp b/evs/manager/1.1/VirtualCamera.cpp
index 6204a78..34530d8 100644
--- a/evs/manager/1.1/VirtualCamera.cpp
+++ b/evs/manager/1.1/VirtualCamera.cpp
@@ -152,9 +152,8 @@
             frame_1_0.bufferId  = bufDesc.bufferId;
 
             mStream->deliverFrame(frame_1_0);
-        } else if (!mCaptureThread.joinable()) {
-            // A capture thread does not run only it failed to create a
-            // timeline.
+        } else if (mCaptureThread.joinable()) {
+            // Keep forwarding frames as long as a capture thread is alive
             if (mFramesHeld.size() > 0 && mStream_1_1 != nullptr) {
                 // Pass this buffer through to our client
                 hardware::hidl_vec<BufferDesc_1_1> frames;
@@ -164,7 +163,12 @@
                     frames[0] = mFramesHeld[mHalCamera.begin()->first].back();
                 }
 
-                mStream_1_1->deliverFrame_1_1(frames);
+                // Notify a new frame receipt
+                {
+                    std::lock_guard<std::mutex> lock(mFrameDeliveryMutex);
+                    mSourceCameras.erase(bufDesc.deviceId);
+                }
+                mFramesReadySignal.notify_all();
             }
         }
 
@@ -180,10 +184,13 @@
                 // Warn if we got an unexpected stream termination
                 LOG(WARNING) << "Stream unexpectedly stopped, current status "
                              << mStreamState;
-            }
 
-            // Mark the stream as stopped.
-            mStreamState = STOPPED;
+                // Clean up the resource and forward an event to the client
+                stopVideoStream();
+
+                // This event is handled properly.
+                return true;
+            }
 
             if (mStream_1_1 == nullptr) {
                 // Send a null frame instead, for v1.0 client
@@ -339,18 +346,14 @@
 
     // Start a thread that waits on the fence and forwards collected frames
     // to the v1.1 client.
-    // If the system does not support a sw sync, EVS does not support a logical
-    // camera device and, therefore, VirtualCamera will subscribe only to a
-    // single hw camera.
     auto pHwCamera = mHalCamera.begin()->second.promote();
-    if (mStream_1_1 != nullptr && pHwCamera != nullptr && pHwCamera->isSyncSupported()) {
+    if (mStream_1_1 != nullptr && pHwCamera != nullptr) {
         mCaptureThread = std::thread([this]() {
             // TODO(b/145466570): With a proper camera hang handler, we may want
             // to reduce an amount of timeout.
-            constexpr int kFrameTimeoutMs = 5000; // timeout in ms.
+            constexpr auto kFrameTimeout = 5s; // timeout in seconds.
             int64_t lastFrameTimestamp = -1;
             while (mStreamState == RUNNING) {
-                UniqueFence fence;
                 unsigned count = 0;
                 for (auto&& [key, hwCamera] : mHalCamera) {
                     auto pHwCamera = hwCamera.promote();
@@ -359,21 +362,20 @@
                         continue;
                     }
 
-                    UniqueFence another = pHwCamera->requestNewFrame(this, lastFrameTimestamp);
-                    if (!another) {
-                        LOG(WARNING) << key << " returned an invalid fence.";
-                        continue;
+                    pHwCamera->requestNewFrame(this, lastFrameTimestamp);
+                    {
+                        std::lock_guard<std::mutex> lock(mFrameDeliveryMutex);
+                        mSourceCameras.emplace(pHwCamera->getId());
                     }
-
-                    fence = UniqueFence::Merge("MergedFrameFence",
-                                               fence,
-                                               another);
                     ++count;
                 }
 
-                if (fence.Wait(kFrameTimeoutMs) < 0) {
-                    // TODO(b/145466570): Replace this temporarily camera hang
-                    // handler.
+                std::unique_lock<std::mutex> lock(mFrameDeliveryMutex);
+                if (!mFramesReadySignal.wait_for(lock,
+                                                 kFrameTimeout,
+                                                 [this]() REQUIRES(mFrameDeliveryMutex) {
+                                                     return mSourceCameras.empty();
+                                                 })) {
                     PLOG(ERROR) << this << ": Camera hangs?";
                     break;
                 } else if (mStreamState == RUNNING) {
@@ -395,7 +397,11 @@
                             }
                             frames[i++] = frame;
                         }
-                        mStream_1_1->deliverFrame_1_1(frames);
+
+                        auto ret = mStream_1_1->deliverFrame_1_1(frames);
+                        if (!ret.isOk()) {
+                            LOG(WARNING) << "Failed to forward frames";
+                        }
                     }
                 }
             }
diff --git a/evs/manager/1.1/VirtualCamera.h b/evs/manager/1.1/VirtualCamera.h
index 76a8648..0dbd97d 100644
--- a/evs/manager/1.1/VirtualCamera.h
+++ b/evs/manager/1.1/VirtualCamera.h
@@ -22,10 +22,13 @@
 #include <android/hardware/automotive/evs/1.1/IEvsCameraStream.h>
 #include <android/hardware/automotive/evs/1.1/IEvsDisplay.h>
 
-#include <thread>
 #include <deque>
+#include <set>
+#include <thread>
 #include <unordered_map>
 
+#include <utils/Mutex.h>
+
 
 using namespace std;
 using namespace ::android::hardware::automotive::evs::V1_1;
@@ -132,6 +135,11 @@
          deque<BufferDesc_1_1>> mFramesHeld;
     thread                      mCaptureThread;
     CameraDesc*                 mDesc;
+
+    mutable std::mutex          mFrameDeliveryMutex;
+    std::condition_variable     mFramesReadySignal;
+    std::set<std::string>       mSourceCameras GUARDED_BY(mFrameDeliveryMutex);
+
 };
 
 } // namespace implementation
diff --git a/evs/manager/1.1/android.automotive.evs.manager@1.1.rc b/evs/manager/1.1/android.automotive.evs.manager@1.1.rc
index 41212e2..5223822 100644
--- a/evs/manager/1.1/android.automotive.evs.manager@1.1.rc
+++ b/evs/manager/1.1/android.automotive.evs.manager@1.1.rc
@@ -3,5 +3,4 @@
     priority -20
     user automotive_evs
     group automotive_evs system
-    onrestart restart evs_app
     disabled # will not automatically start with its class; must be explictly started.
diff --git a/evs/manager/1.1/stats/StatsCollector.cpp b/evs/manager/1.1/stats/StatsCollector.cpp
index b57f928..4733871 100644
--- a/evs/manager/1.1/stats/StatsCollector.cpp
+++ b/evs/manager/1.1/stats/StatsCollector.cpp
@@ -107,9 +107,15 @@
                                                    CollectionInfo* info) {
     AutoMutex lock(mMutex);
     if (mCurrentCollectionEvent != event) {
-        LOG(WARNING) << "Skipping " << toString(event) << " collection event "
-                     << "on collection event " << toString(mCurrentCollectionEvent);
-        return {};
+        if (mCurrentCollectionEvent != CollectionEvent::TERMINATED) {
+            LOG(WARNING) << "Skipping " << toString(event) << " collection event "
+                         << "on collection event " << toString(mCurrentCollectionEvent);
+
+            return {};
+        } else {
+            return Error() << "A collection has been terminated "
+                           << "while a current event was pending in the message queue.";
+        }
     }
 
     if (info->maxCacheSize < 1) {
diff --git a/evs/manager/1.1/sync/unique_fd.cpp b/evs/manager/1.1/sync/unique_fd.cpp
deleted file mode 100644
index eb5bb63..0000000
--- a/evs/manager/1.1/sync/unique_fd.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "unique_fd.h"
-
-#include <errno.h>
-#include <string.h>
-
-#include <android-base/logging.h>
-
-namespace android {
-namespace automotive {
-namespace evs {
-namespace V1_1 {
-namespace implementation {
-
-UniqueFd::UniqueFd() : fd_(-1) {}
-
-UniqueFd::UniqueFd(int fd) : fd_(fd) {
-}
-
-UniqueFd::~UniqueFd() {
-    InternalClose();
-}
-
-UniqueFd::UniqueFd(UniqueFd&& other) : fd_(other.fd_) {
-    other.fd_ = -1;
-}
-
-UniqueFd& UniqueFd::operator=(UniqueFd&& other) {
-    InternalClose();
-    fd_ = other.fd_;
-    other.fd_ = -1;
-    return *this;
-}
-
-void UniqueFd::Reset(int new_fd) {
-    InternalClose();
-    fd_ = new_fd;
-}
-
-UniqueFd UniqueFd::Dup() const {
-    return (fd_ >= 0) ? UniqueFd(InternalDup()) : UniqueFd(fd_);
-}
-
-UniqueFd::operator bool() const {
-    return fd_ >= 0;
-}
-
-int UniqueFd::Get() const {
-    return fd_;
-}
-
-int UniqueFd::GetUnowned() const {
-    return InternalDup();
-}
-
-int UniqueFd::Release() {
-    int ret = fd_;
-    fd_ = -1;
-    return ret;
-}
-
-void UniqueFd::InternalClose() {
-    if (fd_ >= 0) {
-        int err = close(fd_);
-        if (err < 0) {
-            PLOG(FATAL) << "Error closing UniqueFd";
-        }
-    }
-    fd_ = -1;
-}
-
-int UniqueFd::InternalDup() const {
-    int new_fd = fd_ >= 0 ? dup(fd_) : fd_;
-    if (new_fd < 0 && fd_ >= 0) {
-        PLOG(FATAL) << "Error duplicating UniqueFd";
-    }
-    return new_fd;
-}
-
-}  // namespace implementation
-}  // namespace V1_1
-}  // namespace evs
-}  // namespace automotive
-}  // namespace android
diff --git a/evs/manager/1.1/sync/unique_fd.h b/evs/manager/1.1/sync/unique_fd.h
deleted file mode 100644
index 204a5fc..0000000
--- a/evs/manager/1.1/sync/unique_fd.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-namespace android {
-namespace automotive {
-namespace evs {
-namespace V1_1 {
-namespace implementation {
-
-// This is a simple C++ wrapper around a POSIX file descriptor. It is meant to
-// enforce ownership just like unique_ptr<T>
-//
-// Instances of this type cannot be copied, but they can be moved.
-class UniqueFd {
-public:
-    UniqueFd();
-    explicit UniqueFd(int fd);
-    ~UniqueFd();
-    UniqueFd(UniqueFd&&);
-    UniqueFd& operator=(UniqueFd&&);
-
-    // Destroy the current descriptor, and take ownership of a new one.
-    void Reset(int new_fd = -1);
-
-    // Duplicate the current descriptor.
-    UniqueFd Dup() const;
-
-    // Returns true if the descriptor is valid. False otherwise.
-    explicit operator bool() const;
-
-    // Gets the descriptor
-    int Get() const;
-
-    // Gets a unowned duplicate of the descriptor. The caller is responsible for
-    // closing it.
-    int GetUnowned() const;
-
-    // Gets the descriptor and releases ownership. The caller is responsible for
-    // closing it.
-    int Release();
-
-private:
-    UniqueFd(const UniqueFd&) = delete;
-    UniqueFd& operator=(const UniqueFd&) = delete;
-
-    void InternalClose();
-    int InternalDup() const;
-
-    int fd_;
-};
-
-}  // namespace implementation
-}  // namespace V1_1
-}  // namespace evs
-}  // namespace automotive
-}  // namespace android
-
diff --git a/evs/manager/1.1/sync/unique_fence.cpp b/evs/manager/1.1/sync/unique_fence.cpp
deleted file mode 100644
index 7aaa9f4..0000000
--- a/evs/manager/1.1/sync/unique_fence.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "unique_fence.h"
-
-#include <errno.h>
-#include <cinttypes>
-#include <cstring>
-#include <memory>
-#include <string>
-
-#include <android-base/logging.h>
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wzero-length-array"
-#endif  // __clang__
-#include <sync/sync.h>
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif  // __clang__
-#include <utils/String8.h>
-
-
-constexpr int kWarningTimeout = 2000;
-
-namespace android {
-namespace automotive {
-namespace evs {
-namespace V1_1 {
-namespace implementation {
-
-namespace {
-
-const char* GetStatusString(int status) {
-    if (status == 0) {
-        return "active";
-    } else if (status == 1) {
-        return "signaled";
-    } else {
-        return "error";
-    }
-}
-
-}  // namespace
-
-UniqueFence::UniqueFence() {}
-
-UniqueFence::UniqueFence(int fd) : fd_(fd) {}
-
-UniqueFence::UniqueFence(UniqueFence&& other) = default;
-UniqueFence& UniqueFence::operator=(UniqueFence&& other) = default;
-
-void UniqueFence::Reset() {
-    fd_.Reset();
-}
-
-UniqueFence UniqueFence::Dup() const {
-    return UniqueFence(fd_.GetUnowned());
-}
-
-int UniqueFence::Get() const {
-    return fd_.Get();
-}
-
-int UniqueFence::GetUnowned() const {
-    return fd_.GetUnowned();
-}
-
-UniqueFence::operator bool() const {
-    return static_cast<bool>(fd_);
-}
-
-void UniqueFence::GetDebugStateDump(String8& result) const {
-    constexpr int INDENT = 8;
-    struct sync_file_info* finfo = sync_file_info(fd_.Get());
-    if (finfo == nullptr) {
-        result.append("no debug info available");
-        return;
-    }
-    result.appendFormat("name: %s status: %d (%s)", finfo->name, finfo->status,
-                        GetStatusString(finfo->status));
-
-    struct sync_fence_info* pinfo = sync_get_fence_info(finfo);
-    for (uint32_t i = 0; i < finfo->num_fences; i++) {
-        result.appendFormat("\n%*spt %u driver: %s obj: %s: status: %d(%s) timestamp: %llu", INDENT,
-                            "", i, pinfo[i].driver_name, pinfo[i].obj_name, pinfo[i].status,
-                            GetStatusString(pinfo[i].status), pinfo[i].timestamp_ns);
-    }
-    sync_file_info_free(finfo);
-}
-
-int UniqueFence::Wait(int wait_time_ms) {
-    if (wait_time_ms == -1) {
-        int err = sync_wait(fd_.Get(), kWarningTimeout);
-        if (err >= 0 || errno != ETIME) return err;
-
-        String8 dump;
-        GetDebugStateDump(dump);
-        LOG(WARNING) << "Waited on fence " << fd_.Get()
-                     << " for " << kWarningTimeout << " ms. " << dump.string();
-    }
-    return sync_wait(fd_.Get(), wait_time_ms);
-}
-
-UniqueFence UniqueFence::Merge(const char* name, const UniqueFence& fence1,
-                               const UniqueFence& fence2) {
-    UniqueFence merged_fence;
-    if (fence1.fd_ || fence2.fd_) {
-        if (fence1.fd_ && fence2.fd_) {
-            merged_fence.fd_.Reset(sync_merge(name, fence1.fd_.Get(), fence2.fd_.Get()));
-        } else if (fence1.fd_) {
-            // We merge the fence with itself so that we always generate a fence with
-            // a new name.
-            merged_fence.fd_.Reset(sync_merge(name, fence1.fd_.Get(), fence1.fd_.Get()));
-        } else if (fence2.fd_) {
-            // We merge the fence with itself so that we always generate a fence with
-            // a new name.
-            merged_fence.fd_.Reset(sync_merge(name, fence2.fd_.Get(), fence2.fd_.Get()));
-        }
-
-        if (!merged_fence.fd_) {
-            PLOG(ERROR) << "Failed to merge fences";
-        }
-    }
-    return merged_fence;
-}
-
-}  // namespace implementation
-}  // namespace V1_1
-}  // namespace evs
-}  // namespace automotive
-}  // namespace android
diff --git a/evs/manager/1.1/sync/unique_fence.h b/evs/manager/1.1/sync/unique_fence.h
deleted file mode 100644
index 7dd9f91..0000000
--- a/evs/manager/1.1/sync/unique_fence.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <utils/String8.h>
-
-#include "unique_fd.h"
-
-namespace android {
-namespace automotive {
-namespace evs {
-namespace V1_1 {
-namespace implementation {
-
-// This is a simple C++ wrapper around the sw_sync interface. It is used to
-// create and maintain sync fences created from a timeline.
-class UniqueFence {
-public:
-    UniqueFence();
-    explicit UniqueFence(int fd);
-
-    UniqueFence(UniqueFence&&);
-    UniqueFence& operator=(UniqueFence&&);
-
-    // Destroy the current fence.
-    void Reset();
-
-    // Duplicate the fence.
-    UniqueFence Dup() const;
-
-    // Gets the descriptor
-    int Get() const;
-
-    // Gets an unowned duplicate of the fence descriptor.
-    int GetUnowned() const;
-
-    // Returns true if the fence is set to a valid descriptor. False otherwise.
-    explicit operator bool() const;
-
-    // Waits on the fence for the indicated amount of time in milliseconds. The
-    // default value of -1 means to wait forever.
-    int Wait(int wait_time_ms = -1);
-
-    // Gets a string containing debug information for the fence.
-    void GetDebugStateDump(String8& result) const;
-
-    // Creates a new fence that signals when both input fences are signaled. Note
-    // that it is possible to merge multiple fences this way.
-    static UniqueFence Merge(const char* name, const UniqueFence& fence1,
-                             const UniqueFence& fence2);
-
-private:
-    // The fence file descriptor
-    UniqueFd fd_;
-};
-
-}  // namespace implementation
-}  // namespace V1_1
-}  // namespace evs
-}  // namespace automotive
-}  // namespace android
-
diff --git a/evs/manager/1.1/sync/unique_timeline.cpp b/evs/manager/1.1/sync/unique_timeline.cpp
deleted file mode 100644
index b9556b8..0000000
--- a/evs/manager/1.1/sync/unique_timeline.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "unique_timeline.h"
-
-#include <errno.h>
-#include <limits>
-#include <string.h>
-#include <sw_sync.h>
-
-#include <android-base/logging.h>
-
-namespace android {
-namespace automotive {
-namespace evs {
-namespace V1_1 {
-namespace implementation {
-
-UniqueTimeline::UniqueTimeline(unsigned offset)
-      : fd_(sw_sync_timeline_create()), fence_counter_(offset) {
-    if (!fd_) {
-        LOG(FATAL) << "Failed to create a timeline.";
-    }
-}
-
-UniqueTimeline::~UniqueTimeline() {
-    // Force any fences waiting on the timeline to be released by incrementing
-    // by the difference between the two counters. The sw_sync driver has
-    // changed behavior several times, and no longer releases fences when the
-    // timeline fd is closed. While at one point adding MAX_UINT worked (by
-    // adding MAX_INT with two separate calls), even that stopped working.
-    // (See b/35115489 for background)
-    BumpTimelineEventCounter(fence_counter_ - timeline_counter_);
-}
-
-bool UniqueTimeline::Supported() {
-    UniqueFd fd{sw_sync_timeline_create()};
-    return !!fd;
-}
-
-UniqueFence UniqueTimeline::CreateFence(const char* name) {
-    UniqueFence fence(sw_sync_fence_create(fd_.Get(), name, fence_counter_));
-    if (!fence) {
-        PLOG(FATAL) << "Cannot create fence";
-    }
-    return fence;
-}
-
-void UniqueTimeline::BumpTimelineEventCounter() {
-    BumpTimelineEventCounter(1);
-}
-
-void UniqueTimeline::BumpTimelineEventCounter(unsigned count) {
-    timeline_counter_ += count;
-    int err = sw_sync_timeline_inc(fd_.Get(), count);
-    if (err < 0) {
-        PLOG(FATAL) << "Cannot bump timeline counter";
-    }
-}
-
-}  // namespace implementation
-}  // namespace V1_1
-}  // namespace evs
-}  // namespace automotive
-}  // namespace android
diff --git a/evs/manager/1.1/sync/unique_timeline.h b/evs/manager/1.1/sync/unique_timeline.h
deleted file mode 100644
index 17c2703..0000000
--- a/evs/manager/1.1/sync/unique_timeline.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "unique_fd.h"
-#include "unique_fence.h"
-
-namespace android {
-namespace automotive {
-namespace evs {
-namespace V1_1 {
-namespace implementation {
-
-// This is a simple C++ wrapper around the sw_sync interface. It is used to
-// create sync fences using timeline semantics.
-//
-// The timeline has two counters, a fence event counter maintained here in this
-// class, and the timeline counter hidden in the driver. The one in the driver
-// is initialized to zero when creating the timeline, and the one here is
-// initialized to one. The counters are meant to be independently incremented.
-//
-// When the driver counter is incremented, all fences that were created with
-// counts after the previous value of the timeline counter, and before (and
-// including) the new value are signaled by the driver.
-//
-// All fences are signaled if the timeline is also destroyed.
-//
-// The typical uses of these fences is to acquire a fence for some future point
-// on the timeline, and incrementing the local fence event counter to
-// distinguish between separate events. Then later when the event actually
-// occurs you increment the drivers count.
-//
-// Since the fences are file descriptors, they can be easily sent to another
-// process, which can wait for them to signal without needing to define some
-// other IPC mechanism to communicate the event. If the fence is sent well in
-// advance, there should be minimal latency too.
-//
-// Instances of this class cannot be copied, but can be moved.
-class UniqueTimeline {
-public:
-    // Initializes the timeline, using the given initial_fence_couter value.
-    explicit UniqueTimeline(unsigned initial_fence_counter);
-
-    ~UniqueTimeline();
-
-    // Returns true if it is possible to create timelines.
-    static bool Supported();
-
-    // Creates a fence fd using the current value of the fence counter.
-    // A negative value is returned on error.
-    UniqueFence CreateFence(const char* name);
-
-    // Increments the counter used when creating fences
-    void BumpFenceEventCounter() { fence_counter_ += 1; }
-
-    // Increments the drivers version of the counter, signaling any fences in the
-    // range.
-    void BumpTimelineEventCounter();
-
-private:
-    void BumpTimelineEventCounter(unsigned);
-
-    // The timeline file descriptor.
-    UniqueFd fd_{-1};
-
-    // The counter used when creating fences on the timeline.
-    unsigned fence_counter_{0};
-
-    // The effective count for the timeline. The kernel driver has the actual
-    // value, we just track what it should be. If it ever becomes out of sync,
-    // it could be a problem for releasing fences on destruction.
-    unsigned timeline_counter_{0};
-};
-
-}  // namespace implementation
-}  // namespace V1_1
-}  // namespace evs
-}  // namespace automotive
-}  // namespace android
-
diff --git a/evs/manager/1.1/test/fuzzer/Android.bp b/evs/manager/1.1/test/fuzzer/Android.bp
new file mode 100644
index 0000000..b2ca44c
--- /dev/null
+++ b/evs/manager/1.1/test/fuzzer/Android.bp
@@ -0,0 +1,77 @@
+// Copyright 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.
+
+cc_defaults {
+    name: "evs_fuzz_default",
+    static_libs: [
+        "libgmock",
+        "libgtest",
+    ],
+
+    shared_libs: [
+        "android.automotive.evs.manager.fuzzlib",
+        "android.hardware.automotive.evs@1.0",
+        "android.hardware.automotive.evs@1.1",
+        "libbase",
+        "libcamera_metadata",
+        "libcutils",
+        "libhardware",
+        "libhidlbase",
+        "libprocessgroup",
+        "libstatslog",
+        "libsync",
+        "libui",
+        "libutils",
+    ],
+
+    cflags: [
+        "-Wno-unused-parameter",
+    ],
+
+    include_dirs: [
+        "system/core/libsync",
+    ],
+}
+
+cc_fuzz {
+    name: "evs_halcamera_fuzzer",
+    srcs: [
+        "HalCameraFuzzer.cpp",
+    ],
+    defaults: ["evs_fuzz_default"],
+}
+
+cc_fuzz {
+    name: "evs_virtual_camera_fuzzer",
+    srcs: [
+        "VirtualCameraFuzzer.cpp",
+    ],
+    defaults: ["evs_fuzz_default"],
+}
+
+cc_fuzz {
+    name: "evs_haldisplay_fuzzer",
+    srcs: [
+        "HalDisplayFuzzer.cpp",
+    ],
+    defaults: ["evs_fuzz_default"],
+}
+
+cc_fuzz {
+    name: "evs_enumerator_fuzzer",
+    srcs: [
+        "EnumeratorFuzzer.cpp",
+    ],
+    defaults: ["evs_fuzz_default"],
+}
\ No newline at end of file
diff --git a/evs/manager/1.1/test/fuzzer/Common.h b/evs/manager/1.1/test/fuzzer/Common.h
new file mode 100644
index 0000000..5a619f6
--- /dev/null
+++ b/evs/manager/1.1/test/fuzzer/Common.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright 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.
+ */
+
+#ifndef EVS_MANAGER_1_1_TEST_FUZZER_COMMON_H_
+#define EVS_MANAGER_1_1_TEST_FUZZER_COMMON_H_
+
+namespace android {
+namespace automotive {
+namespace evs {
+namespace V1_1 {
+namespace implementation {
+
+#define EVS_FUZZ_BASE_ENUM                                               \
+    EVS_FUZZ_NOTIFY,                      /*verify notify*/              \
+            EVS_FUZZ_GET_HW_CAMERA,       /*verify getHalCameras*/       \
+            EVS_FUZZ_DELIVER_FRAME,       /* verify deliverFrame */      \
+            EVS_FUZZ_DONE_WITH_FRAME_1_0, /* verify doneWithFrame */     \
+            EVS_FUZZ_DONE_WITH_FRAME_1_1, /* verify doneWithFrame_1_1 */ \
+            EVS_FUZZ_SET_PRIMARY,         /* verify setPrimary */        \
+            EVS_FUZZ_FORCE_PRIMARY,       /* verify forcePrimary */      \
+            EVS_FUZZ_UNSET_PRIMARY,       /* verify unsetPrimary */      \
+            EVS_FUZZ_SET_PARAMETER,       /* verify setIntParameter */   \
+            EVS_FUZZ_GET_PARAMETER,       /* verify getIntParameter */   \
+            EVS_FUZZ_API_SUM
+
+const char* kMockHWEnumeratorName = "hw/fuzzEVSMock";
+const uint64_t startMockHWCameraId = 1024;
+const uint64_t endMockHWCameraId = 1028;
+const uint64_t startMockHWDisplayId = 256;
+const uint64_t endMockHWDisplayId = 258;
+
+}  // namespace implementation
+}  // namespace V1_1
+}  // namespace evs
+}  // namespace automotive
+}  // namespace android
+
+#endif  // EVS_MANAGER_1_1_TEST_FUZZER_COMMON_H_
diff --git a/evs/manager/1.1/test/fuzzer/EnumeratorFuzzer.cpp b/evs/manager/1.1/test/fuzzer/EnumeratorFuzzer.cpp
new file mode 100644
index 0000000..2d450cc
--- /dev/null
+++ b/evs/manager/1.1/test/fuzzer/EnumeratorFuzzer.cpp
@@ -0,0 +1,203 @@
+/*
+ * Copyright 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.
+ */
+
+#include <fuzzer/FuzzedDataProvider.h>
+#include <hidl/HidlTransportSupport.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <iostream>
+#include "Common.h"
+#include "Enumerator.h"
+#include "HalDisplay.h"
+#include "MockHWEnumerator.h"
+
+using android::hardware::configureRpcThreadpool;
+using android::hardware::joinRpcThreadpool;
+
+namespace android {
+namespace automotive {
+namespace evs {
+namespace V1_1 {
+namespace implementation {
+
+namespace {
+
+enum EvsFuzzFuncs {
+    EVS_FUZZ_GET_CAMERA_LIST,             // verify getCameraList
+    EVS_FUZZ_OPEN_CAMERA,                 // verify openCamera
+    EVS_FUZZ_CLOSE_CAMERA,                // verify closeCamera
+    EVS_FUZZ_OPEN_DISPLAY,                // verify openDisplay
+    EVS_FUZZ_CLOSE_DISPLAY,               // verify closeDisplay
+    EVS_FUZZ_GET_DISPLAY_STATE,           // verify getDisplayState
+    EVS_FUZZ_GET_CAMERA_LIST_1_1,         // verify getCameraList_1_1
+    EVS_FUZZ_OPEN_CAMERA_1_1,             // verify openCamera_1_1
+    EVS_FUZZ_IS_HARDWARE,                 // verify isHardware
+    EVS_FUZZ_GET_DISPLAY_LIST,            // verify getDisplayIdList
+    EVS_FUZZ_OPEN_DISPLAY_1_1,            // verify openDisplay_1_1
+    EVS_FUZZ_GET_ULTRASONICS_ARRAY_LIST,  // verify getUltrasonicsArrayList
+    EVS_FUZZ_OPEN_ULTRASONICS_ARRAY,      // verify openUltrasonicsArray
+    EVS_FUZZ_CLOSE_ULTRASONICS_ARRAY,     // verify closeUltrasonicsArray
+    EVS_FUZZ_API_SUM
+};
+
+const int kMaxFuzzerConsumedBytes = 12;
+
+
+static sp<IEvsEnumerator_1_1> sMockHWEnumerator;
+static sp<Enumerator> sEnumerator;
+
+bool DoInitialization() {
+    setenv("TREBLE_TESTING_OVERRIDE", "true", true);
+    configureRpcThreadpool(2, false /* callerWillNotJoin */);
+
+    // Prepare for the HWEnumerator service
+    sMockHWEnumerator = new MockHWEnumerator();
+    status_t status = sMockHWEnumerator->registerAsService(kMockHWEnumeratorName);
+    if (status != OK) {
+        std::cerr << "Could not register service " << kMockHWEnumeratorName
+                  << " status = " << status
+                  << " - quitting from LLVMFuzzerInitialize" << std::endl;
+        exit(2);
+    }
+
+    return true;
+}
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+    FuzzedDataProvider fdp(data, size);
+
+    vector<sp<IEvsCamera_1_0>> vVirtualCameras;
+    vector<sp<IEvsDisplay_1_0>> vDisplays;
+
+    // Inititialize the enumerator that we are going to test
+    static bool initialized = DoInitialization();
+    sEnumerator = new Enumerator();
+    if (!initialized || !sEnumerator->init(kMockHWEnumeratorName)) {
+        std::cerr << "Failed to connect to hardware service"
+                  << "- quitting from LLVMFuzzerInitialize" << std::endl;
+        exit(1);
+    }
+
+    while (fdp.remaining_bytes() > kMaxFuzzerConsumedBytes) {
+        switch (fdp.ConsumeIntegralInRange<uint32_t>(0, EVS_FUZZ_API_SUM - 1)) {
+            case EVS_FUZZ_GET_CAMERA_LIST: {
+                sEnumerator->getCameraList([](auto list) {});
+                break;
+            }
+            case EVS_FUZZ_OPEN_CAMERA: {
+                uint64_t whichCam =
+                            fdp.ConsumeIntegralInRange<uint64_t>(startMockHWCameraId,
+                                                                 endMockHWCameraId-1);
+                hidl_string camStr = std::to_string(whichCam);
+                sp<IEvsCamera_1_0> virtualCam = sEnumerator->openCamera(camStr);
+                if (virtualCam != nullptr) {
+                    vVirtualCameras.emplace_back(virtualCam);
+                }
+                break;
+            }
+            case EVS_FUZZ_CLOSE_CAMERA: {
+                if (!vVirtualCameras.empty()) {
+                    sp<IEvsCamera_1_0> cam = vVirtualCameras.back();
+                    sEnumerator->closeCamera(cam);
+                    vVirtualCameras.pop_back();
+                }
+                break;
+            }
+            case EVS_FUZZ_OPEN_DISPLAY: {
+                sp<IEvsDisplay_1_0> display = sEnumerator->openDisplay();
+                if (display != nullptr) {
+                    vDisplays.emplace_back(display);
+                }
+                break;
+            }
+            case EVS_FUZZ_CLOSE_DISPLAY: {
+                if (!vDisplays.empty()) {
+                    sp<IEvsDisplay_1_0> display = vDisplays.back();
+                    sEnumerator->closeDisplay(display);
+                    vDisplays.pop_back();
+                }
+                break;
+            }
+            case EVS_FUZZ_GET_DISPLAY_STATE: {
+                sEnumerator->getDisplayState();
+                break;
+            }
+            case EVS_FUZZ_GET_CAMERA_LIST_1_1: {
+                sEnumerator->getCameraList_1_1([](auto cams) {});
+                break;
+            }
+            case EVS_FUZZ_OPEN_CAMERA_1_1: {
+                uint64_t whichCam =
+                            fdp.ConsumeIntegralInRange<uint64_t>(startMockHWCameraId,
+                                                                 endMockHWCameraId-1);
+                hidl_string camStr = std::to_string(whichCam);
+                Stream streamCfg = {};
+                sp<IEvsCamera_1_1> virtualCam = sEnumerator->openCamera_1_1(camStr, streamCfg);
+                if (virtualCam != nullptr) {
+                    vVirtualCameras.emplace_back(virtualCam);
+                }
+                break;
+            }
+            case EVS_FUZZ_IS_HARDWARE: {
+                sEnumerator->isHardware();
+                break;
+            }
+            case EVS_FUZZ_GET_DISPLAY_LIST: {
+                sEnumerator->getDisplayIdList([](auto list) {});
+                break;
+            }
+            case EVS_FUZZ_OPEN_DISPLAY_1_1: {
+                uint64_t whichDisp =
+                            fdp.ConsumeIntegralInRange<uint64_t>(startMockHWDisplayId,
+                                                                 endMockHWDisplayId-1);
+                // port is the same as display in this test
+                sp<IEvsDisplay_1_1> display = sEnumerator->openDisplay_1_1(
+                                                static_cast<uint8_t>(whichDisp));
+                if (display != nullptr) {
+                    vDisplays.emplace_back(display);
+                }
+                break;
+            }
+            case EVS_FUZZ_GET_ULTRASONICS_ARRAY_LIST: {
+                sEnumerator->getUltrasonicsArrayList([](auto list) {});
+                break;
+            }
+            case EVS_FUZZ_OPEN_ULTRASONICS_ARRAY: {
+                // TODO(b/162465548) replace this once implementation is ready
+                sEnumerator->openUltrasonicsArray("");
+                break;
+            }
+            case EVS_FUZZ_CLOSE_ULTRASONICS_ARRAY: {
+                // TODO(b/162465548) replace this once implementation is ready
+                sEnumerator->closeUltrasonicsArray(nullptr);
+                break;
+            }
+            default:
+                LOG(ERROR) << "Unexpected option, aborting...";
+                break;
+        }
+    }
+    // Explicitly destroy the Enumerator
+    sEnumerator = nullptr;
+    return 0;
+}
+
+}  // namespace
+}  // namespace implementation
+}  // namespace V1_1
+}  // namespace evs
+}  // namespace automotive
+}  // namespace android
diff --git a/evs/manager/1.1/test/fuzzer/HalCameraFuzzer.cpp b/evs/manager/1.1/test/fuzzer/HalCameraFuzzer.cpp
new file mode 100644
index 0000000..a414593
--- /dev/null
+++ b/evs/manager/1.1/test/fuzzer/HalCameraFuzzer.cpp
@@ -0,0 +1,250 @@
+/*
+ * Copyright 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.
+ */
+
+#include <fuzzer/FuzzedDataProvider.h>
+#include <sys/time.h>
+#include <iostream>
+#include "Common.h"
+#include "Enumerator.h"
+#include "HalCamera.h"
+#include "MockHWCamera.h"
+
+namespace android {
+namespace automotive {
+namespace evs {
+namespace V1_1 {
+namespace implementation {
+
+namespace {
+
+enum EvsFuzzFuncs {
+    EVS_FUZZ_MAKE_VIRTUAL_CAMERA = 0,    // verify makeVirtualCamera
+    EVS_FUZZ_OWN_VIRTUAL_CAMERA,         // verify ownVirtualCamera
+    EVS_FUZZ_DISOWN_VIRTUAL_CAMERA,      // verify disownVirtualCamera
+    EVS_FUZZ_GET_CLIENT_COUNT,           // verify getClientCount
+    EVS_FUZZ_GET_ID,                     // verify getId
+    EVS_FUZZ_GET_STREAM_CONFIG,          // verify getStreamConfig
+    EVS_FUZZ_CHANGE_FRAMES_IN_FLIGHT,    // verify changeFramesInFlight
+    EVS_FUZZ_CHANGE_FRAMES_IN_FLIGHT_1,  // verify overloaded changeFramesInFlight
+    EVS_FUZZ_REQUEST_NEW_FRAME,          // verify requestNewFrame
+    EVS_FUZZ_CLIENT_STREAM_STARTING,     // verify clientStreamStarting
+    EVS_FUZZ_CLIENT_STREAM_ENDING,       // verify clientStreamEnding
+    EVS_FUZZ_GET_STATS,                  // verify getStats
+    EVS_FUZZ_GET_STREAM_CONFIGURATION,   // verify getStreamConfiguration
+    EVS_FUZZ_DELIVER_FRAME_1_1,          // verify deliverFrame_1_1
+    EVS_FUZZ_BASE_ENUM                   // verify common functions
+};
+
+int64_t getCurrentTimeStamp() {
+    struct timeval tp;
+    gettimeofday(&tp, NULL);
+    int64_t ms = tp.tv_sec * 1000 + tp.tv_usec / 1000;
+    return ms;
+}
+
+const int kMaxFuzzerConsumedBytes = 12;
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+    FuzzedDataProvider fdp(data, size);
+    sp<IEvsCamera_1_1> mockHWCamera = new MockHWCamera();
+    sp<HalCamera> halCamera = new HalCamera(mockHWCamera);
+    std::vector<sp<VirtualCamera>> virtualCameras;
+    std::vector<BufferDesc_1_0> vBufferDesc_1_0;
+    std::vector<BufferDesc_1_1> vBufferDesc_1_1;
+
+    while (fdp.remaining_bytes() > kMaxFuzzerConsumedBytes) {
+        switch (fdp.ConsumeIntegralInRange<uint32_t>(0, EVS_FUZZ_API_SUM - 1)) {
+            case EVS_FUZZ_MAKE_VIRTUAL_CAMERA: {
+                sp<VirtualCamera> virtualCamera = halCamera->makeVirtualCamera();
+                virtualCameras.emplace_back(virtualCamera);
+                break;
+            }
+            case EVS_FUZZ_OWN_VIRTUAL_CAMERA: {
+                if (!virtualCameras.empty()) {
+                    uint32_t whichCam =
+                            fdp.ConsumeIntegralInRange<uint32_t>(0, virtualCameras.size() - 1);
+                    halCamera->ownVirtualCamera(virtualCameras[whichCam]);
+                }
+                break;
+            }
+            case EVS_FUZZ_DISOWN_VIRTUAL_CAMERA: {
+                if (!virtualCameras.empty()) {
+                    uint32_t whichCam =
+                            fdp.ConsumeIntegralInRange<uint32_t>(0, virtualCameras.size() - 1);
+                    halCamera->disownVirtualCamera(virtualCameras[whichCam]);
+                }
+                break;
+            }
+            case EVS_FUZZ_GET_HW_CAMERA: {
+                halCamera->getHwCamera();
+                break;
+            }
+            case EVS_FUZZ_GET_CLIENT_COUNT: {
+                halCamera->getClientCount();
+                break;
+            }
+            case EVS_FUZZ_GET_ID: {
+                halCamera->getId();
+                break;
+            }
+            case EVS_FUZZ_GET_STREAM_CONFIG: {
+                halCamera->getStreamConfig();
+                break;
+            }
+            case EVS_FUZZ_CHANGE_FRAMES_IN_FLIGHT: {
+                uint32_t delta = fdp.ConsumeIntegral<int32_t>();
+                halCamera->changeFramesInFlight(delta);
+                break;
+            }
+            case EVS_FUZZ_CHANGE_FRAMES_IN_FLIGHT_1: {
+                hidl_vec<BufferDesc_1_1> buffers;
+                int32_t delta = 0;
+                halCamera->changeFramesInFlight(buffers, &delta);
+                break;
+            }
+            case EVS_FUZZ_REQUEST_NEW_FRAME: {
+                if (!virtualCameras.empty()) {
+                    uint32_t whichCam =
+                            fdp.ConsumeIntegralInRange<uint32_t>(0, virtualCameras.size() - 1);
+                    halCamera->requestNewFrame(virtualCameras[whichCam], getCurrentTimeStamp());
+                }
+                break;
+            }
+            case EVS_FUZZ_CLIENT_STREAM_STARTING: {
+                halCamera->clientStreamStarting();
+                break;
+            }
+            case EVS_FUZZ_CLIENT_STREAM_ENDING: {
+                if (!virtualCameras.empty()) {
+                    uint32_t whichCam =
+                            fdp.ConsumeIntegralInRange<uint32_t>(0, virtualCameras.size() - 1);
+                    halCamera->clientStreamEnding(virtualCameras[whichCam].get());
+                }
+                break;
+            }
+            case EVS_FUZZ_DONE_WITH_FRAME_1_0: {
+                if (!vBufferDesc_1_0.empty()) {
+                    uint32_t whichBuffer =
+                            fdp.ConsumeIntegralInRange<uint32_t>(0, vBufferDesc_1_0.size() - 1);
+                    halCamera->doneWithFrame(vBufferDesc_1_0[whichBuffer]);
+                }
+                break;
+            }
+            case EVS_FUZZ_DONE_WITH_FRAME_1_1: {
+                if (!vBufferDesc_1_1.empty()) {
+                    uint32_t whichBuffer =
+                            fdp.ConsumeIntegralInRange<uint32_t>(0, vBufferDesc_1_1.size() - 1);
+                    halCamera->doneWithFrame(vBufferDesc_1_1[whichBuffer]);
+                }
+                break;
+            }
+            case EVS_FUZZ_SET_PRIMARY: {
+                if (!virtualCameras.empty()) {
+                    uint32_t whichCam =
+                            fdp.ConsumeIntegralInRange<uint32_t>(0, virtualCameras.size() - 1);
+                    halCamera->setMaster(virtualCameras[whichCam]);
+                }
+                break;
+            }
+            case EVS_FUZZ_FORCE_PRIMARY: {
+                if (!virtualCameras.empty()) {
+                    uint32_t whichCam =
+                            fdp.ConsumeIntegralInRange<uint32_t>(0, virtualCameras.size() - 1);
+                    halCamera->forceMaster(virtualCameras[whichCam]);
+                }
+                break;
+            }
+            case EVS_FUZZ_UNSET_PRIMARY: {
+                if (!virtualCameras.empty()) {
+                    uint32_t whichCam =
+                            fdp.ConsumeIntegralInRange<uint32_t>(0, virtualCameras.size() - 1);
+                    halCamera->unsetMaster(virtualCameras[whichCam]);
+                }
+                break;
+            }
+            case EVS_FUZZ_SET_PARAMETER: {
+                if (!virtualCameras.empty()) {
+                    uint32_t whichCam =
+                            fdp.ConsumeIntegralInRange<uint32_t>(0, virtualCameras.size() - 1);
+                    uint32_t whichParam = fdp.ConsumeIntegralInRange<
+                            uint32_t>(0, static_cast<uint32_t>(CameraParam::ABSOLUTE_ZOOM));
+                    int32_t value = fdp.ConsumeIntegral<int32_t>();
+                    halCamera->setParameter(virtualCameras[whichCam],
+                                            static_cast<CameraParam>(whichParam), value);
+                }
+                break;
+            }
+            case EVS_FUZZ_GET_PARAMETER: {
+                uint32_t whichParam =
+                        fdp.ConsumeIntegralInRange<uint32_t>(0,
+                                                             static_cast<uint32_t>(
+                                                                     CameraParam::ABSOLUTE_ZOOM));
+                int32_t value = fdp.ConsumeIntegral<int32_t>();
+                halCamera->getParameter(static_cast<CameraParam>(whichParam), value);
+                break;
+            }
+            case EVS_FUZZ_GET_STATS: {
+                halCamera->getStats();
+                break;
+            }
+            case EVS_FUZZ_GET_STREAM_CONFIGURATION: {
+                halCamera->getStreamConfiguration();
+                break;
+            }
+            case EVS_FUZZ_DELIVER_FRAME: {
+                BufferDesc_1_0 buffer;
+                buffer.bufferId = fdp.ConsumeIntegral<int32_t>();
+                halCamera->deliverFrame(buffer);
+                vBufferDesc_1_0.emplace_back(buffer);
+                break;
+            }
+            case EVS_FUZZ_DELIVER_FRAME_1_1: {
+                std::vector<BufferDesc_1_1> vec;
+                BufferDesc_1_1 buffer;
+                buffer.bufferId = fdp.ConsumeIntegral<int32_t>();
+                vec.push_back(buffer);
+                hardware::hidl_vec<BufferDesc_1_1> hidl_vec(vec);
+                halCamera->deliverFrame_1_1(hidl_vec);
+                vBufferDesc_1_1.emplace_back(buffer);
+                break;
+            }
+            case EVS_FUZZ_NOTIFY: {
+                EvsEventDesc event;
+                uint32_t type =
+                        fdp.ConsumeIntegralInRange<uint32_t>(0,
+                                                             static_cast<uint32_t>(
+                                                                     EvsEventType::STREAM_ERROR));
+                event.aType = static_cast<EvsEventType>(type);
+                // TODO(b/160824438) let's comment this for now because of the failure.
+                // If virtualCamera does not call startVideoStream, and notify(1) is called
+                // it will fail.
+                // halCamera->notify(event);
+                break;
+            }
+            default:
+                LOG(ERROR) << "Unexpected option, aborting...";
+                break;
+        }
+    }
+    return 0;
+}
+
+}  // namespace
+}  // namespace implementation
+}  // namespace V1_1
+}  // namespace evs
+}  // namespace automotive
+}  // namespace android
diff --git a/evs/manager/1.1/test/fuzzer/HalDisplayFuzzer.cpp b/evs/manager/1.1/test/fuzzer/HalDisplayFuzzer.cpp
new file mode 100644
index 0000000..3e88d0d
--- /dev/null
+++ b/evs/manager/1.1/test/fuzzer/HalDisplayFuzzer.cpp
@@ -0,0 +1,109 @@
+/*
+ * Copyright 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.
+ */
+
+#include <fuzzer/FuzzedDataProvider.h>
+#include <sys/time.h>
+#include <iostream>
+#include "Common.h"
+#include "Enumerator.h"
+#include "HalDisplay.h"
+#include "MockHWDisplay.h"
+
+using DisplayDesc = ::android::hardware::automotive::evs::V1_0::DisplayDesc;
+
+namespace android {
+namespace automotive {
+namespace evs {
+namespace V1_1 {
+namespace implementation {
+
+namespace {
+
+enum EvsFuzzFuncs {
+    EVS_FUZZ_GET_HW_DISPLAY = 0,       // verify getHwDisplay
+    EVS_FUZZ_GET_DISPLAY_INFO,         // verify getDisplayInfo
+    EVS_FUZZ_SET_DISPLAY_STATE,        // verify setDisplayState
+    EVS_FUZZ_GET_DISPLAY_STATE,        // verify getDisplayState
+    EVS_FUZZ_GET_TARGET_BUFFER,        // verify getTargetBuffer
+    EVS_FUZZ_RTN_TGT_BUF_FOR_DISPLAY,  // verify returnTargetBufferForDisplay
+    EVS_FUZZ_GET_DISPLAY_INFO_1_1,     // verify getDisplayInfo_1_1
+    EVS_FUZZ_TO_STRING,                // verify toString
+    EVS_FUZZ_API_SUM
+};
+
+const int kMaxFuzzerConsumedBytes = 12;
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+    FuzzedDataProvider fdp(data, size);
+    sp<IEvsDisplay_1_0> mockHWDisplay = new MockHWDisplay();
+    sp<HalDisplay> halDisplay = new HalDisplay(mockHWDisplay);
+
+    while (fdp.remaining_bytes() > kMaxFuzzerConsumedBytes) {
+        switch (fdp.ConsumeIntegralInRange<uint32_t>(0, EVS_FUZZ_API_SUM - 1)) {
+            case EVS_FUZZ_GET_HW_DISPLAY: {
+                halDisplay->getHwDisplay();
+                break;
+            }
+            case EVS_FUZZ_GET_DISPLAY_INFO: {
+                halDisplay->getDisplayInfo([](DisplayDesc desc) {});
+                break;
+            }
+            case EVS_FUZZ_SET_DISPLAY_STATE: {
+                uint32_t state =
+                        fdp.ConsumeIntegralInRange<uint32_t>(0,
+                                                             static_cast<uint32_t>(
+                                                                     EvsDisplayState::NUM_STATES) -
+                                                                     1);
+                halDisplay->setDisplayState(static_cast<EvsDisplayState>(state));
+                break;
+            }
+            case EVS_FUZZ_GET_DISPLAY_STATE: {
+                halDisplay->getDisplayState();
+                break;
+            }
+            case EVS_FUZZ_GET_TARGET_BUFFER: {
+                halDisplay->getTargetBuffer([](const BufferDesc_1_0& buff) {});
+                break;
+            }
+            case EVS_FUZZ_RTN_TGT_BUF_FOR_DISPLAY: {
+                BufferDesc_1_0 buffer;
+                buffer.bufferId = fdp.ConsumeIntegral<int32_t>();
+                halDisplay->returnTargetBufferForDisplay(buffer);
+                break;
+            }
+            case EVS_FUZZ_GET_DISPLAY_INFO_1_1: {
+                halDisplay->getDisplayInfo_1_1([](const auto& config, const auto& state) {});
+                break;
+            }
+            case EVS_FUZZ_TO_STRING: {
+                std::string indent = fdp.ConsumeRandomLengthString(kMaxFuzzerConsumedBytes);
+                halDisplay->toString(indent.c_str());
+                break;
+            }
+            default:
+                LOG(ERROR) << "Unexpected option, aborting...";
+                break;
+        }
+    }
+    return 0;
+}
+
+}  // namespace
+}  // namespace implementation
+}  // namespace V1_1
+}  // namespace evs
+}  // namespace automotive
+}  // namespace android
diff --git a/evs/manager/1.1/test/fuzzer/MockHWCamera.h b/evs/manager/1.1/test/fuzzer/MockHWCamera.h
new file mode 100644
index 0000000..4be393d
--- /dev/null
+++ b/evs/manager/1.1/test/fuzzer/MockHWCamera.h
@@ -0,0 +1,110 @@
+// Copyright 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.
+
+#ifndef EVS_MANAGER_1_1_TEST_FUZZER_MOCKHWCAMERA_H_
+#define EVS_MANAGER_1_1_TEST_FUZZER_MOCKHWCAMERA_H_
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+namespace android {
+namespace automotive {
+namespace evs {
+namespace V1_1 {
+namespace implementation {
+
+class MockHWCamera : public IEvsCamera_1_1 {
+public:
+    MockHWCamera() = default;
+
+    // v1.0 methods
+    Return<void> getCameraInfo(getCameraInfo_cb _hidl_cb) override { return {}; }
+    Return<EvsResult> setMaxFramesInFlight(uint32_t bufferCount) override {
+        if (bufferCount > 1024) {
+            return EvsResult::INVALID_ARG;
+        }
+        return EvsResult::OK;
+    }
+    Return<EvsResult> startVideoStream(const ::android::sp<IEvsCameraStream_1_0>& stream) override {
+        return EvsResult::OK;
+    }
+    Return<void> doneWithFrame(const BufferDesc_1_0& buffer) override { return {}; }
+    Return<void> stopVideoStream() override { return {}; }
+    Return<int32_t> getExtendedInfo(uint32_t opaqueIdentifier) override {
+        if (mExtendedInfo.find(opaqueIdentifier) != mExtendedInfo.end()) {
+            return mExtendedInfo[opaqueIdentifier];
+        }
+        return 0;
+    }
+    Return<EvsResult> setExtendedInfo(uint32_t opaqueIdentifier, int32_t opaqueValue) override {
+        mExtendedInfo[opaqueIdentifier] = opaqueValue;
+        return EvsResult::OK;
+    }
+
+    // v1.1 methods
+    Return<void> getCameraInfo_1_1(getCameraInfo_1_1_cb _hidl_cb) override { return {}; }
+    MOCK_METHOD(Return<void>, getPhysicalCameraInfo,
+                (const hidl_string& deviceId, getPhysicalCameraInfo_cb _hidl_cb), (override));
+    MOCK_METHOD(Return<EvsResult>, pauseVideoStream, (), (override));
+    MOCK_METHOD(Return<EvsResult>, resumeVideoStream, (), (override));
+    Return<EvsResult> doneWithFrame_1_1(const hardware::hidl_vec<BufferDesc_1_1>& buffer) override {
+        return EvsResult::OK;
+    }
+    MOCK_METHOD(Return<EvsResult>, setMaster, (), (override));
+    MOCK_METHOD(Return<EvsResult>, forceMaster, (const sp<IEvsDisplay_1_0>& display), (override));
+    MOCK_METHOD(Return<EvsResult>, unsetMaster, (), (override));
+    Return<void> getParameterList(getParameterList_cb _hidl_cb) override { return {}; }
+    Return<void> getIntParameterRange(CameraParam id, getIntParameterRange_cb _hidl_cb) override {
+        return {};
+    }
+    Return<void> setIntParameter(CameraParam id, int32_t value,
+                                 setIntParameter_cb _hidl_cb) override {
+        // FIXME in default implementation, it's _hidl_cb(EvsResult::INVALID_ARG, 0); which will
+        // always cause a segfault what's the predefined behavior of _hidl_cb?
+        std::vector<int32_t> vec;
+        vec.push_back(0);
+        _hidl_cb(EvsResult::INVALID_ARG, vec);
+        return {};
+    }
+
+    Return<void> getIntParameter(CameraParam id, getIntParameter_cb _hidl_cb) {
+        _hidl_cb(EvsResult::INVALID_ARG, 0);
+        return {};
+    }
+
+    Return<void> getExtendedInfo_1_1(uint32_t opaqueIdentifier,
+                                     getExtendedInfo_1_1_cb _hidl_cb) override {
+        return {};
+    }
+    Return<EvsResult> setExtendedInfo_1_1(uint32_t opaqueIdentifier,
+                                          const hidl_vec<uint8_t>& opaqueValue) override {
+        return EvsResult::OK;
+    }
+    Return<void> importExternalBuffers(const hidl_vec<BufferDesc_1_1>& buffers,
+                                       importExternalBuffers_cb _hidl_cb) override {
+        return {};
+    }
+
+private:
+    std::map<uint32_t, int32_t> mExtendedInfo;
+    std::map<uint32_t, int32_t> mExtendedInfo_1_1;
+};
+
+}  // namespace implementation
+}  // namespace V1_1
+}  // namespace evs
+}  // namespace automotive
+}  // namespace android
+
+#endif  // EVS_MANAGER_1_1_TEST_FUZZER_MOCKHWCAMERA_H_
diff --git a/evs/manager/1.1/test/fuzzer/MockHWDisplay.h b/evs/manager/1.1/test/fuzzer/MockHWDisplay.h
new file mode 100644
index 0000000..59d352a
--- /dev/null
+++ b/evs/manager/1.1/test/fuzzer/MockHWDisplay.h
@@ -0,0 +1,49 @@
+// Copyright 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.
+
+#ifndef EVS_MANAGER_1_1_TEST_FUZZER_MOCKHWDISPLAY_H_
+#define EVS_MANAGER_1_1_TEST_FUZZER_MOCKHWDISPLAY_H_
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+namespace android {
+namespace automotive {
+namespace evs {
+namespace V1_1 {
+namespace implementation {
+
+class MockHWDisplay : public IEvsDisplay_1_1 {
+public:
+    MockHWDisplay() = default;
+
+    Return<void> getDisplayInfo(getDisplayInfo_cb _hidl_cb) override { return {}; }
+    Return<EvsResult> setDisplayState(EvsDisplayState state) override { return EvsResult::OK; }
+    Return<EvsDisplayState> getDisplayState() override { return EvsDisplayState::VISIBLE; }
+    Return<void> getTargetBuffer(getTargetBuffer_cb _hidl_cb) override { return {}; }
+    Return<EvsResult> returnTargetBufferForDisplay(const BufferDesc_1_0& buffer) override {
+        return EvsResult::OK;
+    }
+    Return<void> getDisplayInfo_1_1(getDisplayInfo_1_1_cb _info_cb) override {
+        return {};
+    }
+};
+
+}  // namespace implementation
+}  // namespace V1_1
+}  // namespace evs
+}  // namespace automotive
+}  // namespace android
+
+#endif  // EVS_MANAGER_1_1_TEST_FUZZER_MOCKHWDISPLAY_H_
diff --git a/evs/manager/1.1/test/fuzzer/MockHWEnumerator.h b/evs/manager/1.1/test/fuzzer/MockHWEnumerator.h
new file mode 100644
index 0000000..38241c7
--- /dev/null
+++ b/evs/manager/1.1/test/fuzzer/MockHWEnumerator.h
@@ -0,0 +1,124 @@
+// Copyright 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.
+
+#ifndef EVS_MANAGER_1_1_TEST_FUZZER_MOCKHWENUMERATOR_H_
+#define EVS_MANAGER_1_1_TEST_FUZZER_MOCKHWENUMERATOR_H_
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include "MockHWDisplay.h"
+#include "MockHWCamera.h"
+
+using ::android::hardware::automotive::evs::V1_0::DisplayState;
+
+namespace android {
+namespace automotive {
+namespace evs {
+namespace V1_1 {
+namespace implementation {
+
+class MockHWEnumerator : public IEvsEnumerator_1_1 {
+public:
+    MockHWEnumerator() {
+        // four cameras
+        for (uint64_t i = startMockHWCameraId; i < endMockHWCameraId; i++) {
+            sp<MockHWCamera> camera = new MockHWCamera();
+            mHWCameras[i] = camera;
+        }
+
+        // two displays
+        for (uint8_t i = static_cast<uint8_t>(startMockHWDisplayId);
+             i < static_cast<uint8_t>(endMockHWDisplayId); i++) {
+            sp<MockHWDisplay> display = new MockHWDisplay();
+            mHWDisplays[i] = display;
+            mDisplayPortList[i] = i;
+        }
+    }
+
+    // Methods from ::android::hardware::automotive::evs::V1_0::IEvsEnumerator follow.
+    MOCK_METHOD(Return<void>, getCameraList, (getCameraList_cb _hidl_cb), (override));
+    Return<sp<IEvsCamera_1_0>> openCamera(const hidl_string& cameraId) override {
+        uint64_t idx = stoi(cameraId);
+        if (mHWCameras.find(idx) != mHWCameras.end()) {
+            return mHWCameras[idx];
+        }
+        return nullptr;
+    }
+    MOCK_METHOD(Return<void>, closeCamera, (const sp<IEvsCamera_1_0>& carCamera), (override));
+    Return<sp<IEvsDisplay_1_0>> openDisplay() override {
+        return mHWDisplays.begin()->second;
+    }
+    Return<void> closeDisplay(const sp<IEvsDisplay_1_0>& display) override {
+        return {};
+    }
+    MOCK_METHOD(Return<DisplayState>, getDisplayState, (), (override));
+
+    // Methods from ::android::hardware::automotive::evs::V1_1::IEvsEnumerator follow.
+    Return<void> getCameraList_1_1(getCameraList_1_1_cb _hidl_cb) {
+        return {};
+    }
+    Return<sp<IEvsCamera_1_1>> openCamera_1_1(const hidl_string& cameraId,
+                                              const Stream& streamCfg) override {
+        uint64_t idx = stoi(cameraId);
+        if (mHWCameras.find(idx) != mHWCameras.end()) {
+            return mHWCameras[idx];
+        }
+        return nullptr;
+    }
+    MOCK_METHOD(Return<bool>, isHardware, (), (override));
+    Return<void> getDisplayIdList(getDisplayIdList_cb _list_cb) override {
+        vector<uint8_t> ids;
+
+        ids.resize(mDisplayPortList.size());
+        unsigned i = 0;
+        for (const auto& [port, id] : mDisplayPortList) {
+            ids[i++] = port;
+        }
+
+        _list_cb(ids);
+        return {};
+    }
+    Return<sp<IEvsDisplay_1_1>> openDisplay_1_1(uint8_t port) override {
+        auto iter = mDisplayPortList.find(port);
+        if (iter != mDisplayPortList.end()) {
+            uint64_t id = iter->second;
+            auto it = mHWDisplays.find(id);
+            if (it != mHWDisplays.end()) {
+                return it->second;
+            }
+            return nullptr;
+        }
+        return nullptr;
+    }
+    MOCK_METHOD(Return<void>, getUltrasonicsArrayList, (getUltrasonicsArrayList_cb _hidl_cb),
+                (override));
+    MOCK_METHOD(Return<sp<IEvsUltrasonicsArray>>, openUltrasonicsArray,
+                (const hidl_string& ultrasonicsArrayId), (override));
+    MOCK_METHOD(Return<void>, closeUltrasonicsArray,
+                (const sp<IEvsUltrasonicsArray>& evsUltrasonicsArray), (override));
+
+private:
+    std::map<uint64_t, sp<MockHWDisplay>> mHWDisplays;
+    std::map<uint64_t, sp<MockHWCamera>> mHWCameras;
+    std::map<uint8_t, uint64_t> mDisplayPortList;
+};
+
+}  // namespace implementation
+}  // namespace V1_1
+}  // namespace evs
+}  // namespace automotive
+}  // namespace android
+
+#endif  // EVS_MANAGER_1_1_TEST_FUZZER_MOCKHWENUMERATOR_H_
diff --git a/evs/manager/1.1/test/fuzzer/VirtualCameraFuzzer.cpp b/evs/manager/1.1/test/fuzzer/VirtualCameraFuzzer.cpp
new file mode 100644
index 0000000..ddff9c4
--- /dev/null
+++ b/evs/manager/1.1/test/fuzzer/VirtualCameraFuzzer.cpp
@@ -0,0 +1,262 @@
+/*
+ * Copyright 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.
+ */
+
+#include <fuzzer/FuzzedDataProvider.h>
+#include <iostream>
+#include "Common.h"
+#include "Enumerator.h"
+#include "MockHWCamera.h"
+#include "VirtualCamera.h"
+
+namespace android {
+namespace automotive {
+namespace evs {
+namespace V1_1 {
+namespace implementation {
+
+namespace {
+
+using CameraDesc_1_0 = ::android::hardware::automotive::evs::V1_0::CameraDesc;
+
+enum EvsFuzzFuncs {
+    EVS_FUZZ_GET_ALLOWED_BUFFERS,       // verify getAllowedBuffers
+    EVS_FUZZ_IS_STREAMING,              // verify isStreaming
+    EVS_FUZZ_GET_VERSION,               // verify getVersion
+    EVS_FUZZ_SET_DESCRIPTOR,            // verify setDescriptor
+    EVS_FUZZ_GET_CAMERA_INFO,           // verify getCameraInfo
+    EVS_FUZZ_SETMAX_FRAMES_IN_FLIGHT,   // verify setMaxFramesInFlight
+    EVS_FUZZ_START_VIDEO_STREAM,        // verify startVideoStream
+    EVS_FUZZ_STOP_VIDEO_STREAM,         // verify stopVideoStream
+    EVS_FUZZ_GET_EXTENDED_INFO,         // verify getExtendedInfo
+    EVS_FUZZ_SET_EXTENDED_INFO,         // verify setExtendedInfo
+    EVS_FUZZ_GET_CAMERA_INFO_1_1,       // verify getCameraInfo_1_1
+    EVS_FUZZ_GET_PHYSICAL_CAMERA_INFO,  // verify getPhysicalCameraInfo
+    EVS_FUZZ_PAUSE_VIDEO_STREAM,        // verify pauseVideoStream
+    EVS_FUZZ_RESUME_VIDEO_STREAM,       // verify resumeVideoStream
+    EVS_FUZZ_GET_PARAMETER_LIST,        // verify getParameterList
+    EVS_FUZZ_GET_INT_PARAMETER_RANGE,   // verify getIntParameterRange
+    EVS_FUZZ_SET_EXTENDED_INFO_1_1,     // verify setExtendedInfo_1_1
+    EVS_FUZZ_GET_EXTENDED_INFO_1_1,     // verify getExtendedInfo_1_1
+    EVS_FUZZ_IMPORT_EXTERNAL_BUFFERS,   // verify importExternalBuffers
+    EVS_FUZZ_BASE_ENUM                  // verify common functions
+};
+
+const int kMaxFuzzerConsumedBytes = 12;
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+    FuzzedDataProvider fdp(data, size);
+    sp<IEvsCamera_1_1> mockHWCamera = new MockHWCamera();
+    sp<HalCamera> halCamera = new HalCamera(mockHWCamera);
+    sp<VirtualCamera> virtualCamera = halCamera->makeVirtualCamera();
+
+    std::vector<BufferDesc_1_0> vBufferDesc_1_0;
+    std::vector<BufferDesc_1_1> vBufferDesc_1_1;
+
+    bool videoStarted = false;
+
+    while (fdp.remaining_bytes() > kMaxFuzzerConsumedBytes) {
+        switch (fdp.ConsumeIntegralInRange<uint32_t>(0, EVS_FUZZ_API_SUM - 1)) {
+            case EVS_FUZZ_GET_ALLOWED_BUFFERS: {
+                virtualCamera->getAllowedBuffers();
+                break;
+            }
+            case EVS_FUZZ_IS_STREAMING: {
+                virtualCamera->isStreaming();
+                break;
+            }
+            case EVS_FUZZ_GET_VERSION: {
+                virtualCamera->getVersion();
+                break;
+            }
+            case EVS_FUZZ_GET_HW_CAMERA: {
+                virtualCamera->getHalCameras();
+                break;
+            }
+            case EVS_FUZZ_SET_DESCRIPTOR: {
+                CameraDesc* desc = new CameraDesc();
+                virtualCamera->setDescriptor(desc);
+                break;
+            }
+            case EVS_FUZZ_NOTIFY: {
+                if (videoStarted) {
+                    EvsEventDesc event;
+                    uint32_t type = fdp.ConsumeIntegralInRange<
+                            uint32_t>(0, static_cast<uint32_t>(EvsEventType::STREAM_ERROR));
+                    event.aType = static_cast<EvsEventType>(type);
+                    virtualCamera->notify(event);
+                }
+                break;
+            }
+            case EVS_FUZZ_DELIVER_FRAME: {
+                BufferDesc buffer;
+                buffer.bufferId = fdp.ConsumeIntegral<int32_t>();
+                virtualCamera->deliverFrame(buffer);
+                vBufferDesc_1_1.emplace_back(buffer);
+                break;
+            }
+            case EVS_FUZZ_GET_CAMERA_INFO: {
+                virtualCamera->getCameraInfo([](CameraDesc_1_0 desc) {});
+                break;
+            }
+            case EVS_FUZZ_SETMAX_FRAMES_IN_FLIGHT: {
+                uint32_t delta = fdp.ConsumeIntegral<uint32_t>();
+                virtualCamera->setMaxFramesInFlight(delta);
+                break;
+            }
+            case EVS_FUZZ_START_VIDEO_STREAM: {
+                if (!videoStarted) {
+                    sp<IEvsCamera_1_1> mockHWCamera1 = new MockHWCamera();
+                    sp<HalCamera> halCamera1 = new HalCamera(mockHWCamera1);
+                    virtualCamera->startVideoStream(halCamera1);
+                    videoStarted = true;
+                }
+                break;
+            }
+            case EVS_FUZZ_DONE_WITH_FRAME_1_0: {
+                if (!vBufferDesc_1_0.empty()) {
+                    uint32_t whichBuffer =
+                            fdp.ConsumeIntegralInRange<uint32_t>(0, vBufferDesc_1_0.size() - 1);
+                    virtualCamera->doneWithFrame(vBufferDesc_1_0[whichBuffer]);
+                }
+                break;
+            }
+            case EVS_FUZZ_STOP_VIDEO_STREAM: {
+                virtualCamera->stopVideoStream();
+                videoStarted = false;
+                break;
+            }
+            case EVS_FUZZ_GET_EXTENDED_INFO: {
+                uint32_t opaqueIdentifier = fdp.ConsumeIntegral<uint32_t>();
+                virtualCamera->getExtendedInfo(opaqueIdentifier);
+                break;
+            }
+            case EVS_FUZZ_SET_EXTENDED_INFO: {
+                uint32_t opaqueIdentifier = fdp.ConsumeIntegral<uint32_t>();
+                int32_t opaqueValue = fdp.ConsumeIntegral<int32_t>();
+                virtualCamera->setExtendedInfo(opaqueIdentifier, opaqueValue);
+                break;
+            }
+            case EVS_FUZZ_GET_CAMERA_INFO_1_1: {
+                virtualCamera->getCameraInfo_1_1([](CameraDesc desc) {});
+                break;
+            }
+            case EVS_FUZZ_GET_PHYSICAL_CAMERA_INFO: {
+                hidl_string deviceId("");
+                virtualCamera->getPhysicalCameraInfo(deviceId, [](const CameraDesc& info) {});
+                break;
+            }
+            case EVS_FUZZ_DONE_WITH_FRAME_1_1: {
+                if (!vBufferDesc_1_1.empty()) {
+                    hidl_vec<BufferDesc_1_1> buffers(vBufferDesc_1_1);
+                    virtualCamera->doneWithFrame_1_1(buffers);
+                }
+                break;
+            }
+            case EVS_FUZZ_PAUSE_VIDEO_STREAM: {
+                virtualCamera->pauseVideoStream();
+                break;
+            }
+            case EVS_FUZZ_RESUME_VIDEO_STREAM: {
+                virtualCamera->resumeVideoStream();
+                break;
+            }
+            case EVS_FUZZ_SET_PRIMARY: {
+                virtualCamera->setMaster();
+                break;
+            }
+            case EVS_FUZZ_FORCE_PRIMARY: {
+                // TODO(161388489) skip this until we finished fuzzing evs display
+                break;
+            }
+            case EVS_FUZZ_UNSET_PRIMARY: {
+                virtualCamera->unsetMaster();
+                break;
+            }
+            case EVS_FUZZ_GET_PARAMETER_LIST: {
+                virtualCamera->getParameterList([](hidl_vec<CameraParam> cmdList) {});
+                break;
+            }
+            case EVS_FUZZ_GET_INT_PARAMETER_RANGE: {
+                uint32_t whichParam =
+                        fdp.ConsumeIntegralInRange<uint32_t>(0,
+                                                             static_cast<uint32_t>(
+                                                                     CameraParam::ABSOLUTE_ZOOM));
+                virtualCamera->getIntParameterRange(static_cast<CameraParam>(whichParam),
+                                                    [](int32_t val0, int32_t val1, int32_t val2) {
+                                                    });
+                break;
+            }
+            case EVS_FUZZ_SET_PARAMETER: {
+                uint32_t whichParam =
+                        fdp.ConsumeIntegralInRange<uint32_t>(0,
+                                                             static_cast<uint32_t>(
+                                                                     CameraParam::ABSOLUTE_ZOOM));
+                int32_t val = fdp.ConsumeIntegral<int32_t>();
+                virtualCamera->setIntParameter(static_cast<CameraParam>(whichParam), val,
+                                               [](auto status, auto effectiveValues) {});
+                break;
+            }
+            case EVS_FUZZ_GET_PARAMETER: {
+                uint32_t whichParam =
+                        fdp.ConsumeIntegralInRange<uint32_t>(0,
+                                                             static_cast<uint32_t>(
+                                                                     CameraParam::ABSOLUTE_ZOOM));
+                virtualCamera->getIntParameter(static_cast<CameraParam>(whichParam),
+                                               [](auto status, auto effectiveValues) {});
+                break;
+            }
+            case EVS_FUZZ_SET_EXTENDED_INFO_1_1: {
+                uint32_t opaqueIdentifier = fdp.ConsumeIntegral<uint32_t>();
+                uint8_t opaqueValue = fdp.ConsumeIntegral<uint8_t>();
+                vector<uint8_t> v;
+                v.push_back(opaqueValue);
+                hidl_vec<uint8_t> vec(v);
+                virtualCamera->setExtendedInfo_1_1(opaqueIdentifier, vec);
+                break;
+            }
+            case EVS_FUZZ_GET_EXTENDED_INFO_1_1: {
+                uint32_t opaqueIdentifier = fdp.ConsumeIntegral<uint32_t>();
+                virtualCamera->getExtendedInfo_1_1(opaqueIdentifier,
+                                                   [](const auto& result, const auto& data) {});
+                break;
+            }
+            case EVS_FUZZ_IMPORT_EXTERNAL_BUFFERS: {
+                if (!vBufferDesc_1_1.empty()) {
+                    hidl_vec<BufferDesc_1_1> buffers(vBufferDesc_1_1);
+                    virtualCamera->importExternalBuffers(buffers, [](auto _result, auto _delta) {});
+                }
+                break;
+            }
+            default:
+                LOG(ERROR) << "Unexpected option, aborting...";
+                break;
+        }
+    }
+
+    if (videoStarted) {
+        // TODO(b/161762538) if we do not stop video stream manually here,
+        // there will be crash at VirtualCamera.cpp::pHwCamera->unsetMaster(this);
+        virtualCamera->stopVideoStream();
+    }
+    return 0;
+}
+
+}  // namespace
+}  // namespace implementation
+}  // namespace V1_1
+}  // namespace evs
+}  // namespace automotive
+}  // namespace android
diff --git a/evs/sampleDriver/Android.bp b/evs/sampleDriver/Android.bp
index 0ae0b2a..04634d1 100644
--- a/evs/sampleDriver/Android.bp
+++ b/evs/sampleDriver/Android.bp
@@ -70,7 +70,7 @@
 
     required: [
         "evs_configuration.dtd",
-        "evs_sample_configuration.xml",
+        "evs_configuration.xml",
     ],
 
     include_dirs: [
@@ -118,8 +118,8 @@
 }
 
 prebuilt_etc {
-    name: "evs_sample_configuration.xml",
+    name: "evs_configuration.xml",
     soc_specific: true,
-    src: "resources/evs_sample_configuration.xml",
+    src: "resources/evs_configuration_default.xml",
     sub_dir: "automotive/evs",
 }
diff --git a/evs/sampleDriver/ConfigManager.cpp b/evs/sampleDriver/ConfigManager.cpp
index b027bbb..b1df3e3 100644
--- a/evs/sampleDriver/ConfigManager.cpp
+++ b/evs/sampleDriver/ConfigManager.cpp
@@ -26,6 +26,10 @@
 
 using ::android::hardware::camera::device::V3_2::StreamRotation;
 
+const char* ConfigManager::CONFIG_DEFAULT_PATH =
+        "/vendor/etc/automotive/evs/evs_configuration.xml";
+const char* ConfigManager::CONFIG_OVERRIDE_PATH =
+        "/vendor/etc/automotive/evs/evs_configuration_override.xml";
 
 ConfigManager::~ConfigManager() {
     /* Nothing to do */
@@ -494,10 +498,14 @@
     const int64_t parsingStart = android::elapsedRealtimeNano();
 
     /* load and parse a configuration file */
-    xmlDoc.LoadFile(mConfigFilePath);
+    xmlDoc.LoadFile(CONFIG_OVERRIDE_PATH);
     if (xmlDoc.ErrorID() != XML_SUCCESS) {
-        LOG(ERROR) << "Failed to load and/or parse a configuration file, " << xmlDoc.ErrorStr();
-        return false;
+        xmlDoc.LoadFile(CONFIG_DEFAULT_PATH);
+        if (xmlDoc.ErrorID() != XML_SUCCESS) {
+            LOG(ERROR) << "Failed to load and/or parse a configuration file, "
+                       << xmlDoc.ErrorStr();
+            return false;
+        }
     }
 
     /* retrieve the root element */
@@ -1032,8 +1040,8 @@
 }
 
 
-std::unique_ptr<ConfigManager> ConfigManager::Create(const char *path) {
-    unique_ptr<ConfigManager> cfgMgr(new ConfigManager(path));
+std::unique_ptr<ConfigManager> ConfigManager::Create() {
+    unique_ptr<ConfigManager> cfgMgr(new ConfigManager());
 
     /*
      * Read a configuration from XML file
diff --git a/evs/sampleDriver/ConfigManager.h b/evs/sampleDriver/ConfigManager.h
index 97e609a..c1870e5 100644
--- a/evs/sampleDriver/ConfigManager.h
+++ b/evs/sampleDriver/ConfigManager.h
@@ -46,7 +46,7 @@
 
 class ConfigManager {
 public:
-    static std::unique_ptr<ConfigManager> Create(const char *path = "");
+    static std::unique_ptr<ConfigManager> Create();
     ConfigManager(const ConfigManager&) = delete;
     ConfigManager& operator=(const ConfigManager&) = delete;
 
@@ -218,11 +218,13 @@
 
 private:
     /* Constructors */
-    ConfigManager(const char *xmlPath) :
-        mConfigFilePath(xmlPath),
+    ConfigManager() :
         mBinaryFilePath("") {
     }
 
+    static const char* CONFIG_DEFAULT_PATH;
+    static const char* CONFIG_OVERRIDE_PATH;
+
     /* System configuration */
     SystemInfo mSystemInfo;
 
@@ -250,9 +252,6 @@
      */
     condition_variable mConfigCond;
 
-    /* A path to XML configuration file */
-    const char *mConfigFilePath;
-
     /* A path to a binary configuration file */
     const char *mBinaryFilePath;
 
diff --git a/evs/sampleDriver/EvsEnumerator.cpp b/evs/sampleDriver/EvsEnumerator.cpp
index 2dbedb4..0249ea9 100644
--- a/evs/sampleDriver/EvsEnumerator.cpp
+++ b/evs/sampleDriver/EvsEnumerator.cpp
@@ -150,7 +150,7 @@
     if (sConfigManager == nullptr) {
         /* loads and initializes ConfigManager in a separate thread */
         sConfigManager =
-            ConfigManager::Create("/vendor/etc/automotive/evs/evs_sample_configuration.xml");
+            ConfigManager::Create();
     }
 
     if (sDisplayProxy == nullptr) {
@@ -220,7 +220,7 @@
             if (displayIds.size() > 0) {
                 sInternalDisplayId = displayIds[0];
                 for (const auto& id : displayIds) {
-                    const auto port = id & 0xF;
+                    const auto port = id & 0xFF;
                     LOG(INFO) << "Display " << std::hex << id
                               << " is detected on the port, " << port;
                     sDisplayPortList.insert_or_assign(port, id);
@@ -510,7 +510,7 @@
     if (sDisplayPortList.size() > 0) {
         ids.resize(sDisplayPortList.size());
         unsigned i = 0;
-        ids[i++] = sInternalDisplayId & 0xF;
+        ids[i++] = sInternalDisplayId & 0xFF;
         for (const auto& [port, id] : sDisplayPortList) {
             if (sInternalDisplayId != id) {
                 ids[i++] = port;
diff --git a/evs/sampleDriver/EvsV4lCamera.cpp b/evs/sampleDriver/EvsV4lCamera.cpp
index cd2a3a4..a46a80b 100644
--- a/evs/sampleDriver/EvsV4lCamera.cpp
+++ b/evs/sampleDriver/EvsV4lCamera.cpp
@@ -728,7 +728,7 @@
 
     if (!readyForFrame) {
         // We need to return the video buffer so it can capture a new frame
-        mVideo.markFrameConsumed();
+        mVideo.markFrameConsumed(pV4lBuff->index);
     } else {
         // Assemble the buffer description we'll transmit below
         BufferDesc_1_1 bufDesc_1_1 = {};
@@ -779,7 +779,7 @@
         // Give the video frame back to the underlying device for reuse
         // Note that we do this before making the client callback to give the
         // underlying camera more time to capture the next frame
-        mVideo.markFrameConsumed();
+        mVideo.markFrameConsumed(pV4lBuff->index);
 
         // Issue the (asynchronous) callback to the client -- can't be holding
         // the lock
diff --git a/evs/sampleDriver/VideoCapture.cpp b/evs/sampleDriver/VideoCapture.cpp
index 9663bf6..accee26 100644
--- a/evs/sampleDriver/VideoCapture.cpp
+++ b/evs/sampleDriver/VideoCapture.cpp
@@ -91,7 +91,7 @@
     // Set our desired output format
     v4l2_format format;
     format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-    format.fmt.pix.pixelformat = V4L2_PIX_FMT_UYVY;
+    format.fmt.pix.pixelformat = V4L2_PIX_FMT_YUYV;
     format.fmt.pix.width = width;
     format.fmt.pix.height = height;
     LOG(INFO) << "Requesting format: "
@@ -125,7 +125,7 @@
 
     // Make sure we're initialized to the STOPPED state
     mRunMode = STOPPED;
-    mFrameReady = false;
+    mFrames.clear();
 
     // Ready to go!
     return true;
@@ -164,45 +164,54 @@
         return false;
     }
 
-    // Get the information on the buffer that was created for us
-    memset(&mBufferInfo, 0, sizeof(mBufferInfo));
-    mBufferInfo.type     = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-    mBufferInfo.memory   = V4L2_MEMORY_MMAP;
-    mBufferInfo.index    = 0;
-    if (ioctl(mDeviceFd, VIDIOC_QUERYBUF, &mBufferInfo) < 0) {
-        PLOG(ERROR) << "VIDIOC_QUERYBUF failed";
-        return false;
-    }
+    mNumBuffers = bufrequest.count;
+    mBufferInfos = std::make_unique<v4l2_buffer[]>(mNumBuffers);
+    mPixelBuffers = std::make_unique<void *[]>(mNumBuffers);
 
-    LOG(INFO) << "Buffer description:";
-    LOG(INFO) << "  offset: " << mBufferInfo.m.offset;
-    LOG(INFO) << "  length: " << mBufferInfo.length;
-    LOG(INFO) << "  flags : " << std::hex << mBufferInfo.flags;
+    for (int i = 0; i < mNumBuffers; ++i) {
+      // Get the information on the buffer that was created for us
+        memset(&mBufferInfos[i], 0, sizeof(v4l2_buffer));
+        mBufferInfos[i].type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        mBufferInfos[i].memory = V4L2_MEMORY_MMAP;
+        mBufferInfos[i].index = i;
 
-    // Get a pointer to the buffer contents by mapping into our address space
-    mPixelBuffer = mmap(
-            NULL,
-            mBufferInfo.length,
-            PROT_READ | PROT_WRITE,
-            MAP_SHARED,
-            mDeviceFd,
-            mBufferInfo.m.offset
-    );
-    if( mPixelBuffer == MAP_FAILED) {
-        PLOG(ERROR) << "mmap() failed";
-        return false;
-    }
-    memset(mPixelBuffer, 0, mBufferInfo.length);
-    LOG(INFO) << "Buffer mapped at " << mPixelBuffer;
+        if (ioctl(mDeviceFd, VIDIOC_QUERYBUF, &mBufferInfos[i]) < 0) {
+            PLOG(ERROR) << "VIDIOC_QUERYBUF failed";
+            return false;
+        }
 
-    // Queue the first capture buffer
-    if (ioctl(mDeviceFd, VIDIOC_QBUF, &mBufferInfo) < 0) {
-        PLOG(ERROR) << "VIDIOC_QBUF failed";
-        return false;
+        LOG(INFO) << "Buffer description:";
+        LOG(INFO) << "  offset: " << mBufferInfos[i].m.offset;
+        LOG(INFO) << "  length: " << mBufferInfos[i].length;
+        LOG(INFO) << "  flags : " << std::hex << mBufferInfos[i].flags;
+
+        // Get a pointer to the buffer contents by mapping into our address space
+        mPixelBuffers[i] = mmap(
+                NULL,
+                mBufferInfos[i].length,
+                PROT_READ | PROT_WRITE,
+                MAP_SHARED,
+                mDeviceFd,
+                mBufferInfos[i].m.offset
+        );
+
+        if(mPixelBuffers[i] == MAP_FAILED) {
+            PLOG(ERROR) << "mmap() failed";
+            return false;
+        }
+
+        memset(mPixelBuffers[i], 0, mBufferInfos[i].length);
+        LOG(INFO) << "Buffer mapped at " << mPixelBuffers[i];
+
+        // Queue the first capture buffer
+        if (ioctl(mDeviceFd, VIDIOC_QBUF, &mBufferInfos[i]) < 0) {
+            PLOG(ERROR) << "VIDIOC_QBUF failed";
+            return false;
+        }
     }
 
     // Start the video stream
-    int type = mBufferInfo.type;
+    const int type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
     if (ioctl(mDeviceFd, VIDIOC_STREAMON, &type) < 0) {
         PLOG(ERROR) << "VIDIOC_STREAMON failed";
         return false;
@@ -236,7 +245,7 @@
         }
 
         // Stop the underlying video stream (automatically empties the buffer queue)
-        int type = mBufferInfo.type;
+        const int type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
         if (ioctl(mDeviceFd, VIDIOC_STREAMOFF, &type) < 0) {
             PLOG(ERROR) << "VIDIOC_STREAMOFF failed";
         }
@@ -244,8 +253,10 @@
         LOG(DEBUG) << "Capture thread stopped.";
     }
 
-    // Unmap the buffers we allocated
-    munmap(mPixelBuffer, mBufferInfo.length);
+    for (int i = 0; i < mNumBuffers; ++i) {
+        // Unmap the buffers we allocated
+        munmap(mPixelBuffers[i], mBufferInfos[i].length);
+    }
 
     // Tell the L4V2 driver to release our streaming buffers
     v4l2_requestbuffers bufrequest;
@@ -256,24 +267,29 @@
 
     // Drop our reference to the frame delivery callback interface
     mCallback = nullptr;
+
+    // Release capture buffers
+    mNumBuffers = 0;
+    mBufferInfos = nullptr;
+    mPixelBuffers = nullptr;
 }
 
 
-void VideoCapture::markFrameReady() {
-    mFrameReady = true;
-};
-
-
-bool VideoCapture::returnFrame() {
-    // We're giving the frame back to the system, so clear the "ready" flag
-    mFrameReady = false;
+bool VideoCapture::returnFrame(int id) {
+    if (mFrames.find(id) == mFrames.end()) {
+        LOG(WARNING) << "Invalid request to return a buffer " << id << " is ignored.";
+        return false;
+    }
 
     // Requeue the buffer to capture the next available frame
-    if (ioctl(mDeviceFd, VIDIOC_QBUF, &mBufferInfo) < 0) {
+    if (ioctl(mDeviceFd, VIDIOC_QBUF, &mBufferInfos[id]) < 0) {
         PLOG(ERROR) << "VIDIOC_QBUF failed";
         return false;
     }
 
+    // Remove ID of returned buffer from the set
+    mFrames.erase(id);
+
     return true;
 }
 
@@ -282,17 +298,25 @@
 void VideoCapture::collectFrames() {
     // Run until our atomic signal is cleared
     while (mRunMode == RUN) {
+        struct v4l2_buffer buf = {
+            .type   = V4L2_BUF_TYPE_VIDEO_CAPTURE,
+            .memory = V4L2_MEMORY_MMAP
+        };
+
         // Wait for a buffer to be ready
-        if (ioctl(mDeviceFd, VIDIOC_DQBUF, &mBufferInfo) < 0) {
+        if (ioctl(mDeviceFd, VIDIOC_DQBUF, &buf) < 0) {
             PLOG(ERROR) << "VIDIOC_DQBUF failed";
             break;
         }
 
-        markFrameReady();
+        mFrames.insert(buf.index);
+
+        // Update a frame metadata
+        mBufferInfos[buf.index] = buf;
 
         // If a callback was requested per frame, do that now
         if (mCallback) {
-            mCallback(this, &mBufferInfo, mPixelBuffer);
+            mCallback(this, &mBufferInfos[buf.index], mPixelBuffers[buf.index]);
         }
     }
 
diff --git a/evs/sampleDriver/VideoCapture.h b/evs/sampleDriver/VideoCapture.h
index 42a5ef4..d298d41 100644
--- a/evs/sampleDriver/VideoCapture.h
+++ b/evs/sampleDriver/VideoCapture.h
@@ -41,12 +41,21 @@
     __u32   getV4LFormat()      { return mFormat; };
 
     // NULL until stream is started
-    void* getLatestData()       { return mPixelBuffer; };
+    void* getLatestData() {
+        if (mFrames.empty()) {
+            // No frame is available
+            return nullptr;
+        }
 
-    bool isFrameReady()         { return mFrameReady; };
-    void markFrameConsumed()    { returnFrame(); };
+        // Return a pointer to the buffer captured most recently
+        const int latestBufferId = *mFrames.end();
+        return mPixelBuffers[latestBufferId];
+    }
 
-    bool isOpen()               { return mDeviceFd >= 0; };
+    bool isFrameReady()             { return !mFrames.empty(); }
+    void markFrameConsumed(int id)  { returnFrame(id); }
+
+    bool isOpen()                   { return mDeviceFd >= 0; }
 
     int setParameter(struct v4l2_control& control);
     int getParameter(struct v4l2_control& control);
@@ -54,13 +63,13 @@
 
 private:
     void collectFrames();
-    void markFrameReady();
-    bool returnFrame();
+    bool returnFrame(int id);
 
     int mDeviceFd = -1;
 
-    v4l2_buffer mBufferInfo = {};
-    void* mPixelBuffer = nullptr;
+    int mNumBuffers = 0;
+    std::unique_ptr<v4l2_buffer[]> mBufferInfos = nullptr;
+    std::unique_ptr<void*[]>       mPixelBuffers = nullptr;
 
     __u32   mFormat = 0;
     __u32   mWidth  = 0;
@@ -71,7 +80,7 @@
 
     std::thread mCaptureThread;             // The thread we'll use to dispatch frames
     std::atomic<int> mRunMode;              // Used to signal the frame loop (see RunModes below)
-    std::atomic<bool> mFrameReady;          // Set when a frame has been delivered
+    std::set<int> mFrames;                  // Set of available frame buffers
 
     // Careful changing these -- we're using bit-wise ops to manipulate these
     enum RunModes {
diff --git a/evs/sampleDriver/android.hardware.automotive.evs@1.1-sample.rc b/evs/sampleDriver/android.hardware.automotive.evs@1.1-sample.rc
index 324a949..e7d7217 100644
--- a/evs/sampleDriver/android.hardware.automotive.evs@1.1-sample.rc
+++ b/evs/sampleDriver/android.hardware.automotive.evs@1.1-sample.rc
@@ -1,4 +1,4 @@
-service evs_driver /vendor/bin/android.hardware.automotive.evs@1.1-sample
+service evs_sample_driver /vendor/bin/android.hardware.automotive.evs@1.1-sample
     class hal
     priority -20
     user graphics
diff --git a/evs/sampleDriver/resources/evs_sample_configuration.xml b/evs/sampleDriver/resources/evs_configuration_default.xml
similarity index 78%
rename from evs/sampleDriver/resources/evs_sample_configuration.xml
rename to evs/sampleDriver/resources/evs_configuration_default.xml
index f81b922..8b9007f 100644
--- a/evs/sampleDriver/resources/evs_sample_configuration.xml
+++ b/evs/sampleDriver/resources/evs_configuration_default.xml
@@ -55,7 +55,7 @@
                     name='LOGICAL_MULTI_CAMERA_PHYSICAL_IDS'
                     type='byte[]'
                     size='2'
-                    value='/dev/video3,/dev/video4'
+                    value='/dev/video10,/dev/video11'
                 />
             </characteristics>
         </group>
@@ -198,7 +198,105 @@
             </characteristics>
         </device>
 
-    <!-- camera device information for v4l2loopback devices -->
+        <!-- vivid emulated video devices -->
+        <device id='/dev/video10' position='rear'>
+            <caps>
+                <!-- list of supported controls -->
+                <supported_controls>
+                    <control name='BRIGHTNESS' min='0' max='255'/>
+                    <control name='CONTRAST' min='0' max='255'/>
+                    <control name='AUTO_WHITE_BALANCE' min='0' max='1'/>
+                    <control name='WHITE_BALANCE_TEMPERATURE' min='2000' max='7500'/>
+                    <control name='SHARPNESS' min='0' max='255'/>
+                    <control name='AUTO_FOCUS' min='0' max='1'/>
+                    <control name='ABSOLUTE_FOCUS' min='0' max='255' step='5'/>
+                    <control name='ABSOLUTE_ZOOM' min='100' max='400'/>
+                </supported_controls>
+
+                <!-- list of supported stream configurations -->
+                <!-- vivid webcam input support below three resolutions -->
+                <stream id='0' width='1280' height='720' format='RGBA_8888' framerate='5'/>
+                <stream id='1' width='640' height='360' format='RGBA_8888' framerate='15'/>
+                <stream id='2' width='360' height='180' format='RGBA_8888' framerate='30'/>
+            </caps>
+
+            <!-- list of parameters -->
+            <characteristics/>
+        </device>
+        <device id='/dev/video11' position='left'>
+            <caps>
+                <!-- list of supported controls -->
+                <supported_controls>
+                    <control name='BRIGHTNESS' min='0' max='255'/>
+                    <control name='CONTRAST' min='0' max='255'/>
+                    <control name='AUTO_WHITE_BALANCE' min='0' max='1'/>
+                    <control name='WHITE_BALANCE_TEMPERATURE' min='2000' max='7500'/>
+                    <control name='SHARPNESS' min='0' max='255'/>
+                    <control name='AUTO_FOCUS' min='0' max='1'/>
+                    <control name='ABSOLUTE_FOCUS' min='0' max='255' step='5'/>
+                    <control name='ABSOLUTE_ZOOM' min='100' max='400'/>
+                </supported_controls>
+
+                <!-- list of supported stream configurations -->
+                <!-- vivid webcam input support below three resolutions -->
+                <stream id='0' width='1280' height='720' format='RGBA_8888' framerate='5'/>
+                <stream id='1' width='640' height='360' format='RGBA_8888' framerate='15'/>
+                <stream id='2' width='360' height='180' format='RGBA_8888' framerate='30'/>
+            </caps>
+
+            <!-- list of parameters -->
+            <characteristics/>
+        </device>
+        <device id='/dev/video12' position='right'>
+            <caps>
+                <!-- list of supported controls -->
+                <supported_controls>
+                    <control name='BRIGHTNESS' min='0' max='255'/>
+                    <control name='CONTRAST' min='0' max='255'/>
+                    <control name='AUTO_WHITE_BALANCE' min='0' max='1'/>
+                    <control name='WHITE_BALANCE_TEMPERATURE' min='2000' max='7500'/>
+                    <control name='SHARPNESS' min='0' max='255'/>
+                    <control name='AUTO_FOCUS' min='0' max='1'/>
+                    <control name='ABSOLUTE_FOCUS' min='0' max='255' step='5'/>
+                    <control name='ABSOLUTE_ZOOM' min='100' max='400'/>
+                </supported_controls>
+
+                <!-- list of supported stream configurations -->
+                <!-- vivid webcam input support below three resolutions -->
+                <stream id='0' width='1280' height='720' format='RGBA_8888' framerate='5'/>
+                <stream id='1' width='640' height='360' format='RGBA_8888' framerate='15'/>
+                <stream id='2' width='360' height='180' format='RGBA_8888' framerate='30'/>
+            </caps>
+
+            <!-- list of parameters -->
+            <characteristics/>
+        </device>
+        <device id='/dev/video13' position='front'>
+            <caps>
+                <!-- list of supported controls -->
+                <supported_controls>
+                    <control name='BRIGHTNESS' min='0' max='255'/>
+                    <control name='CONTRAST' min='0' max='255'/>
+                    <control name='AUTO_WHITE_BALANCE' min='0' max='1'/>
+                    <control name='WHITE_BALANCE_TEMPERATURE' min='2000' max='7500'/>
+                    <control name='SHARPNESS' min='0' max='255'/>
+                    <control name='AUTO_FOCUS' min='0' max='1'/>
+                    <control name='ABSOLUTE_FOCUS' min='0' max='255' step='5'/>
+                    <control name='ABSOLUTE_ZOOM' min='100' max='400'/>
+                </supported_controls>
+
+                <!-- list of supported stream configurations -->
+                <!-- vivid webcam input support below three resolutions -->
+                <stream id='0' width='1280' height='720' format='RGBA_8888' framerate='5'/>
+                <stream id='1' width='640' height='360' format='RGBA_8888' framerate='15'/>
+                <stream id='2' width='360' height='180' format='RGBA_8888' framerate='30'/>
+            </caps>
+
+            <!-- list of parameters -->
+            <characteristics/>
+        </device>
+
+        <!-- camera device information for v4l2loopback devices -->
         <!-- camera group v4l2loopback_group0 -->
         <group id='v4l2loopback_group0' synchronized='CALIBRATED'>
             <caps>
diff --git a/evs/sepolicy/evs.mk b/evs/sepolicy/evs.mk
new file mode 100644
index 0000000..aee4003
--- /dev/null
+++ b/evs/sepolicy/evs.mk
@@ -0,0 +1,3 @@
+# Extended View System Selinux Policies
+PRODUCT_PUBLIC_SEPOLICY_DIRS += packages/services/Car/evs/sepolicy/public
+PRODUCT_PRIVATE_SEPOLICY_DIRS += packages/services/Car/evs/sepolicy/private
diff --git a/evs/sepolicy/private/automotive_display_service.te b/evs/sepolicy/private/automotive_display_service.te
new file mode 100644
index 0000000..cd42ed6
--- /dev/null
+++ b/evs/sepolicy/private/automotive_display_service.te
@@ -0,0 +1,2 @@
+allow automotive_display_service hal_evs_driver:binder transfer;
+allow automotive_display_service hal_evs_driver:fd use;
diff --git a/evs/sepolicy/evs_app.te b/evs/sepolicy/private/evs_app.te
similarity index 100%
rename from evs/sepolicy/evs_app.te
rename to evs/sepolicy/private/evs_app.te
diff --git a/evs/sepolicy/evs_driver.te b/evs/sepolicy/private/evs_driver.te
similarity index 94%
rename from evs/sepolicy/evs_driver.te
rename to evs/sepolicy/private/evs_driver.te
index 9bb7b97..5b847fa 100644
--- a/evs/sepolicy/evs_driver.te
+++ b/evs/sepolicy/private/evs_driver.te
@@ -1,5 +1,4 @@
-# evs_mock mock hardware driver service
-type hal_evs_driver, domain;
+# evs reference hardware driver service
 hal_server_domain(hal_evs_driver, hal_evs)
 hal_client_domain(hal_evs_driver, hal_evs)
 
diff --git a/evs/sepolicy/evs_manager.te b/evs/sepolicy/private/evs_manager.te
similarity index 74%
rename from evs/sepolicy/evs_manager.te
rename to evs/sepolicy/private/evs_manager.te
index cf649bb..32bbc32 100644
--- a/evs/sepolicy/evs_manager.te
+++ b/evs/sepolicy/private/evs_manager.te
@@ -1,5 +1,4 @@
 # evs manager
-type evs_manager, domain, coredomain;
 hal_server_domain(evs_manager, hal_evs)
 hal_client_domain(evs_manager, hal_evs)
 
@@ -7,10 +6,7 @@
 type evs_manager_exec, exec_type, file_type, system_file_type;
 init_daemon_domain(evs_manager)
 
-# allow use of hwservices
-allow evs_manager hal_graphics_allocator_default:fd use;
-
-# allow write to fd
+# allow write messages to the shell
 allow evs_manager shell:fd use;
 allow evs_manager shell:fifo_file write;
 
diff --git a/evs/sepolicy/file_contexts b/evs/sepolicy/private/file_contexts
similarity index 100%
rename from evs/sepolicy/file_contexts
rename to evs/sepolicy/private/file_contexts
diff --git a/evs/sepolicy/servicemanager.te b/evs/sepolicy/private/servicemanager.te
similarity index 100%
rename from evs/sepolicy/servicemanager.te
rename to evs/sepolicy/private/servicemanager.te
diff --git a/evs/sepolicy/surfaceflinger.te b/evs/sepolicy/private/surfaceflinger.te
similarity index 100%
rename from evs/sepolicy/surfaceflinger.te
rename to evs/sepolicy/private/surfaceflinger.te
diff --git a/evs/sepolicy/public/evs_driver.te b/evs/sepolicy/public/evs_driver.te
new file mode 100644
index 0000000..9f72441
--- /dev/null
+++ b/evs/sepolicy/public/evs_driver.te
@@ -0,0 +1,2 @@
+# reference evs hardware driver service
+type hal_evs_driver, domain;
diff --git a/evs/sepolicy/public/evs_manager.te b/evs/sepolicy/public/evs_manager.te
new file mode 100644
index 0000000..24f3e6c
--- /dev/null
+++ b/evs/sepolicy/public/evs_manager.te
@@ -0,0 +1,2 @@
+# evs manager
+type evs_manager, domain, coredomain;
diff --git a/packages/CarActivityResolver/Android.bp b/packages/CarActivityResolver/Android.bp
new file mode 100644
index 0000000..83228c3
--- /dev/null
+++ b/packages/CarActivityResolver/Android.bp
@@ -0,0 +1,35 @@
+// Copyright (C) 2021 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+android_app {
+    name: "CarActivityResolver",
+    srcs: ["src/**/*.java"],
+    platform_apis: true,
+    certificate: "platform",
+    privileged: true,
+    optimize: {
+        proguard_flags_files: ["proguard.flags"],
+        enabled: false,
+    },
+    resource_dirs: ["res"],
+    static_libs: [
+        "car-ui-lib",
+    ],
+    libs: ["android.car"],
+    required: ["allowed_privapp_com.android.car.activityresolver"],
+    product_variables: {
+        pdk: {
+            enabled: false,
+        },
+    },
+}
diff --git a/packages/CarActivityResolver/AndroidManifest.xml b/packages/CarActivityResolver/AndroidManifest.xml
new file mode 100644
index 0000000..78e1fb1
--- /dev/null
+++ b/packages/CarActivityResolver/AndroidManifest.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (C) 2021 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.android.car.activityresolver">
+
+    <!-- Required to rank activities. -->
+    <uses-permission android:name="android.permission.BIND_RESOLVER_RANKER_SERVICE" />
+
+    <!-- Required for ActivityManager.getCurrentUser(). -->
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
+
+    <!-- Required for UserManager.getProfiles() and getUserInfo(). -->
+    <uses-permission android:name="android.permission.MANAGE_USERS" />
+
+    <!-- To delete last chosen activity when another activity is chosen. -->
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+
+    <!-- To change the preferred activity. -->
+    <uses-permission android:name="android.permission.SET_PREFERRED_APPLICATIONS" />
+
+    <application android:label="@string/app_name">
+
+        <activity
+            android:name=".CarResolverActivity"
+            android:exported="true"
+            android:launchMode="singleInstance"
+            android:noHistory="true">
+        </activity>
+
+    </application>
+</manifest>
diff --git a/packages/CarActivityResolver/res/values/strings.xml b/packages/CarActivityResolver/res/values/strings.xml
new file mode 100644
index 0000000..42c7d26
--- /dev/null
+++ b/packages/CarActivityResolver/res/values/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" translatable="false">CarActivityResolver</string>
+</resources>
diff --git a/packages/CarActivityResolver/src/com/android/car/activityresolver/CarResolverActivity.java b/packages/CarActivityResolver/src/com/android/car/activityresolver/CarResolverActivity.java
new file mode 100644
index 0000000..d4807a3
--- /dev/null
+++ b/packages/CarActivityResolver/src/com/android/car/activityresolver/CarResolverActivity.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.activityresolver;
+
+import android.os.Bundle;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import android.widget.ListView;
+
+import com.android.internal.R;
+import com.android.internal.app.ResolverActivity;
+import com.android.internal.app.ResolverViewPager;
+
+/**
+ * An automotive variant of the resolver activity which does not use the safe forwarding mode and
+ * which supports rotary.
+ */
+public final class CarResolverActivity extends ResolverActivity
+        implements ViewTreeObserver.OnGlobalLayoutListener {
+
+    private ResolverViewPager mProfilePager;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setSafeForwardingMode(false);
+
+        mProfilePager = findViewById(R.id.profile_pager);
+        mProfilePager.getViewTreeObserver().addOnGlobalLayoutListener(this);
+    }
+
+    @Override
+    protected void onDestroy() {
+        mProfilePager.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+
+        super.onDestroy();
+    }
+
+    @Override
+    public void onGlobalLayout() {
+        ListView listView = findViewById(R.id.resolver_list);
+        if (listView != null) {
+            // Items must be focusable for rotary.
+            listView.setItemsCanFocus(true);
+
+            // Set click listeners for rotary.
+            for (int i = 0; i < listView.getChildCount(); i++) {
+                View element = listView.getChildAt(i);
+                element.setOnClickListener(view -> {
+                    int position = listView.getPositionForView(view);
+                    long id = listView.getItemIdAtPosition(position);
+                    listView.performItemClick(view, position, id);
+                });
+            }
+        }
+    }
+}
diff --git a/packages/CarShell/Android.bp b/packages/CarShell/Android.bp
new file mode 100644
index 0000000..93fa7b4
--- /dev/null
+++ b/packages/CarShell/Android.bp
@@ -0,0 +1,11 @@
+android_app {
+    name: "CarShell",
+    srcs: ["src/**/*.java"],
+    // Although it has carshell name, it add permission to shell package
+    required: ["allowed_privapp_com.android.carshell"],
+    platform_apis: true,
+    certificate: "platform",
+    overrides: ["Shell"],
+    privileged: true,
+    static_libs: ["Shell-package-library"]
+}
diff --git a/packages/CarShell/AndroidManifest.xml b/packages/CarShell/AndroidManifest.xml
new file mode 100644
index 0000000..4188d5e
--- /dev/null
+++ b/packages/CarShell/AndroidManifest.xml
@@ -0,0 +1,38 @@
+<?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.
+ */
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="com.android.shell"
+        coreApp="true"
+        android:sharedUserId="android.uid.shell"
+        >
+    <!-- To pass GtsInstallPackagesWhitelistDeviceTestCases b/173156153 -->
+    <uses-permission android:name="android.permission.INSTALL_PACKAGES" />
+    <!-- Permission required for ATS tests - AtsCarHostTestCases, AtsCarDeviceApp -->
+    <uses-permission android:name="android.car.permission.CAR_DRIVING_STATE" />
+    <!-- Permission required for ATS tests - AtsDeviceInfo, AtsAudioDeviceTestCases -->
+    <uses-permission android:name="android.car.permission.CAR_CONTROL_AUDIO_VOLUME" />
+    <!-- Permission required for ATS tests - AtsCarTests#CarAudioManagerSystemTest -->
+    <uses-permission android:name="android.car.permission.CAR_CONTROL_AUDIO_SETTINGS" />
+    <!-- Permission required for ATS tests - AtsCarTests#CarPropertyManagerTest-->
+    <uses-permission android:name="android.car.permission.CONTROL_CAR_CLIMATE" />
+    <!-- Permission required for ATS tests - AtsCarTests#CarAudioManagerSystemTest -->
+    <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL" />
+    <!-- Permissions required for ATS tests - AtsDeviceInfo -->
+    <uses-permission android:name="android.car.permission.CAR_DIAGNOSTICS" />
+</manifest>
diff --git a/service/res/values-af/strings.xml b/service/res/values-af/strings.xml
index 6c1a292..26166a9 100644
--- a/service/res/values-af/strings.xml
+++ b/service/res/values-af/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">"toegang tot motor se inligting"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"toegang kry tot jou motor se inligting."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Motorinligting"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"het toegang tot jou motor se inligting"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"toegang tot motor se kamera"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Toegang tot motor se kamera(s)."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"toegang tot motor se dryfkraginligting"</string>
diff --git a/service/res/values-am/strings.xml b/service/res/values-am/strings.xml
index 3899911..cd8f9f2 100644
--- a/service/res/values-am/strings.xml
+++ b/service/res/values-am/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="2215078736675564541">"የመኪና መረጃ"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"የመኪናዎን መረጃ መድረስ"</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>
diff --git a/service/res/values-ar/strings.xml b/service/res/values-ar/strings.xml
index 3b3015e..c2734e8 100644
--- a/service/res/values-ar/strings.xml
+++ b/service/res/values-ar/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="2215078736675564541">"معلومات السيارة"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"الوصول إلى معلومات سيارتك"</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>
diff --git a/service/res/values-as/strings.xml b/service/res/values-as/strings.xml
index 811d8f7..ca5a1ac 100644
--- a/service/res/values-as/strings.xml
+++ b/service/res/values-as/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="2215078736675564541">"গাড়ীৰ তথ্য"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"আপোনাৰ গাড়ীৰ তথ্য এক্সেছ কৰিব পাৰে"</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>
diff --git a/service/res/values-az/strings.xml b/service/res/values-az/strings.xml
index fbdd24c..4074b9d 100644
--- a/service/res/values-az/strings.xml
+++ b/service/res/values-az/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">"avtomobilin məlumatlarına giriş"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Avtomobil məlumatlarına giriş."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Avtomobil məlumatı"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"avtomobil məlumatına giriş"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"avtomobilin kamerasına giriş"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Avtomobilin kameralarına giriş."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"avtomobilin enerji məlumatlarına giriş"</string>
diff --git a/service/res/values-b+sr+Latn/strings.xml b/service/res/values-b+sr+Latn/strings.xml
index 25bffaa..c705c01 100644
--- a/service/res/values-b+sr+Latn/strings.xml
+++ b/service/res/values-b+sr+Latn/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">"pristup podacima o automobilu"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Pristupi informacijama o automobilu."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Informacije o automobilu"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"pristupa informacijama o automobilu"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"pristup kameri automobila"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Pristupi kamerama automobila."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"pristup podacima o energiji automobila"</string>
diff --git a/service/res/values-be/strings.xml b/service/res/values-be/strings.xml
index 9df2dc5..69affd1 100644
--- a/service/res/values-be/strings.xml
+++ b/service/res/values-be/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="2215078736675564541">"Інфармацыя пра аўтамабіль"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"доступ да інфармацыі пра ваш аўтамабіль"</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>
diff --git a/service/res/values-bg/strings.xml b/service/res/values-bg/strings.xml
index e8be5e2..b190e39 100644
--- a/service/res/values-bg/strings.xml
+++ b/service/res/values-bg/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="2215078736675564541">"Информация за автомобила"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"достъп до информацията за автомобила ви"</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>
diff --git a/service/res/values-bn/strings.xml b/service/res/values-bn/strings.xml
index 2a2dd4f..a25cf0d 100644
--- a/service/res/values-bn/strings.xml
+++ b/service/res/values-bn/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="2215078736675564541">"গাড়ির তথ্য"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"আপনার গাড়ির তথ্য অ্যাক্সেস করুন"</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>
diff --git a/service/res/values-bs/strings.xml b/service/res/values-bs/strings.xml
index a8779ca..6a7ba92 100644
--- a/service/res/values-bs/strings.xml
+++ b/service/res/values-bs/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">"pristupiti informacijama o automobilu"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"pristupiti informacijama o automobilu."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Informacije o automobilu"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"pristupiti informacijama o automobilu"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"pristupiti kameri automobila"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Pristupiti kameri(ama) automobila."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"pristupiti informacijama o energiji automobila"</string>
diff --git a/service/res/values-ca/strings.xml b/service/res/values-ca/strings.xml
index 6bf7504..6285db0 100644
--- a/service/res/values-ca/strings.xml
+++ b/service/res/values-ca/strings.xml
@@ -16,16 +16,16 @@
 
 <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">"accedeix a la informació del cotxe"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Accedir a la informació del cotxe"</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Informació del cotxe"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"accedir a la informació del cotxe"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"accedeix a la càmera del cotxe"</string>
     <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_adjust_range_remaining" msgid="839033553999920138">"ajustar l\'autonomia restant del cotxe"</string>
     <string name="car_permission_desc_adjust_range_remaining" msgid="2369321650437370673">"Ajustar el valor de l\'autonomia restant 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_hvac" msgid="1499454192558727843">"accedir al sistema de climatització del cotxe"</string>
+    <string name="car_permission_desc_hvac" msgid="3754229695589774195">"Accedir al sistema de climatització 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>
diff --git a/service/res/values-cs/strings.xml b/service/res/values-cs/strings.xml
index 4db0481..8870462 100644
--- a/service/res/values-cs/strings.xml
+++ b/service/res/values-cs/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">"přístup k informacím o autě"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Přístup k informacím o autě"</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Informace o autě"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"přístup k informacím o vašem autě"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"přístup ke kameře auta"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Přístup ke kamerám auta."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"přístup k údajům o energii auta"</string>
diff --git a/service/res/values-da/strings.xml b/service/res/values-da/strings.xml
index 40b134c..f7b7e35 100644
--- a/service/res/values-da/strings.xml
+++ b/service/res/values-da/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">"få adgang til bilens oplysninger"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Få adgang til oplysninger om din bil."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Biloplysninger"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"få adgang til bilens oplysninger"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"få adgang til bilens kamera"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Få adgang til bilens kameraer."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"få adgang til oplysninger om bilens energiforbrug"</string>
diff --git a/service/res/values-de/strings.xml b/service/res/values-de/strings.xml
index c0aa8da..8d3b4c9 100644
--- a/service/res/values-de/strings.xml
+++ b/service/res/values-de/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">"auf Fahrzeuginformationen zuzugreifen"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Auf Fahrzeuginformationen zugreifen."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Fahrzeuginformationen"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"Zugriff auf Informationen deines Autos"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"auf die Autokamera zuzugreifen"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Auf Autokamera(s) zugreifen."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"auf Energieinformationen des Autos zuzugreifen"</string>
diff --git a/service/res/values-el/strings.xml b/service/res/values-el/strings.xml
index 3d4fc20..ba2637e 100644
--- a/service/res/values-el/strings.xml
+++ b/service/res/values-el/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="2215078736675564541">"Πληροφορίες αυτοκινήτου"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"πρόσβαση στις πληροφορίες του αυτοκινήτου σας"</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>
diff --git a/service/res/values-en-rAU/strings.xml b/service/res/values-en-rAU/strings.xml
index cae8100..e071dcb 100644
--- a/service/res/values-en-rAU/strings.xml
+++ b/service/res/values-en-rAU/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">"access car’s information"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Access your car’s information."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Car information"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"access your car’s information"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"access car’s camera"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Access your car’s camera(s)."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"access car’s energy information"</string>
diff --git a/service/res/values-en-rCA/strings.xml b/service/res/values-en-rCA/strings.xml
index cae8100..e071dcb 100644
--- a/service/res/values-en-rCA/strings.xml
+++ b/service/res/values-en-rCA/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">"access car’s information"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Access your car’s information."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Car information"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"access your car’s information"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"access car’s camera"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Access your car’s camera(s)."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"access car’s energy information"</string>
diff --git a/service/res/values-en-rGB/strings.xml b/service/res/values-en-rGB/strings.xml
index cae8100..e071dcb 100644
--- a/service/res/values-en-rGB/strings.xml
+++ b/service/res/values-en-rGB/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">"access car’s information"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Access your car’s information."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Car information"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"access your car’s information"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"access car’s camera"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Access your car’s camera(s)."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"access car’s energy information"</string>
diff --git a/service/res/values-en-rIN/strings.xml b/service/res/values-en-rIN/strings.xml
index cae8100..e071dcb 100644
--- a/service/res/values-en-rIN/strings.xml
+++ b/service/res/values-en-rIN/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">"access car’s information"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Access your car’s information."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Car information"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"access your car’s information"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"access car’s camera"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Access your car’s camera(s)."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"access car’s energy information"</string>
diff --git a/service/res/values-en-rXC/strings.xml b/service/res/values-en-rXC/strings.xml
index 840f717..de7e93b 100644
--- a/service/res/values-en-rXC/strings.xml
+++ b/service/res/values-en-rXC/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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‎‏‎‎‎‏‎‎‏‎‎‏‏‏‏‏‎‎‏‏‎‎‎‎‏‏‎‏‎‏‏‏‎‎‏‏‏‎‎‎‎‎‎‎‎‏‏‎‎‏‎‎‎‎access car’s information‎‏‎‎‏‎"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‎‎‎‏‎‏‎‏‎‎‎‎‏‎‏‏‏‎‎‏‎‏‏‎‏‎‏‏‏‏‎‏‎‎‎‎‏‎‎‏‎‏‏‏‎‏‏‏‎‏‎‏‎Access your car’s information.‎‏‎‎‏‎"</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‏‎‎‎‎‎‎‎‎‎‎‎‎‏‎‎‎‏‎‎‎‏‎‏‏‎‏‎‏‏‏‏‏‏‏‏‎‏‎Car information‎‏‎‎‏‎"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‏‏‏‎‎‎‏‏‏‏‎‎‏‎‏‎‏‏‏‎‏‏‎‎‏‏‏‏‎‎‏‎‏‏‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎access your car’s information‎‏‎‎‏‎"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‏‏‎‏‎‎‎‏‎‏‏‎‏‎‎‏‎‎‏‎‎‏‏‏‎‏‎‎‎‏‏‏‎‏‎‏‏‎‎‎‏‎‎‎‏‏‎‏‏‎‏‏‎‎‎access car’s camera‎‏‎‎‏‎"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‏‎‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‎‏‎‎‏‏‎‎‏‏‏‏‎‏‎‏‏‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎Access your car’s camera(s).‎‏‎‎‏‎"</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‏‎‎‏‎‏‎‎‏‎‎‎‏‏‎‎‎‎‎‎‏‏‏‎‎‎‏‎‏‎‏‏‏‏‎‏‎‎‏‎‎‏‎‎‎‏‏‏‏‎‏‏‎‎access car’s energy information‎‏‎‎‏‎"</string>
diff --git a/service/res/values-es-rUS/strings.xml b/service/res/values-es-rUS/strings.xml
index 85ccfab..c29e6b8 100644
--- a/service/res/values-es-rUS/strings.xml
+++ b/service/res/values-es-rUS/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 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" msgid="2215078736675564541">"Información del auto"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"acceder a la información del vehículo"</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>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"acceder a información de la potencia del vehículo"</string>
diff --git a/service/res/values-es/strings.xml b/service/res/values-es/strings.xml
index 97d252b..f86d01f 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 los datos del coche"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Acceder a los datos del coche."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Información sobre el coche"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"acceder a los datos de tu 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>
diff --git a/service/res/values-et/strings.xml b/service/res/values-et/strings.xml
index 982d219..6e959f2 100644
--- a/service/res/values-et/strings.xml
+++ b/service/res/values-et/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">"juurdepääs auto teabele"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Juurdepääs auto teabele."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Auto teave"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"Juurdepääs auto teabele"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"juurdepääs auto kaamerale"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Juurdepääs auto kaameratele."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"juurdepääs auto energiateabele"</string>
diff --git a/service/res/values-eu/strings.xml b/service/res/values-eu/strings.xml
index 5a97151..a71909c 100644
--- a/service/res/values-eu/strings.xml
+++ b/service/res/values-eu/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">"atzitu autoari buruzko informazioa"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Atzitu autoari buruzko informazioa."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Autoari buruzko informazioa"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"autoari buruzko informazioa atzi dezake"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"atzitu autoaren kamera"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Atzitu autoaren kamerak."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"atzitu autoaren energiari buruzko informazioa"</string>
@@ -55,7 +55,7 @@
     <string name="car_permission_car_navigation_manager" msgid="5895461364007854077">"Nabigazio-kudeatzailea"</string>
     <string name="car_permission_desc_car_navigation_manager" msgid="6188751054665471537">"Jakinarazi nabigazio-datuak instrumentu lukuari"</string>
     <string name="car_permission_car_display_in_cluster" msgid="4005987646292458684">"Zuzeneko errendatzea instrumentu lukuan"</string>
-    <string name="car_permission_desc_car_display_in_cluster" msgid="2668300546822672927">"Baimendu aplikazioari instrumentu lukuan bistaratu beharreko jarduerak erabakitzea"</string>
+    <string name="car_permission_desc_car_display_in_cluster" msgid="2668300546822672927">"Eman instrumentu lukuan bistaratu beharreko jarduerak azaltzeko baimena aplikazioari"</string>
     <string name="car_permission_car_cluster_control" msgid="1382247204230165674">"Instrumentu lukua kontrolatzeko aukera"</string>
     <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>
diff --git a/service/res/values-fa/strings.xml b/service/res/values-fa/strings.xml
index cc05861..f90bde2 100644
--- a/service/res/values-fa/strings.xml
+++ b/service/res/values-fa/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="2215078736675564541">"اطلاعات خودرو"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"دسترسی به اطلاعات خودروی شما"</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>
diff --git a/service/res/values-fi/strings.xml b/service/res/values-fi/strings.xml
index e03f38c..4836e73 100644
--- a/service/res/values-fi/strings.xml
+++ b/service/res/values-fi/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">"Pääsy auton tietoihin"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"nähdä auton tiedot"</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Auton tiedot"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"käyttää auton tietoja"</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>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"käyttää auton energiatietoja"</string>
diff --git a/service/res/values-fr-rCA/strings.xml b/service/res/values-fr-rCA/strings.xml
index 4bfbde2..d32dcd5 100644
--- a/service/res/values-fr-rCA/strings.xml
+++ b/service/res/values-fr-rCA/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">"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" msgid="2215078736675564541">"Renseignements sur la voiture"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"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>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"accéder aux renseignements énergétiques de la voiture"</string>
diff --git a/service/res/values-fr/strings.xml b/service/res/values-fr/strings.xml
index b1e67e4..089a528 100644
--- a/service/res/values-fr/strings.xml
+++ b/service/res/values-fr/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">"Accéder aux informations relatives à la voiture"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Accéder aux informations relatives à la voiture."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Informations relatives à la voiture"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"accéder aux informations concernant votre 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>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"Accéder aux informations relatives à l\'énergie de la voiture"</string>
diff --git a/service/res/values-gl/strings.xml b/service/res/values-gl/strings.xml
index 7a6eaa9..40f5ae0 100644
--- a/service/res/values-gl/strings.xml
+++ b/service/res/values-gl/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 información do coche"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Acceder a información do coche."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Información do coche"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"acceder á información do coche"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"acceder á cámara do coche"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Acceder ás cámaras do coche."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"acceder a información sobre o nivel de enerxía do coche"</string>
diff --git a/service/res/values-gu/strings.xml b/service/res/values-gu/strings.xml
index 3303fce..f13debe 100644
--- a/service/res/values-gu/strings.xml
+++ b/service/res/values-gu/strings.xml
@@ -16,8 +16,9 @@
 
 <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="2215078736675564541">"કારની માહિતી"</string>
+    <!-- no translation found for car_permission_desc (3584369074931334964) -->
+    <skip />
     <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>
diff --git a/service/res/values-hi/strings.xml b/service/res/values-hi/strings.xml
index a70c77d..ffd6eb5 100644
--- a/service/res/values-hi/strings.xml
+++ b/service/res/values-hi/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="2215078736675564541">"कार की जानकारी"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"अपनी कार की जानकारी ऐक्सेस करें"</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>
diff --git a/service/res/values-hr/strings.xml b/service/res/values-hr/strings.xml
index 2f9c2b0..ed792ac 100644
--- a/service/res/values-hr/strings.xml
+++ b/service/res/values-hr/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">"pristupiti podacima o automobilu"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"pristupiti podacima o automobilu"</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"podaci o automobilu"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"pristupiti podacima o automobilu"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"pristupiti automobilskoj kameri"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"pristupiti kamerama automobila"</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"pristupiti podacima o energiji automobila"</string>
diff --git a/service/res/values-hu/strings.xml b/service/res/values-hu/strings.xml
index 0a3950f..5b821c8 100644
--- a/service/res/values-hu/strings.xml
+++ b/service/res/values-hu/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">"hozzáférhet az autó adataihoz"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Hozzáférhet az autó adataihoz."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Az autó adatai"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"hozzáférhet az autó adataihoz"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"hozzáférhet az autó kamerájához"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Hozzáférhet az autó kameráihoz."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"hozzáférhet az autó energiafelhasználására vonatkozó adatokhoz"</string>
diff --git a/service/res/values-hy/strings.xml b/service/res/values-hy/strings.xml
index 80f3c91..8ab826e 100644
--- a/service/res/values-hy/strings.xml
+++ b/service/res/values-hy/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="2215078736675564541">"Տեղեկություններ մեքենայի մասին"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"օգտագործել մեքենայի մասին տեղեկությունները"</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>
diff --git a/service/res/values-in/strings.xml b/service/res/values-in/strings.xml
index 3f35edd..a343735 100644
--- a/service/res/values-in/strings.xml
+++ b/service/res/values-in/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">"mengakses informasi mobil"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Mengakses informasi mobil Anda."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Informasi mobil"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"mengakses informasi mobil Anda"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"mengakses kamera mobil"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Mengakses kamera mobil Anda."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"mengakses informasi energi mobil"</string>
diff --git a/service/res/values-is/strings.xml b/service/res/values-is/strings.xml
index 5a10627..62c33ec 100644
--- a/service/res/values-is/strings.xml
+++ b/service/res/values-is/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">"fá aðgang að upplýsingum bílsins"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Fá aðgang að upplýsingum um bílinn."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Upplýsingar um bíl"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"fá aðgang að upplýsingum um bílinn"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"fá aðgang að myndavél bílsins"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Fá aðgang að myndavél(um) bílsins."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"fá aðgang að upplýsingum um orkunotkun bílsins"</string>
diff --git a/service/res/values-it/strings.xml b/service/res/values-it/strings.xml
index da6720a..abb0d4f 100644
--- a/service/res/values-it/strings.xml
+++ b/service/res/values-it/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">"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" msgid="2215078736675564541">"Informazioni sull\'auto"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"Accedi alle informazioni della tua auto"</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>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"Accesso alle informazioni sulla carica dell\'automobile"</string>
diff --git a/service/res/values-iw/strings.xml b/service/res/values-iw/strings.xml
index de220ec..b9c4173 100644
--- a/service/res/values-iw/strings.xml
+++ b/service/res/values-iw/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="2215078736675564541">"פרטי הרכב"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"גישה אל פרטי המכונית"</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>
diff --git a/service/res/values-ja/strings.xml b/service/res/values-ja/strings.xml
index 10db486..0e1179c 100644
--- a/service/res/values-ja/strings.xml
+++ b/service/res/values-ja/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="2215078736675564541">"自動車の情報"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"この車の情報へのアクセス"</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>
diff --git a/service/res/values-ka/strings.xml b/service/res/values-ka/strings.xml
index b4cd61a..9be90e6 100644
--- a/service/res/values-ka/strings.xml
+++ b/service/res/values-ka/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="2215078736675564541">"მანქანის ინფორმაცია"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"თქვენი მანქანის შესახებ ინფორმაციაზე წვდომა"</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>
diff --git a/service/res/values-kk/strings.xml b/service/res/values-kk/strings.xml
index 14e925e..7032f80 100644
--- a/service/res/values-kk/strings.xml
+++ b/service/res/values-kk/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="2215078736675564541">"Көлік туралы ақпарат"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"көліктің ақпаратын көре алады"</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>
diff --git a/service/res/values-km/strings.xml b/service/res/values-km/strings.xml
index cec9d5d..c978e94 100644
--- a/service/res/values-km/strings.xml
+++ b/service/res/values-km/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="2215078736675564541">"ព័ត៌មាន​រថយន្ត"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"ចូលប្រើ​ព័ត៌មានអំពី​រថយន្ត​របស់អ្នក"</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>
diff --git a/service/res/values-kn/strings.xml b/service/res/values-kn/strings.xml
index 1ee0f44..14a7f7e 100644
--- a/service/res/values-kn/strings.xml
+++ b/service/res/values-kn/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="2215078736675564541">"ಕಾರಿನ ಮಾಹಿತಿ"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"ನಿಮ್ಮ ಕಾರ್‌ನ ಮಾಹಿತಿಯನ್ನು ಪ್ರವೇಶಿಸಿ"</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>
@@ -57,7 +57,7 @@
     <string name="car_permission_car_display_in_cluster" msgid="4005987646292458684">"ಸಲಕರಣೆ ಸಂಚಯಕ್ಕೆ ನೇರ ವರ್ಗಾವಣೆ"</string>
     <string name="car_permission_desc_car_display_in_cluster" msgid="2668300546822672927">"ಸಲಕರಣೆ ಸಂಚಯದಲ್ಲಿ ಚಟುವಟಿಕೆಗಳ ಘೋಷಣೆಯನ್ನು ಪ್ರದರ್ಶಿಸಲು ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುವು ಮಾಡಿ"</string>
     <string name="car_permission_car_cluster_control" msgid="1382247204230165674">"ಸಲಕರಣೆ ಸಂಚಯ ನಿಯಂತ್ರಣ"</string>
-    <string name="car_permission_desc_car_cluster_control" msgid="9222776665281176031">"ಸಲಕರಣೆ ಸಂಚಯದಲ್ಲಿ ಆಪ್‌ಗಳನ್ನು ಪ್ರಾರಂಭಿಸಿ"</string>
+    <string name="car_permission_desc_car_cluster_control" msgid="9222776665281176031">"ಸಲಕರಣೆ ಸಂಚಯದಲ್ಲಿ ಆ್ಯಪ್‌ಗಳನ್ನು ಪ್ರಾರಂಭಿಸಿ"</string>
     <string name="car_permission_label_bind_instrument_cluster_rendering" msgid="8627480897198377418">"ಸಲಕರಣೆ ಸಂಚಯ ತೋರಿಸು"</string>
     <string name="car_permission_desc_bind_instrument_cluster_rendering" msgid="5073596870485006783">"ಸಲಕರಣೆ ಸಂಚಯ ಮಾಹಿತಿಯನ್ನು ಸ್ವೀಕರಿಸು"</string>
     <string name="car_permission_label_car_ux_restrictions_configuration" msgid="6801393970411049725">"UX ನಿರ್ಬಂಧಗಳ ಸಂರಚನೆ"</string>
diff --git a/service/res/values-ko/strings.xml b/service/res/values-ko/strings.xml
index 2e1e845..05e1ad5 100644
--- a/service/res/values-ko/strings.xml
+++ b/service/res/values-ko/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="2215078736675564541">"차량 정보"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"자동차 정보에 액세스"</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>
diff --git a/service/res/values-ky/strings.xml b/service/res/values-ky/strings.xml
index 294da79..c77279e 100644
--- a/service/res/values-ky/strings.xml
+++ b/service/res/values-ky/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="2215078736675564541">"Унаа тууралуу маалымат"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"унааңыз тууралуу маалымат алынат"</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>
diff --git a/service/res/values-lo/strings.xml b/service/res/values-lo/strings.xml
index 8691783..8e985b0 100644
--- a/service/res/values-lo/strings.xml
+++ b/service/res/values-lo/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="2215078736675564541">"ຂໍ້ມູນລົດ"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"ເຂົ້າເຖິງຂໍ້ມູນລົດຂອງທ່ານ"</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>
diff --git a/service/res/values-lt/strings.xml b/service/res/values-lt/strings.xml
index 3cc8d44..e0397f8 100644
--- a/service/res/values-lt/strings.xml
+++ b/service/res/values-lt/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">"pasiekti automobilio informaciją"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Pasiekti automobilio informaciją."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Automobilio informacija"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"pasiekti automobilio informaciją"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"pasiekti automobilio kamerą"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Pasiekti automobilio fotoaparatą (-us)."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"pasiekti automobilio energijos informaciją"</string>
diff --git a/service/res/values-lv/strings.xml b/service/res/values-lv/strings.xml
index aecbeb4..596967d 100644
--- a/service/res/values-lv/strings.xml
+++ b/service/res/values-lv/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">"piekļūt informācijai par automašīnu"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Piekļūt informācijai par automašīnu."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Informācija par automašīnu"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"piekļūt automašīnas informācijai"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"piekļūt automašīnas kamerai"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Piekļūt automašīnas kamerai(-ām)."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"piekļūt informācijai par automašīnas degvielas/uzlādes līmeni"</string>
diff --git a/service/res/values-mk/strings.xml b/service/res/values-mk/strings.xml
index 8945ff6..c66941b 100644
--- a/service/res/values-mk/strings.xml
+++ b/service/res/values-mk/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="2215078736675564541">"Податоци за автомобилот"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"пристапува до податоците за автомобилот"</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>
diff --git a/service/res/values-ml/strings.xml b/service/res/values-ml/strings.xml
index 4e8cf7e..f5e33bd 100644
--- a/service/res/values-ml/strings.xml
+++ b/service/res/values-ml/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="2215078736675564541">"കാർ വിവരങ്ങൾ"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"നിങ്ങളുടെ കാറിന്റെ വിവരങ്ങൾ ആക്‌സസ് ചെയ്യുക"</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>
diff --git a/service/res/values-mn/strings.xml b/service/res/values-mn/strings.xml
index 19d64b6..b1919e5 100644
--- a/service/res/values-mn/strings.xml
+++ b/service/res/values-mn/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="2215078736675564541">"Машины мэдээлэл"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"машиныхаа мэдээлэлд хандана уу"</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>
@@ -52,8 +52,8 @@
     <string name="car_permission_desc_audio_settings" msgid="7192007170677915937">"Машиныхаа аудионы тохиргоог хянана уу."</string>
     <string name="car_permission_label_control_app_blocking" msgid="9112678596919993386">"Апп блоклолт"</string>
     <string name="car_permission_desc_control_app_blocking" msgid="7539378161760696190">"Жолоодох үеийн аппын блоклолтыг хянана уу."</string>
-    <string name="car_permission_car_navigation_manager" msgid="5895461364007854077">"Навигацийн менежер"</string>
-    <string name="car_permission_desc_car_navigation_manager" msgid="6188751054665471537">"Навигацийн өгөгдлийг хяналтын самбарт мэдээлэх"</string>
+    <string name="car_permission_car_navigation_manager" msgid="5895461364007854077">"Навигацын менежер"</string>
+    <string name="car_permission_desc_car_navigation_manager" msgid="6188751054665471537">"Навигацын өгөгдлийг хяналтын самбарт мэдээлэх"</string>
     <string name="car_permission_car_display_in_cluster" msgid="4005987646292458684">"Хяналтын самбарын тайлбарт шууд харуулах"</string>
     <string name="car_permission_desc_car_display_in_cluster" msgid="2668300546822672927">"Үйл ажиллагааг хяналтын самбарт мэдэгдэхийг аппад зөвшөөрөх"</string>
     <string name="car_permission_car_cluster_control" msgid="1382247204230165674">"Хяналтын самбарын хяналт"</string>
diff --git a/service/res/values-mr/strings.xml b/service/res/values-mr/strings.xml
index 4bd5aaf..4a38d85 100644
--- a/service/res/values-mr/strings.xml
+++ b/service/res/values-mr/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="2215078736675564541">"कार माहिती"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"तुमच्या कारची माहिती अ‍ॅक्सेस करणे"</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>
@@ -32,8 +32,8 @@
     <string name="car_permission_desc_speed" msgid="2047965198165448241">"तुमच्या कारची गती अ‍ॅक्सेस करा."</string>
     <string name="car_permission_label_vehicle_dynamics_state" msgid="313779267420048367">"कारची डायनॅमिक स्थिती अ‍ॅक्सेस करा"</string>
     <string name="car_permission_desc_vehicle_dynamics_state" msgid="8891506193446375660">"तुमच्या कारची डायनॅमिक स्थिती अ‍ॅक्सेस करा."</string>
-    <string name="car_permission_label_vendor_extension" msgid="7141601811734127361">"कारचे व्हेंडर चॅनेल अ‍ॅक्सेस करा"</string>
-    <string name="car_permission_desc_vendor_extension" msgid="2970718502334714035">"कारसंबंधी माहितीच्या देवाण-घेवाणीसाठी तुमच्या कारचे विक्रेता चॅनेल अ‍ॅक्सेस करा."</string>
+    <string name="car_permission_label_vendor_extension" msgid="7141601811734127361">"कारचे व्हेंडर चॅनल अ‍ॅक्सेस करा"</string>
+    <string name="car_permission_desc_vendor_extension" msgid="2970718502334714035">"कारसंबंधी माहितीच्या देवाण-घेवाणीसाठी तुमच्या कारचे विक्रेता चॅनल अ‍ॅक्सेस करा."</string>
     <string name="car_permission_label_radio" msgid="6009465291685935112">"कारचा रेडिओ व्यवस्थापित करा"</string>
     <string name="car_permission_desc_radio" msgid="3385999027478186964">"तुमच्या कारचा रेडिओ अ‍ॅक्सेस करा."</string>
     <string name="car_permission_label_projection" msgid="9107156380287576787">"फोनवरून कारच्या डिस्प्लेवर इंटरफेस प्रोजेक्ट करा"</string>
@@ -60,8 +60,8 @@
     <string name="car_permission_desc_car_cluster_control" msgid="9222776665281176031">"इंस्ट्रुमेंट क्लस्टरमध्ये अ‍ॅप्स लाँच करा"</string>
     <string name="car_permission_label_bind_instrument_cluster_rendering" msgid="8627480897198377418">"इंस्ट्रुमेंट क्लस्टर रेंडरिंग"</string>
     <string name="car_permission_desc_bind_instrument_cluster_rendering" msgid="5073596870485006783">"इंस्ट्रुमेंट क्लस्टर डेटा मिळवा"</string>
-    <string name="car_permission_label_car_ux_restrictions_configuration" msgid="6801393970411049725">"UX निर्बंध कॉन्फिगरेशन"</string>
-    <string name="car_permission_desc_car_ux_restrictions_configuration" msgid="5711926927484813777">"UX निर्बंध कॉन्फिगर करा"</string>
+    <string name="car_permission_label_car_ux_restrictions_configuration" msgid="6801393970411049725">"UX निर्बंध कॉंफिगरेशन"</string>
+    <string name="car_permission_desc_car_ux_restrictions_configuration" msgid="5711926927484813777">"UX निर्बंध कॉंफिगर करा"</string>
     <string name="car_permission_label_car_handle_usb_aoap_device" msgid="72783989504378036">"USB डिव्हाइसशी AOAP मोडमध्ये कनेक्ट करा"</string>
     <string name="car_permission_desc_car_handle_usb_aoap_device" msgid="273505990971317034">"अ‍ॅपला डिव्हाइसशी AOAP मोडमध्ये कनेक्ट करण्याची अनुमती देते"</string>
     <string name="car_permission_label_read_car_occupant_awareness_state" msgid="125517953575032758">"ऑक्युपंट अवेअरनेस सिस्टम वाचन अ‍ॅक्सेस"</string>
diff --git a/service/res/values-ms/strings.xml b/service/res/values-ms/strings.xml
index e5d4a9c..52fa9bf 100644
--- a/service/res/values-ms/strings.xml
+++ b/service/res/values-ms/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">"akses maklumat kereta"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Akses maklumat kereta anda."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Maklumat kereta"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"akses maklumat kereta anda"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"akses kamera kereta"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Akses kamera kereta anda."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"akses maklumat tenaga kereta"</string>
diff --git a/service/res/values-my/strings.xml b/service/res/values-my/strings.xml
index fb1aebf..317ae4a 100644
--- a/service/res/values-my/strings.xml
+++ b/service/res/values-my/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="2215078736675564541">"ကားအချက်အလက်"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"သင့်ကား၏ အချက်အလက်များကို အသုံးပြုပါမည်"</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>
diff --git a/service/res/values-nb/strings.xml b/service/res/values-nb/strings.xml
index 5d1fbe6..7bfaa5a 100644
--- a/service/res/values-nb/strings.xml
+++ b/service/res/values-nb/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">"se bilinformasjonen"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Tilgang til informasjon om bilen."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Informasjon om bilen"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"få tilgang til informasjon om bilen din"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"få tilgang til bilkameraet"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Tilgang til bilens kamera(er)."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"få tilgang til bilens energiinformasjon"</string>
diff --git a/service/res/values-ne/strings.xml b/service/res/values-ne/strings.xml
index df9f269..a1102bd 100644
--- a/service/res/values-ne/strings.xml
+++ b/service/res/values-ne/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="2215078736675564541">"कारको जानकारी"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"आफ्नो कारको जानकारी हेर्नुहोस्"</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>
@@ -50,7 +50,7 @@
     <string name="car_permission_desc_mock_vehicle_hal" msgid="5235596491098649155">"आन्तरिक परीक्षण गर्ने प्रयोजनका लागि तपाईंको कारको सवारी साधन HAL को अनुकरण गर्ने।"</string>
     <string name="car_permission_desc_audio_volume" msgid="536626185654307889">"तपाईंको कारको अडियोको भोल्युम नियन्त्रण गर्ने।"</string>
     <string name="car_permission_desc_audio_settings" msgid="7192007170677915937">"आफ्नो कारको अडियोसम्बन्धी सेटिङहरू नियन्त्रण गर्नुहोस्।"</string>
-    <string name="car_permission_label_control_app_blocking" msgid="9112678596919993386">"अनुप्रयोगमाथि रोक लगाउने कार्य"</string>
+    <string name="car_permission_label_control_app_blocking" msgid="9112678596919993386">"एपमाथि रोक लगाउने कार्य"</string>
     <string name="car_permission_desc_control_app_blocking" msgid="7539378161760696190">"सवारी साधन चलाइरहेका बेलामा एपलाई रोक लगाउने प्रक्रिया नियन्त्रण गर्ने।"</string>
     <string name="car_permission_car_navigation_manager" msgid="5895461364007854077">"नेभिगेसन प्रबन्धक"</string>
     <string name="car_permission_desc_car_navigation_manager" msgid="6188751054665471537">"नेभिगेसनसम्बन्धी डेटालाई उपकरणको क्लस्टरमा रिपोर्ट गर्ने"</string>
@@ -73,7 +73,7 @@
     <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="8088902789540147995">"तपाईं सवारी साधन चलाइरहेका बेला यो सुविधा प्रयोग गर्न सक्नुहुन्न"</string>
-    <string name="exit_button_message" msgid="8554690915924055685">"अनुप्रयोगका सुरक्षित सुविधाहरूको प्रयोग गरी फेरि सुरु गर्न <xliff:g id="EXIT_BUTTON">%s</xliff:g> चयन गर्नुहोस्‌।"</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>
diff --git a/service/res/values-nl/strings.xml b/service/res/values-nl/strings.xml
index da7bc47..537e26b 100644
--- a/service/res/values-nl/strings.xml
+++ b/service/res/values-nl/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">"Toegang tot gegevens van auto"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"toegang krijgen tot je autogegevens."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Autogegevens"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"toegang tot gegevens van je auto"</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>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"toegang tot informatie over energieniveau van auto"</string>
diff --git a/service/res/values-or/strings.xml b/service/res/values-or/strings.xml
index 9851358..107034a 100644
--- a/service/res/values-or/strings.xml
+++ b/service/res/values-or/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="2215078736675564541">"କାର୍‌ର ସୂଚନା"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"ଆପଣଙ୍କ କାରର ସୂଚନା ଆକ୍ସେସ୍ କରନ୍ତୁ"</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>
diff --git a/service/res/values-pa/strings.xml b/service/res/values-pa/strings.xml
index d0e0ee5..63ea952 100644
--- a/service/res/values-pa/strings.xml
+++ b/service/res/values-pa/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="2215078736675564541">"ਕਾਰ ਦੀ ਜਾਣਕਾਰੀ"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"ਆਪਣੀ ਕਾਰ ਦੀ ਜਾਣਕਾਰੀ ਤੱਕ ਪਹੁੰਚ ਕਰੋ"</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>
diff --git a/service/res/values-pl/strings.xml b/service/res/values-pl/strings.xml
index fa33cd3..add44ee 100644
--- a/service/res/values-pl/strings.xml
+++ b/service/res/values-pl/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">"dostęp do informacji o samochodzie"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Dostęp do informacji o samochodzie."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Informacje o samochodzie"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"dostęp do informacji o samochodzie"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"dostęp do kamery samochodu"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Dostęp do kamer samochodu."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"dostęp do informacji o zasilaniu w samochodzie"</string>
diff --git a/service/res/values-pt-rPT/strings.xml b/service/res/values-pt-rPT/strings.xml
index 9d7ae8f..d98c358 100644
--- a/service/res/values-pt-rPT/strings.xml
+++ b/service/res/values-pt-rPT/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">"aceder às informações do automóvel"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Aceda às informações do seu automóvel."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Informações do automóvel"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"aceder às informações do seu automóvel"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"aceder à câmara do automóvel"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Aceda à(s) câmara(s) do automóvel."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"aceder às informações de energia do automóvel"</string>
diff --git a/service/res/values-pt/strings.xml b/service/res/values-pt/strings.xml
index 3cc6b05..fcfb7d8 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 informações do carro"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Acessar informações do carro."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Informações do carro"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"acessar as 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>
diff --git a/service/res/values-ro/strings.xml b/service/res/values-ro/strings.xml
index cae9576..380c620 100644
--- a/service/res/values-ro/strings.xml
+++ b/service/res/values-ro/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">"Accesează informațiile despre mașină"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Accesează informațiile despre mașină."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Accesează informațiile despre mașină"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"să acceseze informațiile despre mașină"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"Accesează camera mașinii"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Accesează camerele mașinii."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"Accesează informațiile despre nivelul de energie al mașinii"</string>
diff --git a/service/res/values-ru/strings.xml b/service/res/values-ru/strings.xml
index c9f7231..6776a59 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="2215078736675564541">"Данные автомобиля"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"Доступ к данным автомобиля"</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>
diff --git a/service/res/values-si/strings.xml b/service/res/values-si/strings.xml
index 653e7fd..a6192ab 100644
--- a/service/res/values-si/strings.xml
+++ b/service/res/values-si/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="2215078736675564541">"මෝටර් රථයේ තොරතුරු"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"ඔබගේ මෝටර් රථයේ තොරතුරුවලට ප්‍රවේශ වීම"</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>
diff --git a/service/res/values-sk/strings.xml b/service/res/values-sk/strings.xml
index 3154c8b..ad03f4f 100644
--- a/service/res/values-sk/strings.xml
+++ b/service/res/values-sk/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">"získať prístup k informáciám o aute"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Získajte prístup k informáciám o aute."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Informácie o aute"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"prístup k údajom o aute"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"získať prístup ku kamere auta"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Získajte prístup ku kamerám auta."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"získať prístup k informáciám o energii auta"</string>
diff --git a/service/res/values-sl/strings.xml b/service/res/values-sl/strings.xml
index 0e37f92..ed51a3e 100644
--- a/service/res/values-sl/strings.xml
+++ b/service/res/values-sl/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">"dostop do podatkov o avtomobilu"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Dostop do podatkov o avtomobilu."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Podatki o avtomobilu"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"dostop do podatkov o avtomobilu"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"dostop do kamere avtomobila"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Dostop do kamer avtomobila."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"dostop do podatkov o energiji avtomobila"</string>
diff --git a/service/res/values-sq/strings.xml b/service/res/values-sq/strings.xml
index 89b6944..8453111 100644
--- a/service/res/values-sq/strings.xml
+++ b/service/res/values-sq/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">"qasu tek informacionet e makinës"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Qasu në informacionet e makinës."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Informacionet e makinës"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"të qaset në informacionet e makinës"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"qasu te kamera e makinës"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Qasu te kamera(t) e makinës."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"qasu tek informacionet e energjisë së makinës"</string>
diff --git a/service/res/values-sr/strings.xml b/service/res/values-sr/strings.xml
index c8505b4..144fed9 100644
--- a/service/res/values-sr/strings.xml
+++ b/service/res/values-sr/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="2215078736675564541">"Информације о аутомобилу"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"приступа информацијама о аутомобилу"</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>
diff --git a/service/res/values-sv/strings.xml b/service/res/values-sv/strings.xml
index a7320db..a82846f 100644
--- a/service/res/values-sv/strings.xml
+++ b/service/res/values-sv/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">"åtkomst till information om bilen"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Åtkomst till information om bilen."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Information om bilen"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"åtkomst till information om bilen"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"åtkomst till bilens kamera"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Åtkomst till bilens kamera eller kameror."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"åtkomst till information om bilens drivmedel"</string>
diff --git a/service/res/values-sw/strings.xml b/service/res/values-sw/strings.xml
index 85eadfd..a9aa940 100644
--- a/service/res/values-sw/strings.xml
+++ b/service/res/values-sw/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">"kufikia maelezo ya gari"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Kufikia maelezo ya gari lako"</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Maelezo ya gari"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"kufikia maelezo ya gari lako"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"kufikia kamera ya gari"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Kufikia kamera ya gari lako."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"kufikia maelezo ya nishati ya gari"</string>
diff --git a/service/res/values-ta/strings.xml b/service/res/values-ta/strings.xml
index 63c4493..a7382cc 100644
--- a/service/res/values-ta/strings.xml
+++ b/service/res/values-ta/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="2215078736675564541">"காரின் தகவல்"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"காரின் தகவலை அணுகும்"</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>
diff --git a/service/res/values-te/strings.xml b/service/res/values-te/strings.xml
index d886359..165c41e 100644
--- a/service/res/values-te/strings.xml
+++ b/service/res/values-te/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="2215078736675564541">"కారు సమాచారం"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"మీ కారుకు సంబంధించిన సమాచారాన్ని యాక్సెస్ చేయండి"</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>
diff --git a/service/res/values-th/strings.xml b/service/res/values-th/strings.xml
index 62b454a..ceb1f62 100644
--- a/service/res/values-th/strings.xml
+++ b/service/res/values-th/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="2215078736675564541">"ข้อมูลรถยนต์"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"เข้าถึงข้อมูลรถยนต์ของคุณ"</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>
diff --git a/service/res/values-tl/strings.xml b/service/res/values-tl/strings.xml
index 47f4172..9d5f66f 100644
--- a/service/res/values-tl/strings.xml
+++ b/service/res/values-tl/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">"i-access ang impormasyon ng sasakyan"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"I-access ang impormasyon ng iyong sasakyan."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Impormasyon ng sasakyan"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"i-access ang impormasyon ng iyong sasakyan"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"i-access ang camera ng sasakyan"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"I-access ang (mga) camera ng iyong sasakyan."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"i-access ang impormasyon ng enerhiya ng sasakyan"</string>
diff --git a/service/res/values-tr/strings.xml b/service/res/values-tr/strings.xml
index 4419f98..3ebe218 100644
--- a/service/res/values-tr/strings.xml
+++ b/service/res/values-tr/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">"araç bilgilerine erişim"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Aracınızın bilgilerine erişim."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Araç bilgileri"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"arabanızın bilgilerine erişin"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"aracın kamerasına erişim"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Aracınızın kameralarına erişim."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"aracın enerji bilgilerine erişim"</string>
diff --git a/service/res/values-uk/strings.xml b/service/res/values-uk/strings.xml
index a7f6ef4..b931007 100644
--- a/service/res/values-uk/strings.xml
+++ b/service/res/values-uk/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="2215078736675564541">"Інформація про автомобіль"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"доступ до даних автомобіля"</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>
diff --git a/service/res/values-ur/strings.xml b/service/res/values-ur/strings.xml
index 01b7626..b1939e9 100644
--- a/service/res/values-ur/strings.xml
+++ b/service/res/values-ur/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="2215078736675564541">"کار کی معلومات"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"اپنی کار کی معلومات تک رسائی حاصل کریں"</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>
diff --git a/service/res/values-uz/strings.xml b/service/res/values-uz/strings.xml
index 7f9e006..029264c 100644
--- a/service/res/values-uz/strings.xml
+++ b/service/res/values-uz/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">"avtomobil haqidagi axborotga kirish"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Avtomobil axborotigaga kirish."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Avtomobil haqida axborot"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"avtomobilga oid axborotga kirish"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"avtomobilning kamerasiga kirish"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Avtomobil kamerasidan foydalanish"</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"avtomobilning energiya manbalari haqidagi axborotga kirish"</string>
diff --git a/service/res/values-vi/strings.xml b/service/res/values-vi/strings.xml
index 7426314..9e77a3c 100644
--- a/service/res/values-vi/strings.xml
+++ b/service/res/values-vi/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">"truy cập vào thông tin về ô tô"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Truy cập vào thông tin ô tô của bạn."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Thông tin về ô tô"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"truy cập vào thông tin của ô tô"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"truy cập vào camera ô tô"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Truy cập vào (các) camera trên ô tô."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"truy cập vào thông tin về năng lượng của ô tô"</string>
diff --git a/service/res/values-zh-rCN/strings.xml b/service/res/values-zh-rCN/strings.xml
index 8357acc..3c46964 100644
--- a/service/res/values-zh-rCN/strings.xml
+++ b/service/res/values-zh-rCN/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="2215078736675564541">"汽车信息"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"查看您的汽车信息"</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>
diff --git a/service/res/values-zh-rHK/strings.xml b/service/res/values-zh-rHK/strings.xml
index 1510099..f6b084e 100644
--- a/service/res/values-zh-rHK/strings.xml
+++ b/service/res/values-zh-rHK/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="2215078736675564541">"汽車資訊"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"存取您的車輛資料"</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>
diff --git a/service/res/values-zh-rTW/strings.xml b/service/res/values-zh-rTW/strings.xml
index 0de37a5..7796a33 100644
--- a/service/res/values-zh-rTW/strings.xml
+++ b/service/res/values-zh-rTW/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="2215078736675564541">"車輛資訊"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"存取車輛資訊"</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>
diff --git a/service/res/values-zu/strings.xml b/service/res/values-zu/strings.xml
index ede8f50..6f714bf 100644
--- a/service/res/values-zu/strings.xml
+++ b/service/res/values-zu/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">"finyelela ulwazi lemoto"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Finyelela kulwazi lwemoto yakho."</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"Ulwazi lemoto"</string>
+    <string name="car_permission_desc" msgid="3584369074931334964">"finyelela kulwazi lwemoto yakho"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"finyelela ikamera yemoto"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Finyelela ikhamera yemoto yakho."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"finyelela ulwazi lamandla lemoto"</string>
diff --git a/service/res/values/config.xml b/service/res/values/config.xml
index d40dea9..9c26c5e 100644
--- a/service/res/values/config.xml
+++ b/service/res/values/config.xml
@@ -360,4 +360,11 @@
 
     <!-- The ComponentName of the media source that will be selected as the default -->
     <string name="config_defaultMediaSource">com.android.bluetooth/com.android.bluetooth.avrcpcontroller.BluetoothMediaBrowserService</string>
+
+    <!-- A configuration flag to enable ending an ongoing call using the physical Call button. -->
+    <bool name="config_callButtonEndsOngoingCall">false</bool>
+
+    <!-- Number of milliseconds to wait before the system goes into Suspend-to-RAM.
+         The valid range is 0 to 3 * 60 * 1000. The default duration is 3 min (= 3 * 60 * 1000). -->
+    <integer name="config_maxSuspendWaitDuration">180000</integer>
 </resources>
diff --git a/service/res/values/strings.xml b/service/res/values/strings.xml
index 0b1c265..bfd0f5a 100644
--- a/service/res/values/strings.xml
+++ b/service/res/values/strings.xml
@@ -17,9 +17,9 @@
     <string name="app_title" translatable="false">Car service</string>
     <!--  For permissions -->
     <!-- Permission text: can access your car's information [CHAR LIMIT=NONE] -->
-    <string name="car_permission_label">access car\u2019s information</string>
+    <string name="car_permission_label">Car information</string>
     <!-- Permission text: can access your car's information [CHAR LIMIT=NONE] -->
-    <string name="car_permission_desc">Access your car\u2019s information.</string>
+    <string name="car_permission_desc">access your car\u2019s information</string>
     <!-- Permission text: apps can control car camera [CHAR LIMIT=NONE] -->
     <string name="car_permission_label_camera">access car\u2019s camera</string>
     <!-- Permission text: apps can control car camera [CHAR LIMIT=NONE] -->
diff --git a/service/src/com/android/car/BinderInterfaceContainer.java b/service/src/com/android/car/BinderInterfaceContainer.java
index 32f7eb9..c159007 100644
--- a/service/src/com/android/car/BinderInterfaceContainer.java
+++ b/service/src/com/android/car/BinderInterfaceContainer.java
@@ -23,8 +23,8 @@
 
 import com.android.internal.annotations.GuardedBy;
 
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -148,12 +148,11 @@
     }
 
     /**
-     * Returns an unmodified collection containing all registered {@link BinderInterface} objects
-     * with this container.
+     * Returns a shallow copy of all registered {@link BinderInterface} objects in this container.
      */
     public Collection<BinderInterface<T>> getInterfaces() {
         synchronized (mLock) {
-            return Collections.unmodifiableCollection(mBinders.values());
+            return new ArrayList<>(mBinders.values());
         }
     }
 
diff --git a/service/src/com/android/car/CarInputService.java b/service/src/com/android/car/CarInputService.java
index 222e760..4a7b394 100644
--- a/service/src/com/android/car/CarInputService.java
+++ b/service/src/com/android/car/CarInputService.java
@@ -72,6 +72,7 @@
 import java.util.BitSet;
 import java.util.Collections;
 import java.util.List;
+import java.util.function.BooleanSupplier;
 import java.util.function.IntSupplier;
 import java.util.function.Supplier;
 
@@ -183,6 +184,8 @@
     // ComponentName of the RotaryService.
     private final String mRotaryServiceComponentName;
 
+    private final BooleanSupplier mShouldCallButtonEndOngoingCallSupplier;
+
     private final Object mLock = new Object();
 
     @GuardedBy("mLock")
@@ -308,7 +311,8 @@
                                 .injectInputEvent(event, INJECT_INPUT_EVENT_MODE_ASYNC),
                 () -> Calls.getLastOutgoingCall(context),
                 getDefaultInputComponent(context),
-                () -> getViewLongPressDelay(context.getContentResolver()));
+                () -> getViewLongPressDelay(context.getContentResolver()),
+                () -> context.getResources().getBoolean(R.bool.config_callButtonEndsOngoingCall));
     }
 
     @VisibleForTesting
@@ -316,7 +320,8 @@
             Handler handler, TelecomManager telecomManager, AssistUtils assistUtils,
             KeyEventListener mainDisplayHandler, Supplier<String> lastCalledNumberSupplier,
             @Nullable ComponentName customInputServiceComponent,
-            IntSupplier longPressDelaySupplier) {
+            IntSupplier longPressDelaySupplier,
+            BooleanSupplier shouldCallButtonEndOngoingCallSupplier) {
         mContext = context;
         mCaptureController = new InputCaptureClientController(context);
         mInputHalService = inputHalService;
@@ -335,6 +340,7 @@
                 new KeyPressTimer(handler, longPressDelaySupplier, this::handleCallLongPress);
 
         mRotaryServiceComponentName = mContext.getString(R.string.rotaryService);
+        mShouldCallButtonEndOngoingCallSupplier = shouldCallButtonEndOngoingCallSupplier;
     }
 
     @VisibleForTesting
@@ -580,6 +586,11 @@
                 return;
             }
 
+            if (mShouldCallButtonEndOngoingCallSupplier.getAsBoolean() && endCall()) {
+                // On-going call ended, nothing more to do.
+                return;
+            }
+
             if (dispatchProjectionKeyEvent(
                     CarProjectionManager.KEY_EVENT_CALL_SHORT_PRESS_KEY_UP)) {
                 return;
@@ -595,6 +606,10 @@
             return;
         }
 
+        if (mShouldCallButtonEndOngoingCallSupplier.getAsBoolean() && endCall()) {
+            return;
+        }
+
         if (dispatchProjectionKeyEvent(CarProjectionManager.KEY_EVENT_CALL_LONG_PRESS_KEY_DOWN)) {
             return;
         }
@@ -643,6 +658,15 @@
         return false;
     }
 
+    private boolean endCall() {
+        if (mTelecomManager != null && mTelecomManager.isInCall()) {
+            Log.i(CarLog.TAG_INPUT, "End the call!");
+            mTelecomManager.endCall();
+            return true;
+        }
+        return false;
+    }
+
     private boolean isBluetoothVoiceRecognitionEnabled() {
         Resources res = mContext.getResources();
         return res.getBoolean(R.bool.enableLongPressBluetoothVoiceRecognition);
@@ -711,6 +735,8 @@
             writer.println("mCarInputListener: " + mCarInputListener);
         }
         writer.println("Long-press delay: " + mLongPressDelaySupplier.getAsInt() + "ms");
+        writer.println("Call button ends ongoing call: "
+                + mShouldCallButtonEndOngoingCallSupplier.getAsBoolean());
         mCaptureController.dump(writer);
     }
 
diff --git a/service/src/com/android/car/CarMediaService.java b/service/src/com/android/car/CarMediaService.java
index 9501c89..9a9b4a4 100644
--- a/service/src/com/android/car/CarMediaService.java
+++ b/service/src/com/android/car/CarMediaService.java
@@ -210,10 +210,14 @@
         if (Log.isLoggable(CarLog.TAG_MEDIA, Log.DEBUG)) {
             Log.d(CarLog.TAG_MEDIA, "CarMediaService.onEvent(" + event + ")");
         }
-        if (CarUserManager.USER_LIFECYCLE_EVENT_TYPE_SWITCHING == event.getEventType()) {
-            maybeInitUser(event.getUserId());
-        } else if (CarUserManager.USER_LIFECYCLE_EVENT_TYPE_UNLOCKING == event.getEventType()) {
-            onUserUnlock(event.getUserId());
+
+        switch (event.getEventType()) {
+            case CarUserManager.USER_LIFECYCLE_EVENT_TYPE_SWITCHING:
+                maybeInitUser(event.getUserId());
+                break;
+            case CarUserManager.USER_LIFECYCLE_EVENT_TYPE_UNLOCKED:
+                onUserUnlock(event.getUserId());
+                break;
         }
     };
 
@@ -408,8 +412,9 @@
 
     @Override
     public List<ComponentName> getLastMediaSources(@CarMediaManager.MediaSourceMode int mode) {
+        ICarImpl.assertPermission(mContext, android.Manifest.permission.MEDIA_CONTENT_CONTROL);
         String key = getMediaSourceKey(mode);
-        String serialized = mSharedPrefs.getString(key, null);
+        String serialized = mSharedPrefs.getString(key, "");
         return getComponentNameList(serialized).stream()
                 .map(name -> ComponentName.unflattenFromString(name)).collect(Collectors.toList());
     }
@@ -814,7 +819,7 @@
     private @NonNull ComponentName getLastMediaSource(int mode) {
         if (sharedPrefsInitialized()) {
             String key = getMediaSourceKey(mode);
-            String serialized = mSharedPrefs.getString(key, null);
+            String serialized = mSharedPrefs.getString(key, "");
             if (!TextUtils.isEmpty(serialized)) {
                 for (String name : getComponentNameList(serialized)) {
                     ComponentName componentName = ComponentName.unflattenFromString(name);
@@ -840,7 +845,7 @@
         return componentNames.stream().collect(Collectors.joining(COMPONENT_NAME_SEPARATOR));
     }
 
-    private List<String> getComponentNameList(String serialized) {
+    private List<String> getComponentNameList(@NonNull String serialized) {
         String[] componentNames = serialized.split(COMPONENT_NAME_SEPARATOR);
         return (Arrays.asList(componentNames));
     }
diff --git a/service/src/com/android/car/CarPowerManagementService.java b/service/src/com/android/car/CarPowerManagementService.java
index da88468..132bda4 100644
--- a/service/src/com/android/car/CarPowerManagementService.java
+++ b/service/src/com/android/car/CarPowerManagementService.java
@@ -35,6 +35,8 @@
 import android.hardware.automotive.vehicle.V2_0.InitialUserInfoRequestType;
 import android.hardware.automotive.vehicle.V2_0.InitialUserInfoResponseAction;
 import android.hardware.automotive.vehicle.V2_0.VehicleApPowerStateReq;
+import android.hardware.automotive.vehicle.V2_0.VehicleApPowerStateShutdownParam;
+import android.net.wifi.WifiManager;
 import android.os.Build;
 import android.os.Handler;
 import android.os.HandlerThread;
@@ -50,7 +52,8 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.sysprop.CarProperties;
-import android.util.Log;
+import android.util.AtomicFile;
+import android.util.Slog;
 
 import com.android.car.am.ContinuousBlankActivity;
 import com.android.car.hal.PowerHalService;
@@ -62,8 +65,16 @@
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.app.IVoiceInteractionManagerService;
 
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.lang.ref.WeakReference;
+import java.nio.charset.StandardCharsets;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.Set;
@@ -79,6 +90,17 @@
 
     // TODO: replace all usage
     private static final String TAG = CarLog.TAG_POWER;
+    private static final String WIFI_STATE_FILENAME = "wifi_state";
+    private static final String WIFI_STATE_MODIFIED = "forcibly_disabled";
+    private static final String WIFI_STATE_ORIGINAL = "original";
+    // If Suspend to RAM fails, we retry with an exponential back-off:
+    // The wait interval will be 10 msec, 20 msec, 40 msec, ...
+    // Once the wait interval goes beyond 100 msec, it is fixed at 100 msec.
+    private static final long INITIAL_SUSPEND_RETRY_INTERVAL_MS = 10;
+    private static final long MAX_RETRY_INTERVAL_MS = 100;
+    // Minimum and maximum wait duration before the system goes into Suspend to RAM.
+    private static final long MIN_SUSPEND_WAIT_DURATION_MS = 0;
+    private static final long MAX_SUSPEND_WAIT_DURATION_MS = 3 * 60 * 1000;
 
     private final Object mLock = new Object();
     private final Object mSimulationWaitObject = new Object();
@@ -141,6 +163,9 @@
 
     private final IVoiceInteractionManagerService mVoiceInteractionManagerService;
 
+    private final WifiManager mWifiManager;
+    private final AtomicFile mWifiStateFile;
+
     // TODO:  Make this OEM configurable.
     private static final int SHUTDOWN_POLLING_INTERVAL_MS = 2000;
     private static final int SHUTDOWN_EXTEND_MAX_MS = 5000;
@@ -155,6 +180,12 @@
     // This is a temp work-around to reduce user switching delay after wake-up.
     private final boolean mSwitchGuestUserBeforeSleep;
 
+    // CPMS tries to enter Suspend to RAM within the duration specified at
+    // mMaxSuspendWaitDurationMs. The default max duration is MAX_SUSPEND_WAIT_DURATION, and can be
+    // overridden by setting config_maxSuspendWaitDuration in an overrlay resource.
+    // The valid range is MIN_SUSPEND_WAIT_DRATION to MAX_SUSPEND_WAIT_DURATION.
+    private final long mMaxSuspendWaitDurationMs;
+
     private class PowerManagerCallbackList extends RemoteCallbackList<ICarPowerStateListener> {
         /**
          * Old version of {@link #onCallbackDied(E, Object)} that
@@ -162,7 +193,7 @@
          */
         @Override
         public void onCallbackDied(ICarPowerStateListener listener) {
-            Log.i(CarLog.TAG_POWER, "binderDied " + listener.asBinder());
+            Slog.i(TAG, "binderDied " + listener.asBinder());
             CarPowerManagementService.this.doUnregisterListener(listener);
         }
     }
@@ -193,7 +224,7 @@
         mSwitchGuestUserBeforeSleep = resources.getBoolean(
                 R.bool.config_switchGuestUserBeforeGoingSleep);
         if (mShutdownPrepareTimeMs < MIN_MAX_GARAGE_MODE_DURATION_MS) {
-            Log.w(CarLog.TAG_POWER,
+            Slog.w(TAG,
                     "maxGarageModeRunningDurationInSecs smaller than minimum required, resource:"
                     + mShutdownPrepareTimeMs + "(ms) while should exceed:"
                     +  MIN_MAX_GARAGE_MODE_DURATION_MS + "(ms), Ignore resource.");
@@ -202,6 +233,11 @@
         mUserService = carUserService;
         mInitialUserSetter = initialUserSetter;
         mVoiceInteractionManagerService = voiceInteractionService;
+        mWifiManager = context.getSystemService(WifiManager.class);
+        mWifiStateFile = new AtomicFile(
+                new File(mSystemInterface.getSystemCarDir(), WIFI_STATE_FILENAME));
+        mMaxSuspendWaitDurationMs = Math.max(MIN_SUSPEND_WAIT_DURATION_MS,
+                Math.min(getMaxSuspendWaitDurationConfig(), MAX_SUSPEND_WAIT_DURATION_MS));
     }
 
     @VisibleForTesting
@@ -228,7 +264,7 @@
             // Initialize CPMS in WAIT_FOR_VHAL state
             onApPowerStateChange(CpmsState.WAIT_FOR_VHAL, CarPowerStateListener.WAIT_FOR_VHAL);
         } else {
-            Log.w(CarLog.TAG_POWER, "Vehicle hal does not support power state yet.");
+            Slog.w(TAG, "Vehicle hal does not support power state yet.");
             onApPowerStateChange(CpmsState.ON, CarPowerStateListener.ON);
         }
         mSystemInterface.startDisplayStateMonitoring(this);
@@ -264,6 +300,8 @@
             writer.print(",mDisableUserSwitchDuringResume:" + mDisableUserSwitchDuringResume);
             writer.println(",mRebootAfterGarageMode:" + mRebootAfterGarageMode);
             writer.println("mSwitchGuestUserBeforeSleep:" + mSwitchGuestUserBeforeSleep);
+            writer.print("mMaxSuspendWaitDurationMs:" + mMaxSuspendWaitDurationMs);
+            writer.println(", config_maxSuspendWaitDuration:" + getMaxSuspendWaitDurationConfig());
         }
         mInitialUserSetter.dump(writer);
     }
@@ -272,6 +310,7 @@
     public void onApPowerStateChange(PowerState state) {
         synchronized (mLock) {
             mPendingPowerStates.addFirst(new CpmsState(state));
+            mLock.notify();
         }
         mHandler.handlePowerStateChange();
     }
@@ -279,7 +318,7 @@
     @VisibleForTesting
     void setStateForTesting(boolean isBooting, boolean isResuming) {
         synchronized (mLock) {
-            Log.d(CarLog.TAG_POWER, "setStateForTesting():"
+            Slog.d(TAG, "setStateForTesting():"
                     + " booting(" + mIsBooting + ">" + isBooting + ")"
                     + " resuming(" + mIsResuming + ">" + isResuming + ")");
             mIsBooting = isBooting;
@@ -294,6 +333,7 @@
         CpmsState newState = new CpmsState(apState, carPowerStateListenerState);
         synchronized (mLock) {
             mPendingPowerStates.addFirst(newState);
+            mLock.notify();
         }
         mHandler.handlePowerStateChange();
     }
@@ -304,10 +344,10 @@
             state = mPendingPowerStates.peekFirst();
             mPendingPowerStates.clear();
             if (state == null) {
-                Log.e(CarLog.TAG_POWER, "Null power state was requested");
+                Slog.e(TAG, "Null power state was requested");
                 return;
             }
-            Log.i(CarLog.TAG_POWER, "doHandlePowerStateChange: newState=" + state.name());
+            Slog.i(TAG, "doHandlePowerStateChange: newState=" + state.name());
             if (!needPowerStateChangeLocked(state)) {
                 return;
             }
@@ -315,7 +355,7 @@
             releaseTimerLocked();
         }
         mHandler.cancelProcessingComplete();
-        Log.i(CarLog.TAG_POWER, "setCurrentState " + state.toString());
+        Slog.i(TAG, "setCurrentState " + state.toString());
         CarStatsLogHelper.logPowerState(state.mState);
         mCurrentState = state;
         switch (state.mState) {
@@ -361,6 +401,7 @@
                 mHal.sendSleepExit();
                 break;
         }
+        restoreWifi();
     }
 
     private void updateCarUserNoticeServiceIfNecessary() {
@@ -371,8 +412,7 @@
                     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.");
+                Slog.i(TAG, "Car user notice service will ignore all messages before user switch.");
                 Intent intent = new Intent();
                 intent.setComponent(new ComponentName(mContext.getPackageName(),
                         ContinuousBlankActivity.class.getName()));
@@ -381,7 +421,7 @@
                 carUserNoticeService.ignoreUserNotice(currentUserId);
             }
         } catch (Exception e) {
-            Log.w(CarLog.TAG_POWER, "Cannot ignore user notice for current user", e);
+            Slog.w(TAG, "Cannot ignore user notice for current user", e);
         }
     }
 
@@ -402,14 +442,14 @@
                 allowUserSwitch = false;
                 mIsBooting = false;
                 mIsResuming = false;
-                Log.i(CarLog.TAG_POWER, "User switch disallowed while booting");
+                Slog.i(TAG, "User switch disallowed while booting");
             } else {
                 // The system is resuming after a suspension. Optionally disable user switching.
                 allowUserSwitch = !mDisableUserSwitchDuringResume;
                 mIsBooting = false;
                 mIsResuming = false;
                 if (!allowUserSwitch) {
-                    Log.i(CarLog.TAG_POWER, "User switch disallowed while resuming");
+                    Slog.i(TAG, "User switch disallowed while resuming");
                 }
             }
         }
@@ -422,7 +462,7 @@
         try {
             switchUserOnResumeIfNecessary(allowUserSwitch);
         } catch (Exception e) {
-            Log.e(CarLog.TAG_POWER, "Could not switch user on resume", e);
+            Slog.e(TAG, "Could not switch user on resume", e);
         }
 
         setVoiceInteractionDisabled(false);
@@ -430,7 +470,7 @@
 
     @VisibleForTesting // Ideally it should not be exposed, but it speeds up the unit tests
     void switchUserOnResumeIfNecessary(boolean allowSwitching) {
-        Log.d(TAG, "switchUserOnResumeIfNecessary(): allowSwitching=" + allowSwitching
+        Slog.d(TAG, "switchUserOnResumeIfNecessary(): allowSwitching=" + allowSwitching
                 + ", mSwitchGuestUserBeforeSleep=" + mSwitchGuestUserBeforeSleep);
         if (!allowSwitching) {
             if (mSwitchGuestUserBeforeSleep) { // already handled
@@ -461,16 +501,10 @@
         int currentUserId = ActivityManager.getCurrentUser();
         UserInfo currentUser = mUserManager.getUserInfo(currentUserId);
 
-        UserInfo newUser = mInitialUserSetter.replaceGuestIfNeeded(currentUser);
-        if (newUser == currentUser) return; // Not a guest
+        if (!mInitialUserSetter.canReplaceGuestUser(currentUser)) return; // Not a guest
 
-        boolean replaceGuest = !mSwitchGuestUserBeforeSleep;
-        if (newUser == null) {
-            Log.w(TAG, "Failed to replace guest; falling back to default behavior");
-            executeDefaultInitialUserBehavior(replaceGuest);
-            return;
-        }
-        switchUser(newUser.id, replaceGuest);
+        mInitialUserSetter.set(newInitialUserInfoBuilder(InitialUserSetter.TYPE_REPLACE_GUEST)
+                .build());
     }
 
     private void switchUser(@UserIdInt int userId, boolean replaceGuest) {
@@ -499,7 +533,7 @@
      * Switches the initial user by calling the User HAL to define the behavior.
      */
     private void switchUserOnResumeIfNecessaryUsingHal() {
-        Log.i(TAG, "Using User HAL to define initial user behavior");
+        Slog.i(TAG, "Using User HAL to define initial user behavior");
         mUserService.getInitialUserInfo(InitialUserInfoRequestType.RESUME, (status, response) -> {
             switch (status) {
                 case HalCallback.STATUS_HAL_RESPONSE_TIMEOUT:
@@ -523,12 +557,12 @@
                     boolean replaceGuest = !mSwitchGuestUserBeforeSleep;
                     switch (response.action) {
                         case InitialUserInfoResponseAction.DEFAULT:
-                            Log.i(TAG, "HAL requested default initial user behavior");
+                            Slog.i(TAG, "HAL requested default initial user behavior");
                             executeDefaultInitialUserBehavior(replaceGuest);
                             return;
                         case InitialUserInfoResponseAction.SWITCH:
                             int userId = response.userToSwitchOrCreate.userId;
-                            Log.i(TAG, "HAL requested switch to user " + userId);
+                            Slog.i(TAG, "HAL requested switch to user " + userId);
                             // If guest was replaced on shutdown, it doesn't need to be replaced
                             // again
                             switchUser(userId, replaceGuest);
@@ -536,7 +570,7 @@
                         case InitialUserInfoResponseAction.CREATE:
                             int halFlags = response.userToSwitchOrCreate.flags;
                             String name = response.userNameToCreate;
-                            Log.i(TAG, "HAL requested new user (name="
+                            Slog.i(TAG, "HAL requested new user (name="
                                     + UserHelper.safeName(name) + ", flags="
                                     + UserHalHelper.userFlagsToString(halFlags) + ")");
                             mInitialUserSetter
@@ -560,7 +594,7 @@
      * Switches the initial user directly when the User HAL call failed.
      */
     private void switchUserOnResumeUserHalFallback(String reason) {
-        Log.w(TAG, "Failed to set initial user based on User Hal (" + reason
+        Slog.w(TAG, "Failed to set initial user based on User Hal (" + reason
                 + "); falling back to default behavior");
         executeDefaultInitialUserBehavior(!mSwitchGuestUserBeforeSleep);
     }
@@ -576,7 +610,7 @@
                     || !newState.mCanSleep;
             mGarageModeShouldExitImmediately = !newState.mCanPostpone;
         }
-        Log.i(CarLog.TAG_POWER,
+        Slog.i(TAG,
                 (newState.mCanPostpone
                 ? "starting shutdown prepare with Garage Mode"
                         : "starting shutdown prepare without Garage Mode"));
@@ -588,7 +622,7 @@
     // Simulate system shutdown to Deep Sleep
     private void simulateShutdownPrepare() {
         mSystemInterface.setDisplayState(false);
-        Log.i(CarLog.TAG_POWER, "starting shutdown prepare");
+        Slog.i(TAG, "starting shutdown prepare");
         sendPowerManagerEvent(CarPowerStateListener.SHUTDOWN_PREPARE);
         mHal.sendShutdownPrepare();
         doHandlePreprocessing();
@@ -627,15 +661,18 @@
         if (forceReboot) {
             PowerManager powerManager = mContext.getSystemService(PowerManager.class);
             if (powerManager == null) {
-                Log.wtf(CarLog.TAG_POWER, "No PowerManager. Cannot reboot.");
+                Slog.wtf(TAG, "No PowerManager. Cannot reboot.");
             } else {
-                Log.i(CarLog.TAG_POWER, "GarageMode has completed. Forcing reboot.");
+                Slog.i(TAG, "GarageMode has completed. Forcing reboot.");
                 powerManager.reboot("GarageModeReboot");
                 throw new AssertionError("Should not return from PowerManager.reboot()");
             }
         }
         setVoiceInteractionDisabled(true);
 
+        // To make Kernel implementation simpler when going into sleep.
+        disableWifi();
+
         if (mustShutDown) {
             // shutdown HU
             mSystemInterface.shutdown();
@@ -649,10 +686,83 @@
         try {
             mVoiceInteractionManagerService.setDisabled(disabled);
         } catch (RemoteException e) {
-            Log.w(TAG, "setVoiceIntefactionDisabled(" + disabled + ") failed", e);
+            Slog.w(TAG, "setVoiceIntefactionDisabled(" + disabled + ") failed", e);
         }
     }
 
+    private void restoreWifi() {
+        boolean needToRestore = readWifiModifiedState();
+        if (needToRestore) {
+            if (!mWifiManager.isWifiEnabled()) {
+                Slog.i(TAG, "Wifi has been enabled to restore the last setting");
+                mWifiManager.setWifiEnabled(true);
+            }
+            // Update the persistent data as wifi is not modified by car framework.
+            saveWifiModifiedState(false);
+        }
+    }
+
+    private void disableWifi() {
+        boolean wifiEnabled = mWifiManager.isWifiEnabled();
+        boolean wifiModifiedState = readWifiModifiedState();
+        if (wifiEnabled != wifiModifiedState) {
+            saveWifiModifiedState(wifiEnabled);
+        }
+        if (!wifiEnabled) return;
+
+        mWifiManager.setWifiEnabled(false);
+        wifiEnabled = mWifiManager.isWifiEnabled();
+        Slog.i(TAG, "Wifi has been disabled and the last setting was saved");
+    }
+
+    private void saveWifiModifiedState(boolean forciblyDisabled) {
+        FileOutputStream fos;
+        try {
+            fos = mWifiStateFile.startWrite();
+        } catch (IOException e) {
+            Slog.e(TAG, "Cannot create " + WIFI_STATE_FILENAME, e);
+            return;
+        }
+
+        try (BufferedWriter writer = new BufferedWriter(
+                new OutputStreamWriter(fos, StandardCharsets.UTF_8))) {
+            writer.write(forciblyDisabled ? WIFI_STATE_MODIFIED : WIFI_STATE_ORIGINAL);
+            writer.newLine();
+            writer.flush();
+            mWifiStateFile.finishWrite(fos);
+        } catch (IOException e) {
+            mWifiStateFile.failWrite(fos);
+            Slog.e(TAG, "Writing " + WIFI_STATE_FILENAME + " failed", e);
+        }
+    }
+
+    private boolean readWifiModifiedState() {
+        boolean needToRestore = false;
+        boolean invalidState = false;
+
+        try (BufferedReader reader = new BufferedReader(
+                new InputStreamReader(mWifiStateFile.openRead(), StandardCharsets.UTF_8))) {
+            String line = reader.readLine();
+            if (line == null) {
+                needToRestore = false;
+                invalidState = true;
+            } else {
+                line = line.trim();
+                needToRestore = WIFI_STATE_MODIFIED.equals(line);
+                invalidState = !(needToRestore || WIFI_STATE_ORIGINAL.equals(line));
+            }
+        } catch (IOException e) {
+            // If a file named wifi_state doesn't exist, we will not modify Wifi at system start.
+            Slog.w(TAG, "Failed to read " + WIFI_STATE_FILENAME + ": " + e);
+            return false;
+        }
+        if (invalidState) {
+            mWifiStateFile.delete();
+        }
+
+        return needToRestore;
+    }
+
     @GuardedBy("mLock")
     private void releaseTimerLocked() {
         if (mTimer != null) {
@@ -676,12 +786,11 @@
                 pollingCount =
                         (shutdownPrepareTimeOverrideInSecs * 1000 / intervalMs)
                                 + 1;
-                Log.i(CarLog.TAG_POWER,
-                        "Garage mode duration overridden secs:"
-                                + shutdownPrepareTimeOverrideInSecs);
+                Slog.i(TAG, "Garage mode duration overridden secs:"
+                        + shutdownPrepareTimeOverrideInSecs);
             }
         }
-        Log.i(CarLog.TAG_POWER, "processing before shutdown expected for: "
+        Slog.i(TAG, "processing before shutdown expected for: "
                 + mShutdownPrepareTimeMs + " ms, adding polling:" + pollingCount);
         synchronized (mLock) {
             mProcessingStartTime = SystemClock.elapsedRealtime();
@@ -743,7 +852,7 @@
                 listener.onStateChanged(newState);
             } catch (RemoteException e) {
                 // It's likely the connection snapped. Let binder death handle the situation.
-                Log.e(CarLog.TAG_POWER, "onStateChanged() call failed", e);
+                Slog.e(TAG, "onStateChanged() call failed", e);
             }
         }
         listenerList.finishBroadcast();
@@ -776,7 +885,7 @@
             // Any wakeup time from before is no longer valid.
             mNextWakeupSec = 0;
         }
-        Log.i(CarLog.TAG_POWER, "Resuming after suspending");
+        Slog.i(TAG, "Resuming after suspending");
         mSystemInterface.refreshDisplayBrightness();
         onApPowerStateChange(CpmsState.WAIT_FOR_VHAL, nextListenerState);
     }
@@ -785,8 +894,7 @@
         if (mCurrentState == null) {
             return true;
         } else if (mCurrentState.equals(newState)) {
-            Log.d(CarLog.TAG_POWER, "Requested state is already in effect: "
-                    + newState.name());
+            Slog.d(TAG, "Requested state is already in effect: " + newState.name());
             return false;
         }
 
@@ -820,12 +928,12 @@
                         || newState.mState == CpmsState.WAIT_FOR_VHAL);
                 break;
             default:
-                Log.e(CarLog.TAG_POWER, "Unexpected current state:  currentState="
+                Slog.e(TAG, "Unexpected current state:  currentState="
                         + mCurrentState.name() + ", newState=" + newState.name());
                 transitionAllowed = true;
         }
         if (!transitionAllowed) {
-            Log.e(CarLog.TAG_POWER, "Requested power transition is not allowed: "
+            Slog.e(TAG, "Requested power transition is not allowed: "
                     + mCurrentState.name() + " --> " + newState.name());
         }
         return transitionAllowed;
@@ -837,7 +945,7 @@
             releaseTimerLocked();
             if (!mShutdownOnFinish && mLastSleepEntryTime > mProcessingStartTime) {
                 // entered sleep after processing start. So this could be duplicate request.
-                Log.w(CarLog.TAG_POWER, "Duplicate sleep entry request, ignore");
+                Slog.w(TAG, "Duplicate sleep entry request, ignore");
                 return;
             }
             listenerState = mShutdownOnFinish
@@ -857,7 +965,7 @@
     }
 
     private void doHandleMainDisplayStateChange(boolean on) {
-        Log.w(CarLog.TAG_POWER, "Unimplemented:  doHandleMainDisplayStateChange() - on = " + on);
+        Slog.w(TAG, "Unimplemented:  doHandleMainDisplayStateChange() - on = " + on);
     }
 
     public void handleMainDisplayChanged(boolean on) {
@@ -934,13 +1042,13 @@
     public void scheduleNextWakeupTime(int seconds) {
         ICarImpl.assertPermission(mContext, Car.PERMISSION_CAR_POWER);
         if (seconds < 0) {
-            Log.w(CarLog.TAG_POWER, "Next wake up time is negative. Ignoring!");
+            Slog.w(TAG, "Next wake up time is negative. Ignoring!");
             return;
         }
         boolean timedWakeupAllowed = mHal.isTimedWakeupAllowed();
         synchronized (mLock) {
             if (!timedWakeupAllowed) {
-                Log.w(CarLog.TAG_POWER, "Setting timed wakeups are disabled in HAL. Skipping");
+                Slog.w(TAG, "Setting timed wakeups are disabled in HAL. Skipping");
                 mNextWakeupSec = 0;
                 return;
             }
@@ -948,7 +1056,7 @@
                 // The new value is sooner than the old value. Take the new value.
                 mNextWakeupSec = seconds;
             } else {
-                Log.d(CarLog.TAG_POWER, "Tried to schedule next wake up, but already had shorter "
+                Slog.d(TAG, "Tried to schedule next wake up, but already had shorter "
                         + "scheduled time");
             }
         }
@@ -983,13 +1091,13 @@
                 if (!mShutdownOnFinish) {
                     if (mLastSleepEntryTime > mProcessingStartTime
                             && mLastSleepEntryTime < SystemClock.elapsedRealtime()) {
-                        Log.i(CarLog.TAG_POWER, "signalComplete: Already slept!");
+                        Slog.i(TAG, "signalComplete: Already slept!");
                         return;
                     }
                 }
                 powerHandler = mHandler;
             }
-            Log.i(CarLog.TAG_POWER, "Apps are finished, call handleProcessingComplete()");
+            Slog.i(TAG, "Apps are finished, call handleProcessingComplete()");
             powerHandler.handleProcessingComplete();
         }
     }
@@ -1050,7 +1158,7 @@
         public void handleMessage(Message msg) {
             CarPowerManagementService service = mService.get();
             if (service == null) {
-                Log.i(TAG, "handleMessage null service");
+                Slog.i(TAG, "handleMessage null service");
                 return;
             }
             switch (msg.what) {
@@ -1100,32 +1208,45 @@
     }
 
     // Send the command to enter Suspend to RAM.
-    // If the command is not successful, try again.
+    // If the command is not successful, try again with an exponential back-off.
     // If it fails repeatedly, send the command to shut down.
+    // If we decide to go to a different power state, abort this retry mechanism.
     // Returns true if we successfully suspended.
     private boolean suspendWithRetries() {
-        final int maxTries = 3;
-        final long retryIntervalMs = 10;
-        int tryCount = 0;
+        long retryIntervalMs = INITIAL_SUSPEND_RETRY_INTERVAL_MS;
+        long totalWaitDurationMs = 0;
 
         while (true) {
-            Log.i(CarLog.TAG_POWER, "Entering Suspend to RAM");
+            Slog.i(TAG, "Entering Suspend to RAM");
             boolean suspendSucceeded = mSystemInterface.enterDeepSleep();
             if (suspendSucceeded) {
                 return true;
             }
-            tryCount++;
-            if (tryCount >= maxTries) {
+            if (totalWaitDurationMs >= mMaxSuspendWaitDurationMs) {
                 break;
             }
             // We failed to suspend. Block the thread briefly and try again.
-            Log.w(CarLog.TAG_POWER, "Failed to Suspend; will retry later.");
-            try {
-                Thread.sleep(retryIntervalMs);
-            } catch (InterruptedException ignored) { }
+            synchronized (mLock) {
+                if (mPendingPowerStates.isEmpty()) {
+                    Slog.w(TAG, "Failed to Suspend; will retry after " + retryIntervalMs + "ms.");
+                    try {
+                        mLock.wait(retryIntervalMs);
+                    } catch (InterruptedException ignored) {
+                        Thread.currentThread().interrupt();
+                    }
+                    totalWaitDurationMs += retryIntervalMs;
+                    retryIntervalMs = Math.min(retryIntervalMs * 2, MAX_RETRY_INTERVAL_MS);
+                }
+                // Check for a new power state now, before going around the loop again
+                if (!mPendingPowerStates.isEmpty()) {
+                    Slog.i(TAG, "Terminating the attempt to Suspend to RAM");
+                    return false;
+                }
+            }
         }
         // Too many failures trying to suspend. Shut down.
-        Log.w(CarLog.TAG_POWER, "Could not Suspend to RAM. Shutting down.");
+        Slog.w(TAG, "Could not Suspend to RAM after " + totalWaitDurationMs
+                + "ms long trial. Shutting down.");
         mSystemInterface.shutdown();
         return false;
     }
@@ -1270,6 +1391,7 @@
             // Cancel Garage Mode in case it's running
             mPendingPowerStates.addFirst(new CpmsState(CpmsState.WAIT_FOR_VHAL,
                                                        CarPowerStateListener.SHUTDOWN_CANCELLED));
+            mLock.notify();
             handler = mHandler;
         }
         handler.handlePowerStateChange();
@@ -1306,13 +1428,38 @@
         handler.handlePowerStateChange();
     }
 
+    /**
+     * Powers off the device, considering the given options.
+     *
+     * <p>The final state can be "suspend-to-RAM" or "shutdown". Attempting to go to suspend-to-RAM
+     * on devices which do not support it may lead to an unexpected system state.
+     */
+    public void powerOffFromCommand(boolean skipGarageMode, boolean shutdown) {
+        ICarImpl.assertPermission(mContext, Car.PERMISSION_CAR_POWER);
+        int param = 0;
+        if (shutdown) {
+            param = skipGarageMode ? VehicleApPowerStateShutdownParam.SHUTDOWN_IMMEDIATELY
+                    : VehicleApPowerStateShutdownParam.SHUTDOWN_ONLY;
+        } else {
+            param = skipGarageMode ? VehicleApPowerStateShutdownParam.SLEEP_IMMEDIATELY
+                    : VehicleApPowerStateShutdownParam.CAN_SLEEP;
+        }
+        PowerState state = new PowerState(VehicleApPowerStateReq.SHUTDOWN_PREPARE, param);
+        synchronized (mLock) {
+            mRebootAfterGarageMode = false;
+            mPendingPowerStates.addFirst(new CpmsState(state));
+            mLock.notify();
+        }
+        mHandler.handlePowerStateChange();
+    }
+
     // In a real Deep Sleep, the hardware removes power from the CPU (but retains power
     // on the RAM). This puts the processor to sleep. Upon some external signal, power
     // is re-applied to the CPU, and processing resumes right where it left off.
     // We simulate this behavior by calling wait().
     // We continue from wait() when forceSimulatedResume() is called.
     private void simulateSleepByWaiting() {
-        Log.i(CarLog.TAG_POWER, "Starting to simulate Deep Sleep by waiting");
+        Slog.i(TAG, "Starting to simulate Deep Sleep by waiting");
         synchronized (mSimulationWaitObject) {
             while (!mWakeFromSimulatedSleep) {
                 try {
@@ -1323,6 +1470,10 @@
             }
             mInSimulatedDeepSleepMode = false;
         }
-        Log.i(CarLog.TAG_POWER, "Exit Deep Sleep simulation");
+        Slog.i(TAG, "Exit Deep Sleep simulation");
+    }
+
+    private int getMaxSuspendWaitDurationConfig() {
+        return mContext.getResources().getInteger(R.integer.config_maxSuspendWaitDuration);
     }
 }
diff --git a/service/src/com/android/car/CarShellCommand.java b/service/src/com/android/car/CarShellCommand.java
index e1282ab..876d51d 100644
--- a/service/src/com/android/car/CarShellCommand.java
+++ b/service/src/com/android/car/CarShellCommand.java
@@ -138,6 +138,9 @@
             "get-user-auth-association";
     private static final String COMMAND_SET_USER_AUTH_ASSOCIATION =
             "set-user-auth-association";
+    private static final String COMMAND_POWER_OFF = "power-off";
+    private static final String POWER_OFF_SKIP_GARAGEMODE = "--skip-garagemode";
+    private static final String POWER_OFF_SHUTDOWN = "--shutdown";
 
     // Whitelist of commands allowed in user build. All these command should be protected with
     // a permission. K: command, V: required permission.
@@ -348,12 +351,13 @@
         pw.println("\tdisable-feature featureName");
         pw.println("\t  Disable the requested feature. Change will happen after reboot");
         pw.println("\t  This requires root/su.");
-        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("\tinject-key [-d display] [-t down_delay_ms | -a down|up] key_code");
+        pw.println("\t  inject key down and/or 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");
+        pw.println("\t  If -a isn't specified, both down and up will be injected.");
         pw.println("\tinject-rotary [-d display] [-i input_type] [-c clockwise]");
         pw.println("\t              [-dt delta_times_ms]");
         pw.println("\t  inject rotary input event to car service.");
@@ -414,6 +418,10 @@
 
         pw.printf("\t  %s\n", VALID_USER_AUTH_TYPES_HELP);
         pw.printf("\t  %s\n", VALID_USER_AUTH_SET_VALUES_HELP);
+
+        pw.printf("\t%s [%s] [%s]\n", COMMAND_POWER_OFF, POWER_OFF_SKIP_GARAGEMODE,
+                POWER_OFF_SHUTDOWN);
+        pw.println("\t  Powers off the car.");
     }
 
     private static int showInvalidArguments(PrintWriter pw) {
@@ -557,7 +565,7 @@
                 break;
             case COMMAND_SUSPEND:
                 mCarPowerManagementService.forceSuspendAndMaybeReboot(false);
-                writer.println("Resume: Simulating powering down to Deep Sleep");
+                writer.println("Suspend: Simulating powering down to Deep Sleep");
                 break;
             case COMMAND_ENABLE_TRUSTED_DEVICE:
                 if (args.length != 2) {
@@ -641,6 +649,10 @@
             case COMMAND_SET_USER_AUTH_ASSOCIATION:
                 setUserAuthAssociation(args, writer);
                 break;
+            case COMMAND_POWER_OFF:
+                powerOff(args, writer);
+                break;
+
             default:
                 writer.println("Unknown command: \"" + cmd + "\"");
                 showHelp(writer);
@@ -740,6 +752,7 @@
         int display = InputHalService.DISPLAY_MAIN;
         int delayMs = 0;
         int keyCode = KeyEvent.KEYCODE_UNKNOWN;
+        int action = -1;
         try {
             while (i < args.length) {
                 switch (args[i]) {
@@ -751,6 +764,16 @@
                         i++;
                         delayMs = Integer.parseInt(args[i]);
                         break;
+                    case "-a":
+                        i++;
+                        if (args[i].equalsIgnoreCase("down")) {
+                            action = KeyEvent.ACTION_DOWN;
+                        } else if (args[i].equalsIgnoreCase("up")) {
+                            action = KeyEvent.ACTION_UP;
+                        } else {
+                            throw new IllegalArgumentException("Invalid action: " + args[i]);
+                        }
+                        break;
                     default:
                         if (keyCode != KeyEvent.KEYCODE_UNKNOWN) {
                             throw new IllegalArgumentException("key_code already set:"
@@ -782,14 +805,20 @@
 
             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);
+        if (action == -1) {
+            injectKeyEvent(KeyEvent.ACTION_DOWN, keyCode, display);
+            SystemClock.sleep(delayMs);
+            injectKeyEvent(KeyEvent.ACTION_UP, keyCode, display);
+        } else {
+            injectKeyEvent(action, keyCode, display);
+        }
         writer.println("Succeeded");
     }
 
+    private void injectKeyEvent(int action, int keyCode, int display) {
+        mCarInputService.onKeyEvent(new KeyEvent(action, keyCode), display);
+    }
+
     private void injectRotary(String[] args, PrintWriter writer) {
         int i = 1; // 0 is command itself
         int display = InputHalService.DISPLAY_MAIN;
@@ -1476,6 +1505,27 @@
         }
     }
 
+    private void powerOff(String[] args, PrintWriter writer) {
+        int index = 1;
+        boolean skipGarageMode = false;
+        boolean shutdown = false;
+        while (index < args.length) {
+            switch (args[index]) {
+                case POWER_OFF_SKIP_GARAGEMODE:
+                    skipGarageMode = true;
+                    break;
+                case POWER_OFF_SHUTDOWN:
+                    shutdown = true;
+                    break;
+                default:
+                    writer.printf("Not supported option: %s\n", args[index]);
+                    return;
+            }
+            index++;
+        }
+        mCarPowerManagementService.powerOffFromCommand(skipGarageMode, shutdown);
+    }
+
     /**
      * Inject a fake  VHAL event
      *
diff --git a/service/src/com/android/car/ICarImpl.java b/service/src/com/android/car/ICarImpl.java
index 4d78dad..5b282de 100644
--- a/service/src/com/android/car/ICarImpl.java
+++ b/service/src/com/android/car/ICarImpl.java
@@ -204,8 +204,7 @@
         }
         mCarPackageManagerService = new CarPackageManagerService(serviceContext,
                 mCarUXRestrictionsService,
-                mSystemActivityMonitoringService,
-                mCarUserService);
+                mSystemActivityMonitoringService);
         mPerUserCarServiceHelper = new PerUserCarServiceHelper(serviceContext, mCarUserService);
         mCarBluetoothService = new CarBluetoothService(serviceContext, mPerUserCarServiceHelper);
         mCarInputService = new CarInputService(serviceContext, mHal.getInputHal(), mCarUserService);
diff --git a/service/src/com/android/car/Standards.kt b/service/src/com/android/car/Standards.kt
deleted file mode 100644
index 272b44f..0000000
--- a/service/src/com/android/car/Standards.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.car
-
-/**
- * Identical to [also]. Use to communicate intent of guarding against null. Compatible with
- * `?:` (elvis operator) if else block is needed.
- *
- * Example:
- * ```
- * array.firstOrNull()?.guard { Log.d(TAG, "$it is guaranteed to not be null here") }
- * ```
- *
- */
-internal inline fun <T> T.guard(block: (T) -> Unit): T {
-    return this.also(block)
-}
\ No newline at end of file
diff --git a/service/src/com/android/car/am/FixedActivityService.java b/service/src/com/android/car/am/FixedActivityService.java
index 38e31d1..81bc470 100644
--- a/service/src/com/android/car/am/FixedActivityService.java
+++ b/service/src/com/android/car/am/FixedActivityService.java
@@ -17,6 +17,7 @@
 
 import static android.app.ActivityTaskManager.INVALID_TASK_ID;
 import static android.os.Process.INVALID_UID;
+import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG;
 
 import static com.android.car.CarLog.TAG_AM;
 
@@ -26,7 +27,9 @@
 import android.app.ActivityManager;
 import android.app.ActivityManager.StackInfo;
 import android.app.ActivityOptions;
+import android.app.ActivityTaskManager;
 import android.app.IActivityManager;
+import android.app.IActivityTaskManager;
 import android.app.IProcessObserver;
 import android.app.Presentation;
 import android.app.TaskStackListener;
@@ -58,6 +61,7 @@
 import com.android.car.R;
 import com.android.car.user.CarUserService;
 import com.android.internal.annotations.GuardedBy;
+import com.android.internal.annotations.VisibleForTesting;
 
 import java.io.PrintWriter;
 import java.util.List;
@@ -127,6 +131,7 @@
     private final Context mContext;
 
     private final IActivityManager mAm;
+    private final IActivityTaskManager mAtm;
 
     private final DisplayManager mDm;
 
@@ -148,8 +153,9 @@
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
             if (Intent.ACTION_PACKAGE_CHANGED.equals(action)
-                    || Intent.ACTION_PACKAGE_REPLACED.equals(
-                    action)) {
+                    || Intent.ACTION_PACKAGE_REPLACED.equals(action)
+                    || Intent.ACTION_PACKAGE_ADDED.equals(action)
+                    || Intent.ACTION_PACKAGE_REMOVED.equals(action)) {
                 Uri packageData = intent.getData();
                 if (packageData == null) {
                     Log.w(TAG_AM, "null packageData");
@@ -166,15 +172,15 @@
                 synchronized (mLock) {
                     for (int i = 0; i < mRunningActivities.size(); i++) {
                         RunningActivityInfo info = mRunningActivities.valueAt(i);
-                        ComponentName component = info.intent.getComponent();
-                        // should do this for all activities as the same package can cover multiple
-                        // displays.
-                        if (packageName.equals(component.getPackageName())
-                                && info.userId == userId) {
-                            Log.i(TAG_AM, "Package updated:" + packageName
-                                    + ",user:" + userId);
+                        // Should do this for all activities as it can happen for multiple
+                        // displays. Package name is ignored as one package can affect
+                        // others.
+                        if (info.userId == userId) {
+                            Log.i(TAG_AM, "Package changed:" + packageName
+                                    + ",user:" + userId + ",action:" + action);
                             info.resetCrashCounterLocked();
                             tryLaunch = true;
+                            break;
                         }
                     }
                 }
@@ -211,8 +217,47 @@
         public void onTaskRemovalStarted(int taskId) {
             launchIfNecessary();
         }
+
+        @Override
+        public void onTaskFocusChanged(int taskId, boolean focused) {
+            handleTaskFocusChanged(taskId, focused);
+        }
     };
 
+    @VisibleForTesting
+    void handleTaskFocusChanged(int taskId, boolean focused) {
+        if (DBG) Log.d(TAG_AM, "handleTaskFocusChanged taskId=" + taskId + ", focused=" + focused);
+        if (!focused) {
+            return;  // We don't care the focus losing events.
+        }
+        synchronized (mLock) {
+            for (int i = mRunningActivities.size() - 1; i >= 0; i--) {
+                RunningActivityInfo info = mRunningActivities.valueAt(i);
+                if (DBG) Log.d(TAG_AM, "Checking " + info);
+                if (info.taskId == taskId) {
+                    moveFocusBackToDefaultDisplay(taskId);
+                    return;
+                }
+            }
+        }
+    }
+
+    private void moveFocusBackToDefaultDisplay(int taskId) {
+        try {
+            List<StackInfo> tasks = mAtm.getAllStackInfosOnDisplay(Display.DEFAULT_DISPLAY);
+            if (tasks.size() == 0) return;
+            StackInfo topStack = tasks.get(0);
+            int topTaskIdInDefaultDisplay = topStack.taskIds[topStack.taskIds.length - 1];
+            if (DBG) {
+                Log.d(TAG_AM, "FixedActivity #" + taskId + " got the focus, return back to #"
+                        + topTaskIdInDefaultDisplay);
+            }
+            mAtm.setFocusedTask(topTaskIdInDefaultDisplay);
+        } catch (RemoteException e) {
+            Log.e(TAG_AM, "remote exception from ATM", e);
+        }
+    }
+
     private final IProcessObserver mProcessObserver = new IProcessObserver.Stub() {
         @Override
         public void onForegroundActivitiesChanged(int pid, int uid, boolean foregroundActivities) {
@@ -266,14 +311,17 @@
     };
 
     public FixedActivityService(Context context) {
-        this(context, ActivityManager.getService(), context.getSystemService(UserManager.class),
+        this(context, ActivityManager.getService(), ActivityTaskManager.getService(),
+                context.getSystemService(UserManager.class),
                 context.getSystemService(DisplayManager.class));
     }
 
     FixedActivityService(Context context, IActivityManager activityManager,
+            IActivityTaskManager activityTaskManager,
             UserManager userManager, DisplayManager displayManager) {
         mContext = context;
         mAm = activityManager;
+        mAtm = activityTaskManager;
         mUm = userManager;
         mDm = displayManager;
         mHandlerThread = CarServiceUtils.getHandlerThread(
@@ -337,6 +385,8 @@
         IntentFilter filter = new IntentFilter();
         filter.addAction(Intent.ACTION_PACKAGE_CHANGED);
         filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
+        filter.addAction(Intent.ACTION_PACKAGE_ADDED);
+        filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
         filter.addDataScheme("package");
         mContext.registerReceiverAsUser(mBroadcastReceiver, UserHandle.ALL, filter,
                 /* broadcastPermission= */ null, /* scheduler= */ null);
@@ -444,12 +494,23 @@
                             }
                             mBlockingPresentations.append(displayIdForActivity, p);
                         }
+                        // Change the window type, since we can't show the Presentation window
+                        // in the internal display.
+                        p.getWindow().setType(TYPE_SYSTEM_DIALOG);
                         p.show();
                     });
                 }
                 mRunningActivities.removeAt(i);
             }
+            int previousDisplayId = Display.INVALID_DISPLAY;
             for (StackInfo stackInfo : infos) {
+                // In the current ATMS implementation which enumerates the display first, then
+                // enumerates the stack/task, so the tasks in the same display come consecutively.
+                if (stackInfo.displayId == previousDisplayId) {
+                    // 2nd+ tasks, skip it.
+                    continue;
+                }
+                previousDisplayId = stackInfo.displayId;
                 RunningActivityInfo activityInfo = mRunningActivities.get(stackInfo.displayId);
                 if (activityInfo == null) {
                     continue;
diff --git a/service/src/com/android/car/audio/CarAudioDynamicRouting.java b/service/src/com/android/car/audio/CarAudioDynamicRouting.java
index ea61542..6b49bf8 100644
--- a/service/src/com/android/car/audio/CarAudioDynamicRouting.java
+++ b/service/src/com/android/car/audio/CarAudioDynamicRouting.java
@@ -23,6 +23,7 @@
 import android.media.audiopolicy.AudioMixingRule;
 import android.media.audiopolicy.AudioPolicy;
 import android.util.Log;
+import android.util.SparseArray;
 
 import com.android.car.CarLog;
 
@@ -31,7 +32,7 @@
 /**
  * Builds dynamic audio routing in a car from audio zone configuration.
  */
-/* package */ class CarAudioDynamicRouting {
+final class CarAudioDynamicRouting {
     // For legacy stream type based volume control.
     // Values in STREAM_TYPES and STREAM_TYPE_USAGES should be aligned.
     static final int[] STREAM_TYPES = new int[] {
@@ -45,14 +46,10 @@
             AudioAttributes.USAGE_NOTIFICATION_RINGTONE
     };
 
-    private final CarAudioZone[] mCarAudioZones;
-
-    CarAudioDynamicRouting(CarAudioZone[] carAudioZones) {
-        mCarAudioZones = carAudioZones;
-    }
-
-    void setupAudioDynamicRouting(AudioPolicy.Builder builder) {
-        for (CarAudioZone zone : mCarAudioZones) {
+    static void setupAudioDynamicRouting(AudioPolicy.Builder builder,
+            SparseArray<CarAudioZone> carAudioZones) {
+        for (int i = 0; i < carAudioZones.size(); i++) {
+            CarAudioZone zone = carAudioZones.valueAt(i);
             for (CarVolumeGroup group : zone.getVolumeGroups()) {
                 setupAudioDynamicRoutingForGroup(group, builder);
             }
@@ -64,7 +61,7 @@
      * @param group {@link CarVolumeGroup} instance to enumerate the buses with
      * @param builder {@link AudioPolicy.Builder} to attach the mixing rules
      */
-    private void setupAudioDynamicRoutingForGroup(CarVolumeGroup group,
+    private static void setupAudioDynamicRoutingForGroup(CarVolumeGroup group,
             AudioPolicy.Builder builder) {
         // Note that one can not register audio mix for same bus more than once.
         for (String address : group.getAddresses()) {
@@ -105,7 +102,7 @@
         }
     }
 
-    private AudioAttributes buildAttributesWithUsage(@AttributeUsage int usage) {
+    private static AudioAttributes buildAttributesWithUsage(@AttributeUsage int usage) {
         AudioAttributes.Builder attributesBuilder = new AudioAttributes.Builder();
         if (AudioAttributes.isSystemUsage(usage)) {
             attributesBuilder.setSystemUsage(usage);
diff --git a/service/src/com/android/car/audio/CarAudioService.java b/service/src/com/android/car/audio/CarAudioService.java
index db081eb..fe373d9 100644
--- a/service/src/com/android/car/audio/CarAudioService.java
+++ b/service/src/com/android/car/audio/CarAudioService.java
@@ -54,6 +54,7 @@
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
+import android.util.SparseArray;
 import android.util.SparseIntArray;
 import android.view.KeyEvent;
 
@@ -67,6 +68,7 @@
 import com.android.car.audio.hal.AudioControlWrapper;
 import com.android.car.audio.hal.AudioControlWrapperV1;
 import com.android.car.audio.hal.HalAudioFocus;
+import com.android.internal.annotations.GuardedBy;
 import com.android.internal.util.Preconditions;
 
 import org.xmlpull.v1.XmlPullParserException;
@@ -212,7 +214,8 @@
     private CarZonesAudioFocus mFocusHandler;
     private String mCarAudioConfigurationPath;
     private SparseIntArray mAudioZoneIdToOccupantZoneIdMapping;
-    private CarAudioZone[] mCarAudioZones;
+    @GuardedBy("mImplLock")
+    private SparseArray<CarAudioZone> mCarAudioZones;
     private final CarVolumeCallbackHandler mCarVolumeCallbackHandler;
     private final SparseIntArray mAudioZoneIdToUserIdMapping;
 
@@ -303,8 +306,11 @@
         // Empty line for comfortable reading
         writer.println();
         if (mUseDynamicRouting) {
-            for (CarAudioZone zone : mCarAudioZones) {
-                zone.dump("\t", writer);
+            synchronized (mImplLock) {
+                for (int i = 0; i < mCarAudioZones.size(); i++) {
+                    CarAudioZone zone = mCarAudioZones.valueAt(i);
+                    zone.dump("\t", writer);
+                }
             }
             writer.println();
             writer.println("\tUserId to Zone Mapping:");
@@ -358,7 +364,7 @@
                 return;
             }
 
-            CarVolumeGroup group = getCarVolumeGroup(zoneId, groupId);
+            CarVolumeGroup group = getCarVolumeGroupLocked(zoneId, groupId);
             group.setCurrentGainIndex(index);
         }
     }
@@ -400,7 +406,7 @@
                         CarAudioDynamicRouting.STREAM_TYPES[groupId]);
             }
 
-            CarVolumeGroup group = getCarVolumeGroup(zoneId, groupId);
+            CarVolumeGroup group = getCarVolumeGroupLocked(zoneId, groupId);
             return group.getMaxGainIndex();
         }
     }
@@ -419,7 +425,7 @@
                         CarAudioDynamicRouting.STREAM_TYPES[groupId]);
             }
 
-            CarVolumeGroup group = getCarVolumeGroup(zoneId, groupId);
+            CarVolumeGroup group = getCarVolumeGroupLocked(zoneId, groupId);
             return group.getMinGainIndex();
         }
     }
@@ -438,16 +444,14 @@
                         CarAudioDynamicRouting.STREAM_TYPES[groupId]);
             }
 
-            CarVolumeGroup group = getCarVolumeGroup(zoneId, groupId);
+            CarVolumeGroup group = getCarVolumeGroupLocked(zoneId, groupId);
             return group.getCurrentGainIndex();
         }
     }
 
-    private CarVolumeGroup getCarVolumeGroup(int zoneId, int groupId) {
-        Objects.requireNonNull(mCarAudioZones);
-        Preconditions.checkArgumentInRange(zoneId, 0, mCarAudioZones.length - 1,
-                "zoneId out of range: " + zoneId);
-        return mCarAudioZones[zoneId].getVolumeGroup(groupId);
+    @GuardedBy("mImplLock")
+    private CarVolumeGroup getCarVolumeGroupLocked(int zoneId, int groupId) {
+        return getCarAudioZoneLocked(zoneId).getVolumeGroup(groupId);
     }
 
     private void setupLegacyVolumeChangedListener() {
@@ -472,7 +476,7 @@
                 AudioManager.GET_DEVICES_INPUTS);
     }
 
-    private CarAudioZone[] loadCarAudioConfigurationLocked(
+    private SparseArray<CarAudioZone> loadCarAudioConfigurationLocked(
             List<CarAudioDeviceInfo> carAudioDeviceInfos) {
         AudioDeviceInfo[] inputDevices = getAllInputDevices();
         try (InputStream inputStream = new FileInputStream(mCarAudioConfigurationPath)) {
@@ -486,7 +490,7 @@
         }
     }
 
-    private CarAudioZone[] loadVolumeGroupConfigurationWithAudioControlLocked(
+    private SparseArray<CarAudioZone> loadVolumeGroupConfigurationWithAudioControlLocked(
             List<CarAudioDeviceInfo> carAudioDeviceInfos) {
         AudioControlWrapper audioControlWrapper = getAudioControlWrapperLocked();
         if (!(audioControlWrapper instanceof AudioControlWrapperV1)) {
@@ -500,6 +504,7 @@
         return legacyHelper.loadAudioZones();
     }
 
+    @GuardedBy("mImplLock")
     private void loadCarAudioZonesLocked() {
         List<CarAudioDeviceInfo> carAudioDeviceInfos = generateCarAudioDeviceInfos();
 
@@ -514,21 +519,21 @@
         CarAudioZonesValidator.validate(mCarAudioZones);
     }
 
+    @GuardedBy("mImplLock")
     private void setupDynamicRoutingLocked() {
         final AudioPolicy.Builder builder = new AudioPolicy.Builder(mContext);
         builder.setLooper(Looper.getMainLooper());
 
         loadCarAudioZonesLocked();
 
-        for (CarAudioZone zone : mCarAudioZones) {
+        for (int i = 0; i < mCarAudioZones.size(); i++) {
+            CarAudioZone zone = mCarAudioZones.valueAt(i);
             // Ensure HAL gets our initial value
             zone.synchronizeCurrentGainIndex();
             Log.v(CarLog.TAG_AUDIO, "Processed audio zone: " + zone);
         }
 
-        // Setup dynamic routing rules by usage
-        final CarAudioDynamicRouting dynamicRouting = new CarAudioDynamicRouting(mCarAudioZones);
-        dynamicRouting.setupAudioDynamicRouting(builder);
+        CarAudioDynamicRouting.setupAudioDynamicRouting(builder, mCarAudioZones);
 
         // Attach the {@link AudioPolicyVolumeCallback}
         builder.setAudioPolicyVolumeCallback(mAudioPolicyVolumeCallback);
@@ -662,7 +667,7 @@
 
     @Override
     public CarAudioPatchHandle createAudioPatch(String sourceAddress,
-            @AudioAttributes.AttributeUsage int usage, int gainInMillibels) {
+            @AttributeUsage int usage, int gainInMillibels) {
         synchronized (mImplLock) {
             enforcePermission(Car.PERMISSION_CAR_CONTROL_AUDIO_SETTINGS);
             return createAudioPatchLocked(sourceAddress, usage, gainInMillibels);
@@ -678,7 +683,7 @@
     }
 
     private CarAudioPatchHandle createAudioPatchLocked(String sourceAddress,
-            @AudioAttributes.AttributeUsage int usage, int gainInMillibels) {
+            @AttributeUsage int usage, int gainInMillibels) {
         // Find the named source port
         AudioDeviceInfo sourcePortInfo = null;
         AudioDeviceInfo[] deviceInfos = mAudioManager.getDevices(AudioManager.GET_DEVICES_INPUTS);
@@ -772,14 +777,12 @@
             // For legacy stream type based volume control
             if (!mUseDynamicRouting) return CarAudioDynamicRouting.STREAM_TYPES.length;
 
-            Preconditions.checkArgumentInRange(zoneId, 0, mCarAudioZones.length - 1,
-                    "zoneId out of range: " + zoneId);
-            return mCarAudioZones[zoneId].getVolumeGroupCount();
+            return getCarAudioZoneLocked(zoneId).getVolumeGroupCount();
         }
     }
 
     @Override
-    public int getVolumeGroupIdForUsage(int zoneId, @AudioAttributes.AttributeUsage int usage) {
+    public int getVolumeGroupIdForUsage(int zoneId, @AttributeUsage int usage) {
         synchronized (mImplLock) {
             enforcePermission(Car.PERMISSION_CAR_CONTROL_AUDIO_VOLUME);
 
@@ -793,16 +796,14 @@
                 return INVALID_VOLUME_GROUP_ID;
             }
 
-            Preconditions.checkArgumentInRange(zoneId, 0, mCarAudioZones.length - 1,
-                    "zoneId out of range: " + zoneId);
-
             @AudioContext int audioContext = CarAudioContext.getContextForUsage(usage);
             return getVolumeGroupIdForAudioContextLocked(zoneId, audioContext);
         }
     }
 
+    @GuardedBy("mImplLock")
     private int getVolumeGroupIdForAudioContextLocked(int zoneId, @AudioContext int audioContext) {
-        CarVolumeGroup[] groups = mCarAudioZones[zoneId].getVolumeGroups();
+        CarVolumeGroup[] groups = getCarAudioZoneLocked(zoneId).getVolumeGroups();
         for (int i = 0; i < groups.length; i++) {
             int[] groupAudioContexts = groups[i].getContexts();
             for (int groupAudioContext : groupAudioContexts) {
@@ -824,13 +825,13 @@
                 return new int[] { CarAudioDynamicRouting.STREAM_TYPE_USAGES[groupId] };
             }
 
-            CarVolumeGroup group = getCarVolumeGroup(zoneId, groupId);
+            CarVolumeGroup group = getCarVolumeGroupLocked(zoneId, groupId);
             Set<Integer> contexts =
                     Arrays.stream(group.getContexts()).boxed().collect(Collectors.toSet());
             final List<Integer> usages = new ArrayList<>();
             for (@AudioContext int context : contexts) {
                 int[] usagesForContext = CarAudioContext.getUsagesForContext(context);
-                for (@AudioAttributes.AttributeUsage int usage : usagesForContext) {
+                for (@AttributeUsage int usage : usagesForContext) {
                     usages.add(usage);
                 }
             }
@@ -848,7 +849,11 @@
         enforcePermission(Car.PERMISSION_CAR_CONTROL_AUDIO_SETTINGS);
         requireDynamicRouting();
         synchronized (mImplLock) {
-            return Arrays.stream(mCarAudioZones).mapToInt(CarAudioZone::getId).toArray();
+            int[] zoneIds = new int[mCarAudioZones.size()];
+            for (int i = 0; i < mCarAudioZones.size(); i++) {
+                zoneIds[i] = mCarAudioZones.keyAt(i);
+            }
+            return zoneIds;
         }
     }
 
@@ -892,19 +897,25 @@
      *
      * @param zoneId The audio zone id
      * @param uid The uid to map
+     *
+     * <p><b>Note:</b> Will throw if occupant zone mapping exist, as uid and occupant zone mapping
+     * do not work in conjunction.
+     *
      * @return true if the device affinities, for devices in zone, are successfully set
      */
     @Override
     public boolean setZoneIdForUid(int zoneId, int uid) {
         enforcePermission(Car.PERMISSION_CAR_CONTROL_AUDIO_SETTINGS);
         requireDynamicRouting();
-        Preconditions.checkArgument(isAudioZoneIdValid(zoneId),
-                "Invalid audio zone id %d", zoneId);
         synchronized (mImplLock) {
+            checkAudioZoneIdLocked(zoneId);
             Log.i(CarLog.TAG_AUDIO, "setZoneIdForUid Calling uid "
                     + uid + " mapped to : "
                     + zoneId);
 
+            // If occupant mapping exist uid routing can not be used
+            requiredOccupantZoneMappingDisabledLocked();
+
             // Figure out if anything is currently holding focus,
             // This will change the focus to transient loss while we are switching zones
             Integer currentZoneId = mUidToZoneMap.get(uid);
@@ -952,16 +963,13 @@
     }
 
     @Override
-    public String getOutputDeviceAddressForUsage(int zoneId,
-            @AudioAttributes.AttributeUsage int usage) {
+    public String getOutputDeviceAddressForUsage(int zoneId, @AttributeUsage int usage) {
         enforcePermission(Car.PERMISSION_CAR_CONTROL_AUDIO_SETTINGS);
         requireDynamicRouting();
-        Preconditions.checkArgumentInRange(zoneId, 0, mCarAudioZones.length - 1,
-                "zoneId (" + zoneId + ")");
         int contextForUsage = CarAudioContext.getContextForUsage(usage);
         Preconditions.checkArgument(contextForUsage != CarAudioContext.INVALID,
                 "Invalid audio attribute usage %d", usage);
-        return mCarAudioZones[zoneId].getAddressForContext(contextForUsage);
+        return getCarAudioZone(zoneId).getAddressForContext(contextForUsage);
     }
 
     /**
@@ -985,6 +993,10 @@
     /**
      * Removes the current mapping of the uid, focus will be lost in zone
      * @param uid The uid to remove
+     *
+     * <p><b>Note:</b> Will throw if occupant zone mapping exist, as uid and occupant zone mapping
+     * do not work in conjunction.
+     *
      * return true if all the devices affinities currently
      *            mapped to uid are successfully removed
      */
@@ -993,6 +1005,10 @@
         enforcePermission(Car.PERMISSION_CAR_CONTROL_AUDIO_SETTINGS);
         requireDynamicRouting();
         synchronized (mImplLock) {
+            // Throw so as to not set the wrong expectation,
+            // that routing will be changed if clearZoneIdForUid is called.
+            requiredOccupantZoneMappingDisabledLocked();
+
             return checkAndRemoveUidLocked(uid);
         }
     }
@@ -1003,11 +1019,13 @@
      * @param uid uid to map
      * @return true if setting uid device affinity is successful
      */
+    @GuardedBy("mImplLock")
     private boolean setZoneIdForUidNoCheckLocked(int zoneId, int uid) {
         Log.d(CarLog.TAG_AUDIO, "setZoneIdForUidNoCheck Calling uid "
                 + uid + " mapped to " + zoneId);
         //Request to add uid device affinity
-        if (mAudioPolicy.setUidDeviceAffinity(uid, mCarAudioZones[zoneId].getAudioDeviceInfos())) {
+        List<AudioDeviceInfo> deviceInfos = getCarAudioZoneLocked(zoneId).getAudioDeviceInfos();
+        if (mAudioPolicy.setUidDeviceAffinity(uid, deviceInfos)) {
             // TODO do not store uid mapping here instead use the uid
             //  device affinity in audio policy when available
             mUidToZoneMap.put(uid, zoneId);
@@ -1062,14 +1080,8 @@
     public @NonNull List<AudioDeviceAttributes> getInputDevicesForZoneId(int zoneId) {
         enforcePermission(Car.PERMISSION_CAR_CONTROL_AUDIO_SETTINGS);
         requireDynamicRouting();
-        Preconditions.checkArgumentInRange(zoneId, 0, mCarAudioZones.length - 1,
-                "zoneId out of range: " + zoneId);
-        for (CarAudioZone zone : mCarAudioZones) {
-            if (zone.getId() == zoneId) {
-                return zone.getInputAudioDevices();
-            }
-        }
-        throw new IllegalArgumentException("zoneId does not exist" + zoneId);
+
+        return getCarAudioZone(zoneId).getInputAudioDevices();
     }
 
     private void enforcePermission(String permissionName) {
@@ -1083,15 +1095,22 @@
         Preconditions.checkState(mUseDynamicRouting, "Dynamic routing is required");
     }
 
+    private void requiredOccupantZoneMappingDisabledLocked() {
+        if (isOccupantZoneMappingAvailableLocked()) {
+            throw new IllegalStateException(
+                    "UID based routing is not supported while using occupant zone mapping");
+        }
+    }
+
     /**
      * @return {@link AudioDevicePort} that handles the given car audio usage.
      * Multiple usages may share one {@link AudioDevicePort}
      */
-    private @Nullable AudioDevicePort getAudioPort(@AudioAttributes.AttributeUsage int usage) {
+    private @Nullable AudioDevicePort getAudioPort(@AttributeUsage int usage) {
         int zoneId = CarAudioManager.PRIMARY_AUDIO_ZONE;
         final int groupId = getVolumeGroupIdForUsage(zoneId, usage);
         final CarVolumeGroup group = Objects.requireNonNull(
-                mCarAudioZones[zoneId].getVolumeGroup(groupId),
+                getCarVolumeGroupLocked(zoneId, groupId),
                 "Can not find CarVolumeGroup by usage: "
                         + AudioAttributes.usageToString(usage));
         return group.getAudioDevicePortForContext(CarAudioContext.getContextForUsage(usage));
@@ -1123,10 +1142,10 @@
     private void handleOccupantZoneUserChanged() {
         int driverUserId = mOccupantZoneService.getDriverUserId();
         synchronized (mImplLock) {
-            if (!isOccupantZoneMappingAvailable()) {
+            if (!isOccupantZoneMappingAvailableLocked()) {
                 //No occupant zone to audio zone mapping, re-adjust to settings driver.
-                for (int index = 0; index < mCarAudioZones.length; index++) {
-                    CarAudioZone zone = mCarAudioZones[index];
+                for (int i = 0; i < mCarAudioZones.size(); i++) {
+                    CarAudioZone zone = mCarAudioZones.valueAt(i);
                     zone.updateVolumeGroupsForUser(driverUserId);
                     mFocusHandler.updateUserForZoneId(zone.getId(), driverUserId);
                 }
@@ -1142,20 +1161,17 @@
         }
     }
 
-    private boolean isOccupantZoneMappingAvailable() {
+    private boolean isOccupantZoneMappingAvailableLocked() {
         return mAudioZoneIdToOccupantZoneIdMapping.size() > 0;
     }
 
+    @GuardedBy("mImplLock")
     private void updateUserForOccupantZoneLocked(int occupantZoneId, int audioZoneId,
             @UserIdInt int driverUserId, int occupantZoneForDriver) {
-        CarAudioZone zone = getAudioZoneForZoneIdLocked(audioZoneId);
+        CarAudioZone audioZone = getCarAudioZoneLocked(audioZoneId);
         int userId = mOccupantZoneService.getUserForOccupant(occupantZoneId);
         int prevUserId = getUserIdForZoneLocked(audioZoneId);
 
-        Objects.requireNonNull(zone, () ->
-                "setUserIdDeviceAffinity for userId " + userId
-                        + " in zone " + audioZoneId + " Failed, invalid zone.");
-
         // user in occupant zone has not changed
         if (userId == prevUserId) {
             return;
@@ -1167,16 +1183,16 @@
 
         if (userId == UserHandle.USER_NULL) {
             // Reset zone back to driver user id
-            resetZoneToDefaultUser(zone, driverUserId);
+            resetZoneToDefaultUser(audioZone, driverUserId);
             return;
         }
 
         // Only set user id device affinities for driver when it is the driver's occupant zone
         if (userId != driverUserId || occupantZoneId == occupantZoneForDriver) {
-            setUserIdDeviceAffinitiesLocked(zone, userId, audioZoneId);
+            setUserIdDeviceAffinitiesLocked(audioZone, userId, audioZoneId);
             mAudioZoneIdToUserIdMapping.put(audioZoneId, userId);
         }
-        zone.updateVolumeGroupsForUser(userId);
+        audioZone.updateVolumeGroupsForUser(userId);
         mFocusHandler.updateUserForZoneId(audioZoneId, userId);
     }
 
@@ -1210,15 +1226,6 @@
         mFocusHandler.updateUserForZoneId(audioZoneId, driverUserId);
     }
 
-    private CarAudioZone getAudioZoneForZoneIdLocked(int audioZoneId) {
-        for (CarAudioZone zone : mCarAudioZones) {
-            if (zone.getId() == audioZoneId) {
-                return zone;
-            }
-        }
-        return null;
-    }
-
     private void removeUserIdDeviceAffinitiesLocked(@UserIdInt int userId) {
         if (Log.isLoggable(CarLog.TAG_AUDIO, Log.DEBUG)) {
             Log.d(CarLog.TAG_AUDIO,
@@ -1253,12 +1260,27 @@
     }
 
     boolean isAudioZoneIdValid(int zoneId) {
-        for (CarAudioZone zone : mCarAudioZones) {
-            if (zone.getId() == zoneId) {
-                return true;
-            }
+        synchronized (mImplLock) {
+            return mCarAudioZones.contains(zoneId);
         }
-        return false;
+    }
+
+    private CarAudioZone getCarAudioZone(int zoneId) {
+        synchronized (mImplLock) {
+            return getCarAudioZoneLocked(zoneId);
+        }
+    }
+
+    @GuardedBy("mImplLock")
+    private CarAudioZone getCarAudioZoneLocked(int zoneId) {
+        checkAudioZoneIdLocked(zoneId);
+        return mCarAudioZones.get(zoneId);
+    }
+
+    @GuardedBy("mImplLock")
+    private void checkAudioZoneIdLocked(int zoneId) {
+        Preconditions.checkArgument(mCarAudioZones.contains(zoneId),
+                "Invalid audio zone Id " + zoneId);
     }
 
     private class CarAudioOccupantConfigChangeListener implements OccupantZoneConfigChangeListener {
diff --git a/service/src/com/android/car/audio/CarAudioZonesHelper.java b/service/src/com/android/car/audio/CarAudioZonesHelper.java
index 1a4e0ad..810aca3 100644
--- a/service/src/com/android/car/audio/CarAudioZonesHelper.java
+++ b/service/src/com/android/car/audio/CarAudioZonesHelper.java
@@ -15,11 +15,13 @@
  */
 package com.android.car.audio;
 
+import static android.car.media.CarAudioManager.PRIMARY_AUDIO_ZONE;
+
 import android.annotation.NonNull;
-import android.car.media.CarAudioManager;
 import android.media.AudioDeviceAttributes;
 import android.media.AudioDeviceInfo;
 import android.text.TextUtils;
+import android.util.SparseArray;
 import android.util.SparseIntArray;
 import android.util.Xml;
 
@@ -33,7 +35,6 @@
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -132,7 +133,6 @@
     private final Set<Integer> mAudioZoneIds;
     private final Set<String> mInputAudioDevices;
 
-    private boolean mHasPrimaryZone;
     private int mNextSecondaryZoneId;
     private int mCurrentVersion;
 
@@ -152,7 +152,7 @@
                 carAudioDeviceInfos);
         mAddressToInputAudioDeviceInfo =
                 CarAudioZonesHelper.generateAddressToInputAudioDeviceInfoMap(inputDeviceInfo);
-        mNextSecondaryZoneId = CarAudioManager.PRIMARY_AUDIO_ZONE + 1;
+        mNextSecondaryZoneId = PRIMARY_AUDIO_ZONE + 1;
         mZoneIdToOccupantZoneIdMapping = new SparseIntArray();
         mAudioZoneIds = new HashSet<>();
         mInputAudioDevices = new HashSet<>();
@@ -162,11 +162,8 @@
         return mZoneIdToOccupantZoneIdMapping;
     }
 
-    // TODO: refactor this method to return List<CarAudioZone>
-    CarAudioZone[] loadAudioZones() throws IOException, XmlPullParserException {
-        List<CarAudioZone> carAudioZones = new ArrayList<>();
-        parseCarAudioZones(carAudioZones, mInputStream);
-        return carAudioZones.toArray(new CarAudioZone[0]);
+    SparseArray<CarAudioZone> loadAudioZones() throws IOException, XmlPullParserException {
+        return parseCarAudioZones(mInputStream);
     }
 
     private static Map<String, CarAudioDeviceInfo> generateAddressToInfoMap(
@@ -189,9 +186,9 @@
         return deviceAddressToInputDeviceMap;
     }
 
-    private void parseCarAudioZones(List<CarAudioZone> carAudioZones, InputStream stream)
+    private SparseArray<CarAudioZone> parseCarAudioZones(InputStream stream)
             throws XmlPullParserException, IOException {
-        final XmlPullParser parser = Xml.newPullParser();
+        XmlPullParser parser = Xml.newPullParser();
         parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, NAMESPACE != null);
         parser.setInput(stream, null);
 
@@ -214,35 +211,50 @@
         while (parser.next() != XmlPullParser.END_TAG) {
             if (parser.getEventType() != XmlPullParser.START_TAG) continue;
             if (TAG_AUDIO_ZONES.equals(parser.getName())) {
-                parseAudioZones(parser, carAudioZones);
+                return parseAudioZones(parser);
             } else {
                 skip(parser);
             }
         }
+        throw new RuntimeException(TAG_AUDIO_ZONES + " is missing from configuration");
     }
 
-    private void parseAudioZones(XmlPullParser parser, List<CarAudioZone> carAudioZones)
+    private SparseArray<CarAudioZone> parseAudioZones(XmlPullParser parser)
             throws XmlPullParserException, IOException {
+        SparseArray<CarAudioZone> carAudioZones = new SparseArray<>();
+
         while (parser.next() != XmlPullParser.END_TAG) {
             if (parser.getEventType() != XmlPullParser.START_TAG) continue;
             if (TAG_AUDIO_ZONE.equals(parser.getName())) {
-                carAudioZones.add(parseAudioZone(parser));
+                CarAudioZone zone = parseAudioZone(parser);
+                verifyOnlyOnePrimaryZone(zone, carAudioZones);
+                carAudioZones.put(zone.getId(), zone);
             } else {
                 skip(parser);
             }
         }
-        Preconditions.checkArgument(mHasPrimaryZone, "Requires one primary zone");
-        carAudioZones.sort(Comparator.comparing(CarAudioZone::getId));
+
+        verifyPrimaryZonePresent(carAudioZones);
+        return carAudioZones;
+    }
+
+    private void verifyOnlyOnePrimaryZone(CarAudioZone newZone, SparseArray<CarAudioZone> zones) {
+        if (newZone.getId() == PRIMARY_AUDIO_ZONE && zones.contains(PRIMARY_AUDIO_ZONE)) {
+            throw new RuntimeException("More than one zone parsed with primary audio zone ID: "
+                            + PRIMARY_AUDIO_ZONE);
+        }
+    }
+
+    private void verifyPrimaryZonePresent(SparseArray<CarAudioZone> zones) {
+        if (!zones.contains(PRIMARY_AUDIO_ZONE)) {
+            throw new RuntimeException("Primary audio zone is required");
+        }
     }
 
     private CarAudioZone parseAudioZone(XmlPullParser parser)
             throws XmlPullParserException, IOException {
         final boolean isPrimary = Boolean.parseBoolean(
                 parser.getAttributeValue(NAMESPACE, ATTR_IS_PRIMARY));
-        if (isPrimary) {
-            Preconditions.checkArgument(!mHasPrimaryZone, "Only one primary zone is allowed");
-            mHasPrimaryZone = true;
-        }
         final String zoneName = parser.getAttributeValue(NAMESPACE, ATTR_ZONE_NAME);
         final int audioZoneId = getZoneId(isPrimary, parser);
         parseOccupantZoneId(audioZoneId, parser);
@@ -268,25 +280,25 @@
                     "Invalid audio attribute %s"
                             + ", Please update car audio configurations file "
                             + "to version to 2 to use it.", ATTR_ZONE_ID);
-            return isPrimary ? CarAudioManager.PRIMARY_AUDIO_ZONE
+            return isPrimary ? PRIMARY_AUDIO_ZONE
                     : getNextSecondaryZoneId();
         }
         // Primary zone does not need to define it
         if (isPrimary && audioZoneIdString == null) {
-            return CarAudioManager.PRIMARY_AUDIO_ZONE;
+            return PRIMARY_AUDIO_ZONE;
         }
         Objects.requireNonNull(audioZoneIdString, () ->
                 "Requires " + ATTR_ZONE_ID + " for all audio zones.");
         int zoneId = parsePositiveIntAttribute(ATTR_ZONE_ID, audioZoneIdString);
         //Verify that primary zone id is PRIMARY_AUDIO_ZONE
         if (isPrimary) {
-            Preconditions.checkArgument(zoneId == CarAudioManager.PRIMARY_AUDIO_ZONE,
+            Preconditions.checkArgument(zoneId == PRIMARY_AUDIO_ZONE,
                     "Primary zone %s must be %d or it can be left empty.",
-                    ATTR_ZONE_ID, CarAudioManager.PRIMARY_AUDIO_ZONE);
+                    ATTR_ZONE_ID, PRIMARY_AUDIO_ZONE);
         } else {
-            Preconditions.checkArgument(zoneId != CarAudioManager.PRIMARY_AUDIO_ZONE,
+            Preconditions.checkArgument(zoneId != PRIMARY_AUDIO_ZONE,
                     "%s can only be %d for primary zone.",
-                    ATTR_ZONE_ID, CarAudioManager.PRIMARY_AUDIO_ZONE);
+                    ATTR_ZONE_ID, PRIMARY_AUDIO_ZONE);
         }
         validateAudioZoneIdIsUnique(zoneId);
         return zoneId;
diff --git a/service/src/com/android/car/audio/CarAudioZonesHelperLegacy.java b/service/src/com/android/car/audio/CarAudioZonesHelperLegacy.java
index 1b447f3..2b979ad 100644
--- a/service/src/com/android/car/audio/CarAudioZonesHelperLegacy.java
+++ b/service/src/com/android/car/audio/CarAudioZonesHelperLegacy.java
@@ -15,11 +15,12 @@
  */
 package com.android.car.audio;
 
+import static android.car.media.CarAudioManager.PRIMARY_AUDIO_ZONE;
+
 import static com.android.car.audio.CarAudioZonesHelper.LEGACY_CONTEXTS;
 
 import android.annotation.NonNull;
 import android.annotation.XmlRes;
-import android.car.media.CarAudioManager;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.content.res.XmlResourceParser;
@@ -125,14 +126,16 @@
         return busToCarAudioDeviceInfo;
     }
 
-    CarAudioZone[] loadAudioZones() {
-        final CarAudioZone zone = new CarAudioZone(CarAudioManager.PRIMARY_AUDIO_ZONE,
+    SparseArray<CarAudioZone> loadAudioZones() {
+        final CarAudioZone zone = new CarAudioZone(PRIMARY_AUDIO_ZONE,
                 "Primary zone");
         for (CarVolumeGroup group : loadVolumeGroups()) {
             zone.addVolumeGroup(group);
             bindContextsForVolumeGroup(group);
         }
-        return new CarAudioZone[]{zone};
+        SparseArray<CarAudioZone> carAudioZones = new SparseArray<>();
+        carAudioZones.put(PRIMARY_AUDIO_ZONE, zone);
+        return carAudioZones;
     }
 
     private void bindContextsForVolumeGroup(CarVolumeGroup group) {
@@ -201,7 +204,7 @@
             }
         }
 
-        return new CarVolumeGroup(mCarAudioSettings, CarAudioManager.PRIMARY_AUDIO_ZONE, id,
+        return new CarVolumeGroup(mCarAudioSettings, PRIMARY_AUDIO_ZONE, id,
                 contexts.stream().mapToInt(i -> i).filter(i -> i >= 0).toArray());
     }
 
diff --git a/service/src/com/android/car/audio/CarAudioZonesValidator.java b/service/src/com/android/car/audio/CarAudioZonesValidator.java
index 1bb0234..4a74cd8 100644
--- a/service/src/com/android/car/audio/CarAudioZonesValidator.java
+++ b/service/src/com/android/car/audio/CarAudioZonesValidator.java
@@ -16,24 +16,27 @@
 package com.android.car.audio;
 
 
+import android.util.SparseArray;
+
 import java.util.HashSet;
 import java.util.Set;
 
 class CarAudioZonesValidator {
-    static void validate(CarAudioZone[] carAudioZones) {
+    static void validate(SparseArray<CarAudioZone> carAudioZones) {
         validateAtLeastOneZoneDefined(carAudioZones);
         validateVolumeGroupsForEachZone(carAudioZones);
         validateEachAddressAppearsAtMostOnce(carAudioZones);
     }
 
-    private static void validateAtLeastOneZoneDefined(CarAudioZone[] carAudioZones) {
-        if (carAudioZones.length == 0) {
+    private static void validateAtLeastOneZoneDefined(SparseArray<CarAudioZone> carAudioZones) {
+        if (carAudioZones.size() == 0) {
             throw new RuntimeException("At least one zone should be defined");
         }
     }
 
-    private static void validateVolumeGroupsForEachZone(CarAudioZone[] carAudioZones) {
-        for (CarAudioZone zone : carAudioZones) {
+    private static void validateVolumeGroupsForEachZone(SparseArray<CarAudioZone> carAudioZones) {
+        for (int i = 0; i < carAudioZones.size(); i++) {
+            CarAudioZone zone = carAudioZones.valueAt(i);
             if (!zone.validateVolumeGroups()) {
                 throw new RuntimeException(
                         "Invalid volume groups configuration for zone " + zone.getId());
@@ -41,9 +44,11 @@
         }
     }
 
-    private static void validateEachAddressAppearsAtMostOnce(CarAudioZone[] carAudioZones) {
+    private static void validateEachAddressAppearsAtMostOnce(
+            SparseArray<CarAudioZone> carAudioZones) {
         Set<String> addresses = new HashSet<>();
-        for (CarAudioZone zone : carAudioZones) {
+        for (int i = 0; i < carAudioZones.size(); i++) {
+            CarAudioZone zone = carAudioZones.valueAt(i);
             for (CarVolumeGroup carVolumeGroup : zone.getVolumeGroups()) {
                 for (String address : carVolumeGroup.getAddresses()) {
                     if (!addresses.add(address)) {
diff --git a/service/src/com/android/car/audio/CarZonesAudioFocus.java b/service/src/com/android/car/audio/CarZonesAudioFocus.java
index ec024be..775a8a3 100644
--- a/service/src/com/android/car/audio/CarZonesAudioFocus.java
+++ b/service/src/com/android/car/audio/CarZonesAudioFocus.java
@@ -26,6 +26,7 @@
 import android.media.audiopolicy.AudioPolicy;
 import android.os.Bundle;
 import android.util.Log;
+import android.util.SparseArray;
 
 import com.android.car.CarLog;
 import com.android.internal.util.Preconditions;
@@ -51,7 +52,7 @@
 
     CarZonesAudioFocus(@NonNull AudioManager audioManager,
             @NonNull PackageManager packageManager,
-            @NonNull CarAudioZone[] carAudioZones,
+            @NonNull SparseArray<CarAudioZone> carAudioZones,
             @NonNull CarAudioSettings carAudioSettings,
             boolean enableDelayedAudioFocus) {
         //Create the zones here, the policy will be set setOwningPolicy,
@@ -60,11 +61,12 @@
         Objects.requireNonNull(packageManager);
         Objects.requireNonNull(carAudioZones);
         Objects.requireNonNull(carAudioSettings);
-        Preconditions.checkArgument(carAudioZones.length != 0,
+        Preconditions.checkArgument(carAudioZones.size() != 0,
                 "There must be a minimum of one audio zone");
 
         //Create focus for all the zones
-        for (CarAudioZone audioZone : carAudioZones) {
+        for (int i = 0; i < carAudioZones.size(); i++) {
+            CarAudioZone audioZone = carAudioZones.valueAt(i);
             int audioZoneId = audioZone.getId();
             if (Log.isLoggable(CarLog.TAG_AUDIO, Log.DEBUG)) {
                 Log.d(CarLog.TAG_AUDIO,
diff --git a/service/src/com/android/car/hal/InputHalService.java b/service/src/com/android/car/hal/InputHalService.java
index d6e3750..c39ba51 100644
--- a/service/src/com/android/car/hal/InputHalService.java
+++ b/service/src/com/android/car/hal/InputHalService.java
@@ -29,6 +29,7 @@
 import android.os.SystemClock;
 import android.util.Log;
 import android.util.SparseArray;
+import android.view.Display;
 import android.view.InputDevice;
 import android.view.KeyEvent;
 
@@ -341,6 +342,9 @@
                 0 /* flags */,
                 InputDevice.SOURCE_CLASS_BUTTON);
 
+        if (display == DISPLAY_MAIN) {
+            event.setDisplayId(Display.DEFAULT_DISPLAY);
+        }
         listener.onKeyEvent(event, display);
     }
 
diff --git a/service/src/com/android/car/hal/UserHalService.java b/service/src/com/android/car/hal/UserHalService.java
index acf26c4..40662e3 100644
--- a/service/src/com/android/car/hal/UserHalService.java
+++ b/service/src/com/android/car/hal/UserHalService.java
@@ -77,6 +77,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.concurrent.ThreadLocalRandom;
 
 /**
  * Service used to integrate the OEM's custom user management with Android's.
@@ -126,6 +127,12 @@
     private int mNextRequestId = 1;
 
     /**
+     * Base requestID. RequestID logged for west world metrics will be mBaseRequestID + original
+     * requestID
+     */
+    private final int mBaseRequestId;
+
+    /**
      * Map of callbacks by request id.
      */
     @GuardedBy("mLock")
@@ -139,6 +146,7 @@
     UserHalService(VehicleHal hal, Handler handler) {
         mHal = hal;
         mHandler = handler;
+        mBaseRequestId = ThreadLocalRandom.current().nextInt(0, Integer.MAX_VALUE);
     }
 
     @Override
@@ -259,6 +267,17 @@
         Preconditions.checkState(isUserAssociationSupported(), USER_ASSOCIATION_UNSUPPORTED_MSG);
     }
 
+    // Returns mBaseRequestId + originalRequestID. If it overflows, then MOD by Integer.MAX_VALUE
+    // This request Id is used for logging data in statsd for westworld metrics. As original request
+    // id starts with 1 after every restart, a random id is desired for co-relating metrics on the
+    // server side in the west world. mBaseRequestId is generated as a random id on each restart.
+    private int getRequestIdForStatsLog(int originalRequestId) {
+        if (Integer.MAX_VALUE - mBaseRequestId < originalRequestId) {
+            // overflow
+            return (mBaseRequestId - Integer.MAX_VALUE) + originalRequestId;
+        }
+        return mBaseRequestId + originalRequestId;
+    }
 
     /**
      * Calls HAL to asynchronously get info about the initial user.
@@ -294,7 +313,8 @@
         EventLog.writeEvent(EventLogTags.CAR_USER_HAL_INITIAL_USER_INFO_REQ, requestId,
                 requestType, timeoutMs);
         CarStatsLog.write(CarStatsLog.CAR_USER_HAL_INITIAL_USER_INFO_REQUEST_REPORTED,
-                requestId, getInitialUserInfoRequestTypeForStatsd(requestType), timeoutMs);
+                getRequestIdForStatsLog(requestId),
+                getInitialUserInfoRequestTypeForStatsd(requestType), timeoutMs);
 
         sendHalRequest(requestId, timeoutMs, propRequest, callback);
     }
@@ -365,7 +385,8 @@
 
         EventLog.writeEvent(EventLogTags.CAR_USER_HAL_SWITCH_USER_REQ, request.requestId,
                 request.targetUser.userId, timeoutMs);
-        CarStatsLog.write(CarStatsLog.CAR_USER_HAL_MODIFY_USER_REQUEST_REPORTED, request.requestId,
+        CarStatsLog.write(CarStatsLog.CAR_USER_HAL_MODIFY_USER_REQUEST_REPORTED,
+                getRequestIdForStatsLog(request.requestId),
                 CarStatsLog
                 .CAR_USER_HAL_MODIFY_USER_REQUEST_REPORTED__REQUEST_TYPE__SWITCH_REQUEST_ANDROID,
                 request.usersInfo.currentUser.userId, request.usersInfo.currentUser.flags,
@@ -390,7 +411,8 @@
 
         EventLog.writeEvent(EventLogTags.CAR_USER_HAL_REMOVE_USER_REQ,
                 request.removedUserInfo.userId, request.usersInfo.currentUser.userId);
-        CarStatsLog.write(CarStatsLog.CAR_USER_HAL_MODIFY_USER_REQUEST_REPORTED, request.requestId,
+        CarStatsLog.write(CarStatsLog.CAR_USER_HAL_MODIFY_USER_REQUEST_REPORTED,
+                getRequestIdForStatsLog(request.requestId),
                 CarStatsLog
                 .CAR_USER_HAL_MODIFY_USER_REQUEST_REPORTED__REQUEST_TYPE__REMOVE_REQUEST,
                 request.usersInfo.currentUser.userId, request.usersInfo.currentUser.flags,
@@ -432,7 +454,8 @@
 
         EventLog.writeEvent(EventLogTags.CAR_USER_HAL_CREATE_USER_REQ, request.requestId,
                 UserHelper.safeName(request.newUserName), request.newUserInfo.flags, timeoutMs);
-        CarStatsLog.write(CarStatsLog.CAR_USER_HAL_MODIFY_USER_REQUEST_REPORTED, request.requestId,
+        CarStatsLog.write(CarStatsLog.CAR_USER_HAL_MODIFY_USER_REQUEST_REPORTED,
+                getRequestIdForStatsLog(request.requestId),
                 CarStatsLog
                 .CAR_USER_HAL_MODIFY_USER_REQUEST_REPORTED__REQUEST_TYPE__CREATE_REQUEST,
                 request.usersInfo.currentUser.userId, request.usersInfo.currentUser.flags,
@@ -454,7 +477,8 @@
 
         EventLog.writeEvent(EventLogTags.CAR_USER_HAL_POST_SWITCH_USER_REQ, request.requestId,
                 request.targetUser.userId, request.usersInfo.currentUser.userId);
-        CarStatsLog.write(CarStatsLog.CAR_USER_HAL_POST_SWITCH_RESPONSE_REPORTED, request.requestId,
+        CarStatsLog.write(CarStatsLog.CAR_USER_HAL_POST_SWITCH_RESPONSE_REPORTED,
+                getRequestIdForStatsLog(request.requestId),
                 request.targetUser.userId == request.usersInfo.currentUser.userId
                 ? CarStatsLog.CAR_USER_HAL_POST_SWITCH_RESPONSE_REPORTED__SWITCH_STATUS__SUCCESS
                 : CarStatsLog.CAR_USER_HAL_POST_SWITCH_RESPONSE_REPORTED__SWITCH_STATUS__FAILURE);
@@ -485,7 +509,7 @@
                 request.targetUser.userId, request.usersInfo.currentUser.userId);
         //CHECKSTYLE:OFF IndentationCheck
         CarStatsLog.write(CarStatsLog.CAR_USER_HAL_MODIFY_USER_REQUEST_REPORTED,
-                request.requestId, CarStatsLog
+                getRequestIdForStatsLog(request.requestId), CarStatsLog
                 .CAR_USER_HAL_MODIFY_USER_REQUEST_REPORTED__REQUEST_TYPE__SWITCH_REQUEST_LEGACY,
                 request.usersInfo.currentUser.userId, request.usersInfo.currentUser.flags,
                 request.targetUser.userId, request.targetUser.flags, /* timeout_ms= */ -1);
@@ -584,7 +608,7 @@
         }
 
         CarStatsLog.write(CarStatsLog.CAR_USER_HAL_USER_ASSOCIATION_REQUEST_REPORTED,
-                request.requestId,
+                getRequestIdForStatsLog(request.requestId),
                 CarStatsLog.CAR_USER_HAL_USER_ASSOCIATION_REQUEST_REPORTED__REQUEST_TYPE__GET,
                 request.userInfo.userId,
                 request.userInfo.flags,
@@ -637,7 +661,7 @@
             associationValues[i] = association.value;
         }
         CarStatsLog.write(CarStatsLog.CAR_USER_HAL_USER_ASSOCIATION_REQUEST_REPORTED,
-                request.requestId,
+                getRequestIdForStatsLog(request.requestId),
                 CarStatsLog.CAR_USER_HAL_USER_ASSOCIATION_REQUEST_REPORTED__REQUEST_TYPE__SET,
                 request.userInfo.userId, request.userInfo.flags, request.numberAssociations,
                 Arrays.toString(associationTypes), Arrays.toString(associationValues));
@@ -663,7 +687,8 @@
             Log.w(TAG, "error parsing UserIdentificationResponse (" + value + ")", e);
             callback.onResponse(HalCallback.STATUS_WRONG_HAL_RESPONSE, null);
             CarStatsLog.write(CarStatsLog.CAR_USER_HAL_SET_USER_ASSOCIATION_RESPONSE_REPORTED,
-                    getHalCallbackStatusForStatsd(HalCallback.STATUS_WRONG_HAL_RESPONSE), requestId,
+                    getRequestIdForStatsLog(requestId),
+                    getHalCallbackStatusForStatsd(HalCallback.STATUS_WRONG_HAL_RESPONSE),
                     /* number_associations= */ 0, /* user_identification_association_types= */ "",
                     /* user_identification_association_values= */ "");
             return;
@@ -722,9 +747,9 @@
             associationValues[i] = association.value;
         }
         CarStatsLog.write(CarStatsLog.CAR_USER_HAL_SET_USER_ASSOCIATION_RESPONSE_REPORTED,
-                getHalCallbackStatusForStatsd(halCallbackStatus), requestId,
-                response.numberAssociation, Arrays.toString(associationTypes),
-                Arrays.toString(associationValues));
+                getRequestIdForStatsLog(requestId),
+                getHalCallbackStatusForStatsd(halCallbackStatus), response.numberAssociation,
+                Arrays.toString(associationTypes), Arrays.toString(associationValues));
     }
 
     private static void logEventWithErrorMessage(int eventTag, @NonNull VehiclePropValue value) {
@@ -824,10 +849,11 @@
             EventLog.writeEvent(EventLogTags.CAR_USER_HAL_INITIAL_USER_INFO_RESP, requestId,
                     HalCallback.STATUS_INVALID);
             CarStatsLog.write(CarStatsLog.CAR_USER_HAL_INITIAL_USER_INFO_RESPONSE_REPORTED,
-                    requestId, getHalCallbackStatusForStatsd(HalCallback.STATUS_INVALID),
+                    getRequestIdForStatsLog(requestId),
+                    getHalCallbackStatusForStatsd(HalCallback.STATUS_INVALID),
                     getInitialUserInfoResponseActionForStatsd(
-                            InitialUserInfoResponseAction.DEFAULT), /* user id= */ -1,
-                    /* flag= */ -1, /* user locales= */ "");
+                            InitialUserInfoResponseAction.DEFAULT),
+                    /* user id= */ -1, /* flag= */ -1, /* user locales= */ "");
 
             Log.w(TAG, "no callback for requestId " + requestId + ": " + value);
             return;
@@ -842,10 +868,11 @@
             EventLog.writeEvent(EventLogTags.CAR_USER_HAL_INITIAL_USER_INFO_RESP, requestId,
                     HalCallback.STATUS_WRONG_HAL_RESPONSE);
             CarStatsLog.write(CarStatsLog.CAR_USER_HAL_INITIAL_USER_INFO_RESPONSE_REPORTED,
-                    requestId, getHalCallbackStatusForStatsd(HalCallback.STATUS_WRONG_HAL_RESPONSE),
+                    getRequestIdForStatsLog(requestId),
+                    getHalCallbackStatusForStatsd(HalCallback.STATUS_WRONG_HAL_RESPONSE),
                     getInitialUserInfoResponseActionForStatsd(
-                            InitialUserInfoResponseAction.DEFAULT), /* user id= */ -1,
-                    /* flag= */ -1, /* user locales= */ "");
+                            InitialUserInfoResponseAction.DEFAULT),
+                    /* user id= */ -1, /* flag= */ -1, /* user locales= */ "");
 
             callback.onResponse(HalCallback.STATUS_WRONG_HAL_RESPONSE, null);
             return;
@@ -856,7 +883,8 @@
                 response.userToSwitchOrCreate.userId, response.userToSwitchOrCreate.flags,
                 response.userNameToCreate, response.userLocales);
         CarStatsLog.write(CarStatsLog.CAR_USER_HAL_INITIAL_USER_INFO_RESPONSE_REPORTED,
-                requestId, getHalCallbackStatusForStatsd(HalCallback.STATUS_OK),
+                getRequestIdForStatsLog(requestId),
+                getHalCallbackStatusForStatsd(HalCallback.STATUS_OK),
                 getInitialUserInfoResponseActionForStatsd(response.action),
                 response.userToSwitchOrCreate.userId, response.userToSwitchOrCreate.flags,
                 response.userLocales);
@@ -913,7 +941,8 @@
         // Index 1 is message type, which is not required in this call.
         int targetUserId = value.value.int32Values.get(2);
         EventLog.writeEvent(EventLogTags.CAR_USER_HAL_OEM_SWITCH_USER_REQ, requestId, targetUserId);
-        CarStatsLog.write(CarStatsLog.CAR_USER_HAL_MODIFY_USER_REQUEST_REPORTED, requestId,
+        CarStatsLog.write(CarStatsLog.CAR_USER_HAL_MODIFY_USER_REQUEST_REPORTED,
+                getRequestIdForStatsLog(requestId),
                 CarStatsLog
                     .CAR_USER_HAL_MODIFY_USER_REQUEST_REPORTED__REQUEST_TYPE__SWITCH_REQUEST_OEM,
                     /* current user id= */ -1, /* current user flag= */ -1, targetUserId,
@@ -1001,7 +1030,8 @@
 
     private void logHalSwitchUserResponse(int requestId, int halCallbackStatus) {
         //CHECKSTYLE:OFF IndentationCheck
-        CarStatsLog.write(CarStatsLog.CAR_USER_HAL_MODIFY_USER_RESPONSE_REPORTED, requestId,
+        CarStatsLog.write(CarStatsLog.CAR_USER_HAL_MODIFY_USER_RESPONSE_REPORTED,
+                getRequestIdForStatsLog(requestId),
                 getHalCallbackStatusForStatsd(halCallbackStatus),
                CarStatsLog.CAR_USER_HAL_MODIFY_USER_RESPONSE_REPORTED__REQUEST_STATUS__UNSPECIFIED);
         //CHECKSTYLE:ON IndentationCheck
@@ -1012,13 +1042,15 @@
         int userSwitchstatusForStatsd = userSwitchstatus == SwitchUserStatus.SUCCESS
                 ? CarStatsLog.CAR_USER_HAL_MODIFY_USER_RESPONSE_REPORTED__REQUEST_STATUS__SUCCESS
                 : CarStatsLog.CAR_USER_HAL_MODIFY_USER_RESPONSE_REPORTED__REQUEST_STATUS__FAILURE;
-        CarStatsLog.write(CarStatsLog.CAR_USER_HAL_MODIFY_USER_RESPONSE_REPORTED, requestId,
+        CarStatsLog.write(CarStatsLog.CAR_USER_HAL_MODIFY_USER_RESPONSE_REPORTED,
+                getRequestIdForStatsLog(requestId),
                 getHalCallbackStatusForStatsd(halCallbackStatus), userSwitchstatusForStatsd);
     }
 
     private void logHalCreateUserResponse(int requestId, int halCallbackStatus) {
         //CHECKSTYLE:OFF IndentationCheck
-        CarStatsLog.write(CarStatsLog.CAR_USER_HAL_MODIFY_USER_RESPONSE_REPORTED, requestId,
+        CarStatsLog.write(CarStatsLog.CAR_USER_HAL_MODIFY_USER_RESPONSE_REPORTED,
+                getRequestIdForStatsLog(requestId),
                 getHalCallbackStatusForStatsd(halCallbackStatus),
                CarStatsLog.CAR_USER_HAL_MODIFY_USER_RESPONSE_REPORTED__REQUEST_STATUS__UNSPECIFIED);
         //CHECKSTYLE:ON IndentationCheck
@@ -1029,7 +1061,8 @@
         int userCreatestatusForStatsd = userCreatestatus == CreateUserStatus.SUCCESS
                 ? CarStatsLog.CAR_USER_HAL_MODIFY_USER_RESPONSE_REPORTED__REQUEST_STATUS__SUCCESS
                 : CarStatsLog.CAR_USER_HAL_MODIFY_USER_RESPONSE_REPORTED__REQUEST_STATUS__FAILURE;
-        CarStatsLog.write(CarStatsLog.CAR_USER_HAL_MODIFY_USER_RESPONSE_REPORTED, requestId,
+        CarStatsLog.write(CarStatsLog.CAR_USER_HAL_MODIFY_USER_RESPONSE_REPORTED,
+                getRequestIdForStatsLog(requestId),
                 getHalCallbackStatusForStatsd(halCallbackStatus), userCreatestatusForStatsd);
     }
 
@@ -1091,6 +1124,7 @@
             for (int i = 0; i < numberProperties; i++) {
                 writer.printf("%s%s\n", indent, mProperties.valueAt(i));
             }
+            writer.printf("Base request id: %d\n", mBaseRequestId);
             writer.printf("next request id: %d\n", mNextRequestId);
 
             int numberPendingCallbacks = mPendingRequests.size();
diff --git a/service/src/com/android/car/pm/CarPackageManagerService.java b/service/src/com/android/car/pm/CarPackageManagerService.java
index 9f66e49..8701968 100644
--- a/service/src/com/android/car/pm/CarPackageManagerService.java
+++ b/service/src/com/android/car/pm/CarPackageManagerService.java
@@ -18,6 +18,7 @@
 
 import android.annotation.NonNull;
 import android.annotation.Nullable;
+import android.annotation.UserIdInt;
 import android.app.ActivityManager;
 import android.app.ActivityManager.StackInfo;
 import android.app.PendingIntent;
@@ -29,8 +30,6 @@
 import android.car.content.pm.ICarPackageManager;
 import android.car.drivingstate.CarUxRestrictions;
 import android.car.drivingstate.ICarUxRestrictionsChangeListener;
-import android.car.user.CarUserManager;
-import android.car.user.CarUserManager.UserLifecycleListener;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
@@ -68,7 +67,6 @@
 import com.android.car.R;
 import com.android.car.SystemActivityMonitoringService;
 import com.android.car.SystemActivityMonitoringService.TopTaskInfoContainer;
-import com.android.car.user.CarUserService;
 import com.android.internal.annotations.GuardedBy;
 import com.android.internal.annotations.VisibleForTesting;
 
@@ -79,6 +77,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -86,6 +85,7 @@
 import java.util.Set;
 
 public class CarPackageManagerService extends ICarPackageManager.Stub implements CarServiceBase {
+    private static final boolean DBG = false;
     private static final boolean DBG_POLICY_SET = false;
     private static final boolean DBG_POLICY_CHECK = false;
     private static final boolean DBG_POLICY_ENFORCEMENT = false;
@@ -95,7 +95,6 @@
     private static final int LOG_SIZE = 20;
 
     private final Context mContext;
-    private final CarUserService mUserService;
     private final SystemActivityMonitoringService mSystemActivityMonitoringService;
     private final PackageManager mPackageManager;
     private final ActivityManager mActivityManager;
@@ -109,10 +108,15 @@
     // For dumpsys logging.
     private final LinkedList<String> mBlockedActivityLogs = new LinkedList<>();
 
-    // Store the white list and black list strings from the resource file.
-    private String mConfiguredWhitelist;
-    private String mConfiguredSystemWhitelist;
-    private String mConfiguredBlacklist;
+    // Store the allowlist and blocklist strings from the resource file.
+    private String mConfiguredAllowlist;
+    private String mConfiguredSystemAllowlist;
+    private String mConfiguredBlocklist;
+    @GuardedBy("mLock")
+    private Map<String, Set<String>> mConfiguredAllowlistMap;
+    @GuardedBy("mLock")
+    private Map<String, Set<String>> mConfiguredBlocklistMap;
+
     private final List<String> mAllowedAppInstallSources;
 
     /**
@@ -122,7 +126,10 @@
     @GuardedBy("mLock")
     private final HashMap<String, ClientPolicy> mClientPolicies = new HashMap<>();
     @GuardedBy("mLock")
-    private HashMap<String, AppBlockingPackageInfoWrapper> mActivityWhitelistMap = new HashMap<>();
+    private HashMap<String, AppBlockingPackageInfoWrapper> mActivityAllowlistMap = new HashMap<>();
+    @GuardedBy("mLock")
+    private  HashSet<String> mActivityDenylistPackages = new HashSet<String>();
+
     @GuardedBy("mLock")
     private LinkedList<AppBlockingPolicyProxy> mProxies;
 
@@ -134,14 +141,15 @@
     private final ComponentName mActivityBlockingActivity;
 
     private final ActivityLaunchListener mActivityLaunchListener = new ActivityLaunchListener();
+
     // K: (logical) display id of a physical display, V: UXR change listener of this display.
     // For multi-display, monitor UXR change on each display.
     private final SparseArray<UxRestrictionsListener> mUxRestrictionsListeners =
             new SparseArray<>();
     private final VendorServiceController mVendorServiceController;
 
-    // Information related to when the installed packages should be parsed for building a white and
-    // black list
+    // Information related to when the installed packages should be parsed for building a allow and
+    // block list
     private final Set<String> mPackageManagerActions = Sets.newArraySet(
             Intent.ACTION_PACKAGE_ADDED,
             Intent.ACTION_PACKAGE_CHANGED,
@@ -151,11 +159,6 @@
     private final PackageParsingEventReceiver mPackageParsingEventReceiver =
             new PackageParsingEventReceiver();
 
-    // To track if the packages have been parsed for building white/black lists. If we haven't had
-    // received any intents (boot complete or package changed), then the white list is null leading
-    // to blocking everything.  So, no blocking until we have had a chance to parse the packages.
-    private boolean mHasParsedPackages;
-
     /**
      * Name of blocked activity.
      *
@@ -191,10 +194,8 @@
 
     public CarPackageManagerService(Context context,
             CarUxRestrictionsManagerService uxRestrictionsService,
-            SystemActivityMonitoringService systemActivityMonitoringService,
-            CarUserService userService) {
+            SystemActivityMonitoringService systemActivityMonitoringService) {
         mContext = context;
-        mUserService = userService;
         mCarUxRestrictionsService = uxRestrictionsService;
         mSystemActivityMonitoringService = systemActivityMonitoringService;
         mPackageManager = mContext.getPackageManager();
@@ -277,11 +278,31 @@
                 Log.i(CarLog.TAG_PACKAGE, "isActivityDistractionOptimized"
                         + dumpPoliciesLocked(false));
             }
-            AppBlockingPackageInfo info = searchFromBlacklistsLocked(packageName);
-            if (info != null) {
+
+            if (searchFromClientPolicyBlocklistsLocked(packageName)) {
                 return false;
             }
-            return isActivityInWhitelistsLocked(packageName, className);
+
+            if (isActivityInClientPolicyAllowlistsLocked(packageName, className)) {
+                return true;
+            }
+
+            // Check deny and allow list
+            boolean packageBlocked = mActivityDenylistPackages.contains(packageName);
+            AppBlockingPackageInfoWrapper infoWrapper = mActivityAllowlistMap.get(packageName);
+            if (!packageBlocked && infoWrapper == null) {
+                // Update cache
+                updateActivityAllowlistAndDenylistMap(packageName);
+                packageBlocked = mActivityDenylistPackages.contains(packageName);
+                infoWrapper = mActivityAllowlistMap.get(packageName);
+            }
+
+            if (packageBlocked
+                    || !isActivityInMapAndMatching(infoWrapper, packageName, className)) {
+                return false;
+            }
+
+            return true;
         }
     }
 
@@ -301,19 +322,34 @@
         }
         synchronized (mLock) {
             if (DBG_POLICY_CHECK) {
-                Log.i(CarLog.TAG_PACKAGE, "isServiceDistractionOptimized"
-                        + dumpPoliciesLocked(false));
+                Log.i(CarLog.TAG_PACKAGE,
+                        "isServiceDistractionOptimized" + dumpPoliciesLocked(false));
             }
-            AppBlockingPackageInfo info = searchFromBlacklistsLocked(packageName);
-            if (info != null) {
+
+            if (searchFromClientPolicyBlocklistsLocked(packageName)) {
                 return false;
             }
-            info = searchFromWhitelistsLocked(packageName);
-            if (info != null) {
+
+            if (searchFromClientPolicyAllowlistsLocked(packageName)) {
                 return true;
             }
+
+            // Check deny and allow list
+            boolean packageBlocked = mActivityDenylistPackages.contains(packageName);
+            AppBlockingPackageInfoWrapper infoWrapper = mActivityAllowlistMap.get(packageName);
+            if (!packageBlocked && infoWrapper == null) {
+                // Update cache
+                updateActivityAllowlistAndDenylistMap(packageName);
+                packageBlocked = mActivityDenylistPackages.contains(packageName);
+                infoWrapper = mActivityAllowlistMap.get(packageName);
+            }
+
+            if (packageBlocked || infoWrapper == null || infoWrapper.info == null) {
+                return false;
+            }
+
+            return true;
         }
-        return false;
     }
 
     @Override
@@ -349,44 +385,44 @@
     }
 
     @GuardedBy("mLock")
-    private AppBlockingPackageInfo searchFromBlacklistsLocked(String packageName) {
+    private boolean searchFromClientPolicyBlocklistsLocked(String packageName) {
         for (ClientPolicy policy : mClientPolicies.values()) {
-            AppBlockingPackageInfoWrapper wrapper = policy.blacklistsMap.get(packageName);
-            if (wrapper != null && wrapper.isMatching) {
-                return wrapper.info;
-            }
-        }
-        return null;
-    }
-
-    @GuardedBy("mLock")
-    private AppBlockingPackageInfo searchFromWhitelistsLocked(String packageName) {
-        for (ClientPolicy policy : mClientPolicies.values()) {
-            AppBlockingPackageInfoWrapper wrapper = policy.whitelistsMap.get(packageName);
-            if (wrapper != null && wrapper.isMatching) {
-                return wrapper.info;
-            }
-        }
-        AppBlockingPackageInfoWrapper wrapper = mActivityWhitelistMap.get(packageName);
-        return (wrapper != null) ? wrapper.info : null;
-    }
-
-    @GuardedBy("mLock")
-    private boolean isActivityInWhitelistsLocked(String packageName, String className) {
-        for (ClientPolicy policy : mClientPolicies.values()) {
-            if (isActivityInMapAndMatching(policy.whitelistsMap, packageName, className)) {
+            AppBlockingPackageInfoWrapper wrapper = policy.mBlocklistsMap.get(packageName);
+            if (wrapper != null && wrapper.isMatching && wrapper.info != null) {
                 return true;
             }
         }
-        return isActivityInMapAndMatching(mActivityWhitelistMap, packageName, className);
+
+        return false;
     }
 
-    private boolean isActivityInMapAndMatching(HashMap<String, AppBlockingPackageInfoWrapper> map,
+    @GuardedBy("mLock")
+    private boolean searchFromClientPolicyAllowlistsLocked(String packageName) {
+        for (ClientPolicy policy : mClientPolicies.values()) {
+            AppBlockingPackageInfoWrapper wrapper = policy.mAllowlistsMap.get(packageName);
+            if (wrapper != null && wrapper.isMatching && wrapper.info != null) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @GuardedBy("mLock")
+    private boolean isActivityInClientPolicyAllowlistsLocked(String packageName, String className) {
+        for (ClientPolicy policy : mClientPolicies.values()) {
+            if (isActivityInMapAndMatching(policy.mAllowlistsMap.get(packageName), packageName,
+                    className)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean isActivityInMapAndMatching(AppBlockingPackageInfoWrapper wrapper,
             String packageName, String className) {
-        AppBlockingPackageInfoWrapper wrapper = map.get(packageName);
         if (wrapper == null || !wrapper.isMatching) {
             if (DBG_POLICY_CHECK) {
-                Log.d(CarLog.TAG_PACKAGE, "Pkg not in whitelist:" + packageName);
+                Log.d(CarLog.TAG_PACKAGE, "Pkg not in allowlist:" + packageName);
             }
             return false;
         }
@@ -412,8 +448,8 @@
                         "Interrupted wait during release");
                 Thread.currentThread().interrupt();
             }
-            mHasParsedPackages = false;
-            mActivityWhitelistMap.clear();
+            mActivityAllowlistMap.clear();
+            mActivityDenylistPackages.clear();
             mClientPolicies.clear();
             if (mProxies != null) {
                 for (AppBlockingPolicyProxy proxy : mProxies) {
@@ -425,7 +461,6 @@
             mLock.notifyAll();
         }
         mContext.unregisterReceiver(mPackageParsingEventReceiver);
-        mUserService.removeUserLifecycleListener(mUserLifecycleListener);
         mSystemActivityMonitoringService.registerActivityLaunchListener(null);
         for (int i = 0; i < mUxRestrictionsListeners.size(); i++) {
             UxRestrictionsListener listener = mUxRestrictionsListeners.valueAt(i);
@@ -433,19 +468,9 @@
         }
     }
 
-    private final UserLifecycleListener mUserLifecycleListener = event -> {
-        if (Log.isLoggable(CarLog.TAG_PACKAGE, Log.DEBUG)) {
-            Log.d(CarLog.TAG_PACKAGE, "CarPackageManagerService.onEvent(" + event + ")");
-        }
-        if (CarUserManager.USER_LIFECYCLE_EVENT_TYPE_SWITCHING == event.getEventType()) {
-            CarPackageManagerService.this.mHandler.requestParsingInstalledPkgs(0);
-        }
-    };
-
     // run from HandlerThread
     private void doHandleInit() {
         startAppBlockingPolicies();
-        mUserService.addUserLifecycleListener(mUserLifecycleListener);
         IntentFilter pkgParseIntent = new IntentFilter();
         for (String action : mPackageManagerActions) {
             pkgParseIntent.addAction(action);
@@ -471,18 +496,18 @@
             mCarUxRestrictionsService.registerUxRestrictionsChangeListener(listener, displayId);
         }
         mVendorServiceController.init();
+        mSystemActivityMonitoringService.registerActivityLaunchListener(mActivityLaunchListener);
     }
 
-    private void doParseInstalledPackages() {
-        int userId = mActivityManager.getCurrentUser();
-        generateActivityWhitelistMap(userId);
+    private void doParseInstalledPackage(String packageName) {
+        // Delete the package from allowlist and denylist mapping
         synchronized (mLock) {
-            mHasParsedPackages = true;
+            mActivityDenylistPackages.remove(packageName);
+            mActivityAllowlistMap.remove(packageName);
         }
-        // Once the activity launch listener is registered we attempt to block any non-whitelisted
-        // activities that are launched. For this reason, we need to wait until after the whitelist
-        // has been created.
-        mSystemActivityMonitoringService.registerActivityLaunchListener(mActivityLaunchListener);
+
+        // Generate allowlist and denylist mapping for the package
+        updateActivityAllowlistAndDenylistMap(packageName);
         blockTopActivitiesIfNecessary();
     }
 
@@ -495,11 +520,11 @@
 
     private void doUpdatePolicy(String packageName, CarAppBlockingPolicy policy, int flags) {
         if (DBG_POLICY_SET) {
-            Log.i(CarLog.TAG_PACKAGE, "setting policy from:" + packageName + ",policy:" + policy +
-                    ",flags:0x" + Integer.toHexString(flags));
+            Log.i(CarLog.TAG_PACKAGE, "setting policy from:" + packageName + ",policy:" + policy
+                    + ",flags:0x" + Integer.toHexString(flags));
         }
-        AppBlockingPackageInfoWrapper[] blacklistWrapper = verifyList(policy.blacklists);
-        AppBlockingPackageInfoWrapper[] whitelistWrapper = verifyList(policy.whitelists);
+        AppBlockingPackageInfoWrapper[] blocklistWrapper = verifyList(policy.blacklists);
+        AppBlockingPackageInfoWrapper[] allowlistWrapper = verifyList(policy.whitelists);
         synchronized (mLock) {
             ClientPolicy clientPolicy = mClientPolicies.get(packageName);
             if (clientPolicy == null) {
@@ -507,14 +532,14 @@
                 mClientPolicies.put(packageName, clientPolicy);
             }
             if ((flags & CarPackageManager.FLAG_SET_POLICY_ADD) != 0) {
-                clientPolicy.addToBlacklists(blacklistWrapper);
-                clientPolicy.addToWhitelists(whitelistWrapper);
+                clientPolicy.addToBlocklists(blocklistWrapper);
+                clientPolicy.addToAllowlists(allowlistWrapper);
             } else if ((flags & CarPackageManager.FLAG_SET_POLICY_REMOVE) != 0) {
-                clientPolicy.removeBlacklists(blacklistWrapper);
-                clientPolicy.removeWhitelists(whitelistWrapper);
+                clientPolicy.removeBlocklists(blocklistWrapper);
+                clientPolicy.removeAllowlists(allowlistWrapper);
             } else { //replace.
-                clientPolicy.replaceBlacklists(blacklistWrapper);
-                clientPolicy.replaceWhitelists(whitelistWrapper);
+                clientPolicy.replaceBlocklists(blocklistWrapper);
+                clientPolicy.replaceAllowlists(allowlistWrapper);
             }
             if ((flags & CarPackageManager.FLAG_SET_POLICY_WAIT_FOR_CHANGE) != 0) {
                 mWaitingPolicies.remove(policy);
@@ -601,213 +626,218 @@
         return false;
     }
 
-    /**
-     * Generate a map of whitelisted packages and activities of the form {pkgName, Whitelisted
-     * activities}.  The whitelist information can come from a configuration XML resource or from
-     * the apps marking their activities as distraction optimized.
-     *
-     * @param userId Generate whitelist based on packages installed for this user.
-     */
-    private void generateActivityWhitelistMap(int userId) {
-        // Get the apps/activities that are whitelisted in the configuration XML resources.
-        Map<String, Set<String>> configWhitelist = generateConfigWhitelist();
-        Map<String, Set<String>> configBlacklist = generateConfigBlacklist();
-
-        Map<String, AppBlockingPackageInfoWrapper> activityWhitelist =
-                generateActivityWhitelistAsUser(UserHandle.USER_SYSTEM,
-                        configWhitelist, configBlacklist);
-        // Also parse packages for current user.
-        if (userId != UserHandle.USER_SYSTEM) {
-            Map<String, AppBlockingPackageInfoWrapper> userWhitelistedPackages =
-                    generateActivityWhitelistAsUser(userId, configWhitelist, configBlacklist);
-            for (String packageName : userWhitelistedPackages.keySet()) {
-                if (activityWhitelist.containsKey(packageName)) {
-                    continue;
-                }
-                activityWhitelist.put(packageName, userWhitelistedPackages.get(packageName));
-            }
+    private AppBlockingPackageInfoWrapper getPackageInfoWrapperForUser(String packageName,
+            @UserIdInt int userId, Map<String, Set<String>> configAllowlist,
+            Map<String, Set<String>> configBlocklist) {
+        PackageInfo info;
+        try {
+            info = mPackageManager.getPackageInfoAsUser(packageName,
+                    PackageManager.GET_SIGNATURES | PackageManager.GET_ACTIVITIES
+                            | PackageManager.MATCH_DIRECT_BOOT_AWARE
+                            | PackageManager.MATCH_DIRECT_BOOT_UNAWARE
+                            | PackageManager.MATCH_DISABLED_COMPONENTS,
+                    userId);
+        } catch (NameNotFoundException e) {
+            Log.w(CarLog.TAG_PACKAGE, packageName + " not installed! User Id: " + userId);
+            return null;
         }
-        synchronized (mLock) {
-            mActivityWhitelistMap.clear();
-            mActivityWhitelistMap.putAll(activityWhitelist);
-        }
-    }
 
-    private Map<String, Set<String>> generateConfigWhitelist() {
-        Map<String, Set<String>> configWhitelist = new HashMap<>();
-        mConfiguredWhitelist = mContext.getString(R.string.activityWhitelist);
-        if (mConfiguredWhitelist == null) {
+
+        if (info == null || info.applicationInfo == null) {
+            return null;
+        }
+
+        int flags = 0;
+        Set<String> activities = new ArraySet<>();
+
+        if (info.applicationInfo.isSystemApp()
+                || info.applicationInfo.isUpdatedSystemApp()) {
+            flags = AppBlockingPackageInfo.FLAG_SYSTEM_APP;
+        }
+
+        /* 1. Check if all or some of this app is in the <activityAllowlist> or
+              <systemActivityAllowlist> in config.xml */
+        Set<String> configActivitiesForPackage = configAllowlist.get(info.packageName);
+        if (configActivitiesForPackage != null) {
             if (DBG_POLICY_CHECK) {
-                Log.w(CarLog.TAG_PACKAGE, "White list is null.");
+                Log.d(CarLog.TAG_PACKAGE, info.packageName + " allowlisted");
             }
-        }
-        parseConfigList(mConfiguredWhitelist, configWhitelist);
-
-        mConfiguredSystemWhitelist = mContext.getString(R.string.systemActivityWhitelist);
-        if (mConfiguredSystemWhitelist == null) {
-            if (DBG_POLICY_CHECK) {
-                Log.w(CarLog.TAG_PACKAGE, "System white list is null.");
-            }
-        }
-        parseConfigList(mConfiguredSystemWhitelist, configWhitelist);
-
-        // Add the blocking overlay activity to the whitelist, since that needs to run in a
-        // restricted state to communicate the reason an app was blocked.
-        Set<String> defaultActivity = new ArraySet<>();
-        if (mActivityBlockingActivity != null) {
-            defaultActivity.add(mActivityBlockingActivity.getClassName());
-            configWhitelist.put(mActivityBlockingActivity.getPackageName(), defaultActivity);
-        }
-
-        return configWhitelist;
-    }
-
-    private Map<String, Set<String>> generateConfigBlacklist() {
-        Map<String, Set<String>> configBlacklist = new HashMap<>();
-        mConfiguredBlacklist = mContext.getString(R.string.activityBlacklist);
-        if (mConfiguredBlacklist == null) {
-            if (DBG_POLICY_CHECK) {
-                Log.d(CarLog.TAG_PACKAGE, "Null blacklist in config");
-            }
-        }
-        parseConfigList(mConfiguredBlacklist, configBlacklist);
-
-        return configBlacklist;
-    }
-
-    /**
-     * Generates whitelisted activities based on packages installed for system user and current
-     * user (if different). Factors affecting whitelist:
-     * - whitelist from resource config;
-     * - activity declared as Distraction Optimized (D.O.) in manifest;
-     * - blacklist from resource config - package/activity blacklisted will not exist
-     * in returned whitelist.
-     *
-     * @param userId          Parse packages installed for user.
-     * @param configWhitelist Whitelist from config.
-     * @param configBlacklist Blacklist from config.
-     */
-    private Map<String, AppBlockingPackageInfoWrapper> generateActivityWhitelistAsUser(int userId,
-            Map<String, Set<String>> configWhitelist, Map<String, Set<String>> configBlacklist) {
-        HashMap<String, AppBlockingPackageInfoWrapper> activityWhitelist = new HashMap<>();
-
-        List<PackageInfo> packages = mPackageManager
-                .getInstalledPackagesAsUser(PackageManager.GET_SIGNATURES
-                        | PackageManager.GET_ACTIVITIES | PackageManager.MATCH_DIRECT_BOOT_AWARE
-                        | PackageManager.MATCH_DIRECT_BOOT_UNAWARE, userId);
-        for (PackageInfo info : packages) {
-            if (info.applicationInfo == null) {
-                continue;
-            }
-
-            int flags = 0;
-            Set<String> activities = new ArraySet<>();
-
-            if (info.applicationInfo.isSystemApp()
-                    || info.applicationInfo.isUpdatedSystemApp()) {
-                flags = AppBlockingPackageInfo.FLAG_SYSTEM_APP;
-            }
-
-            /* 1. Check if all or some of this app is in the <activityWhitelist> or
-                  <systemActivityWhitelist> in config.xml */
-            Set<String> configActivitiesForPackage = configWhitelist.get(info.packageName);
-            if (configActivitiesForPackage != null) {
-                if (DBG_POLICY_CHECK) {
-                    Log.d(CarLog.TAG_PACKAGE, info.packageName + " whitelisted");
-                }
-                if (configActivitiesForPackage.size() == 0) {
-                    // Whole Pkg has been whitelisted
-                    flags |= AppBlockingPackageInfo.FLAG_WHOLE_ACTIVITY;
-                    // Add all activities to the whitelist
-                    List<String> activitiesForPackage = getActivitiesInPackage(info);
-                    if (activitiesForPackage != null) {
-                        activities.addAll(activitiesForPackage);
-                    } else {
-                        if (DBG_POLICY_CHECK) {
-                            Log.d(CarLog.TAG_PACKAGE, info.packageName + ": Activities null");
-                        }
-                    }
+            if (configActivitiesForPackage.isEmpty()) {
+                // Whole Pkg has been allowlisted
+                flags |= AppBlockingPackageInfo.FLAG_WHOLE_ACTIVITY;
+                // Add all activities to the allowlist
+                List<String> activitiesForPackage = getActivitiesInPackage(info);
+                if (activitiesForPackage != null) {
+                    activities.addAll(activitiesForPackage);
                 } else {
                     if (DBG_POLICY_CHECK) {
-                        Log.d(CarLog.TAG_PACKAGE, "Partially Whitelisted. WL Activities:");
-                        for (String a : configActivitiesForPackage) {
-                            Log.d(CarLog.TAG_PACKAGE, a);
-                        }
+                        Log.d(CarLog.TAG_PACKAGE, info.packageName + ": Activities null");
                     }
-                    activities.addAll(configActivitiesForPackage);
                 }
-            }
-            /* 2. If app is not listed in the config.xml check their Manifest meta-data to
-              see if they have any Distraction Optimized(DO) activities.
-              For non system apps, we check if the app install source was a permittable
-              source. This prevents side-loaded apps to fake DO.  Bypass the check
-              for debug builds for development convenience. */
-            if (!isDebugBuild()
-                    && !info.applicationInfo.isSystemApp()
-                    && !info.applicationInfo.isUpdatedSystemApp()) {
-                try {
-                    if (mAllowedAppInstallSources != null) {
-                        String installerName = mPackageManager.getInstallerPackageName(
-                                info.packageName);
-                        if (installerName == null || (installerName != null
-                                && !mAllowedAppInstallSources.contains(installerName))) {
-                            Log.w(CarLog.TAG_PACKAGE,
-                                    info.packageName + " not installed from permitted sources "
-                                            + (installerName == null ? "NULL" : installerName));
-                            continue;
-                        }
-                    }
-                } catch (IllegalArgumentException e) {
-                    Log.w(CarLog.TAG_PACKAGE, info.packageName + " not installed!");
-                    continue;
+            } else {
+                if (DBG_POLICY_CHECK) {
+                    Log.d(CarLog.TAG_PACKAGE,
+                            "Partially Allowlisted. WL Activities: " + configActivitiesForPackage);
                 }
+                activities.addAll(configActivitiesForPackage);
             }
-
-            try {
-                String[] doActivities =
-                        CarAppMetadataReader.findDistractionOptimizedActivitiesAsUser(
-                                mContext, info.packageName, userId);
-                if (doActivities != null) {
-                    // Some of the activities in this app are Distraction Optimized.
-                    if (DBG_POLICY_CHECK) {
-                        for (String activity : doActivities) {
-                            Log.d(CarLog.TAG_PACKAGE, "adding " + activity + " from "
-                                    + info.packageName + " to whitelist");
-                        }
-                    }
-                    activities.addAll(Arrays.asList(doActivities));
-                }
-            } catch (NameNotFoundException e) {
-                Log.w(CarLog.TAG_PACKAGE, "Error reading metadata: " + info.packageName);
-                continue;
-            }
-
-            // Nothing to add to whitelist
-            if (activities.isEmpty()) {
-                continue;
-            }
-
-            /* 3. Check if parsed activity is in <activityBlacklist> in config.xml. Anything
-                  in blacklist should not be whitelisted, either as D.O. or by config. */
-            if (configBlacklist.containsKey(info.packageName)) {
-                Set<String> configBlacklistActivities = configBlacklist.get(info.packageName);
-                if (configBlacklistActivities.isEmpty()) {
-                    // Whole package should be blacklisted.
-                    continue;
-                }
-                activities.removeAll(configBlacklistActivities);
-            }
-
-            Signature[] signatures;
-            signatures = info.signatures;
-            AppBlockingPackageInfo appBlockingInfo = new AppBlockingPackageInfo(
-                    info.packageName, 0, 0, flags, signatures,
-                    activities.toArray(new String[activities.size()]));
-            AppBlockingPackageInfoWrapper wrapper = new AppBlockingPackageInfoWrapper(
-                    appBlockingInfo, true);
-            activityWhitelist.put(info.packageName, wrapper);
         }
-        return activityWhitelist;
+        /* 2. If app is not listed in the config.xml check their Manifest meta-data to
+          see if they have any Distraction Optimized(DO) activities.
+          For non system apps, we check if the app install source was a permittable
+          source. This prevents side-loaded apps to fake DO.  Bypass the check
+          for debug builds for development convenience. */
+        if (!isDebugBuild()
+                && !info.applicationInfo.isSystemApp()
+                && !info.applicationInfo.isUpdatedSystemApp()) {
+            try {
+                if (mAllowedAppInstallSources != null) {
+                    String installerName = mPackageManager.getInstallerPackageName(
+                            info.packageName);
+                    if (installerName == null || (installerName != null
+                            && !mAllowedAppInstallSources.contains(installerName))) {
+                        Log.w(CarLog.TAG_PACKAGE,
+                                info.packageName + " not installed from permitted sources "
+                                        + (installerName == null ? "NULL" : installerName));
+                        return null;
+                    }
+                }
+            } catch (IllegalArgumentException e) {
+                Log.w(CarLog.TAG_PACKAGE, info.packageName + " not installed!");
+                return null;
+            }
+        }
+
+        try {
+            String[] doActivities =
+                    CarAppMetadataReader.findDistractionOptimizedActivitiesAsUser(
+                            mContext, info.packageName, userId);
+            if (doActivities != null) {
+                // Some of the activities in this app are Distraction Optimized.
+                if (DBG_POLICY_CHECK) {
+                    for (String activity : doActivities) {
+                        Log.d(CarLog.TAG_PACKAGE, "adding " + activity + " from "
+                                + info.packageName + " to allowlist");
+                    }
+                }
+                activities.addAll(Arrays.asList(doActivities));
+            }
+        } catch (NameNotFoundException e) {
+            Log.w(CarLog.TAG_PACKAGE, "Error reading metadata: " + info.packageName);
+            return null;
+        }
+
+        // Nothing to add to allowlist
+        if (activities.isEmpty()) {
+            return null;
+        }
+
+        /* 3. Check if parsed activity is in <activityBlocklist> in config.xml. Anything
+              in blocklist should not be allowlisted, either as D.O. or by config. */
+        if (configBlocklist.containsKey(info.packageName)) {
+            Set<String> configBlocklistActivities = configBlocklist.get(info.packageName);
+            if (configBlocklistActivities.isEmpty()) {
+                // Whole package should be blocklisted.
+                return null;
+            }
+            activities.removeAll(configBlocklistActivities);
+        }
+
+        Signature[] signatures;
+        signatures = info.signatures;
+        AppBlockingPackageInfo appBlockingInfo = new AppBlockingPackageInfo(info.packageName,
+                /* minRevisionCode = */ 0, /* maxRevisionCode = */ 0, flags, signatures,
+                activities.toArray(new String[activities.size()]));
+        AppBlockingPackageInfoWrapper wrapper = new AppBlockingPackageInfoWrapper(
+                appBlockingInfo, true);
+        return wrapper;
+    }
+
+    /**
+     * Update map of allowlisted packages and activities of the form {pkgName, Allowlisted
+     * activities} and set of denylisted packages. The information can come from a configuration XML
+     * resource or from the apps marking their activities as distraction optimized.
+     */
+    private void updateActivityAllowlistAndDenylistMap(String packageName) {
+        int userId = mActivityManager.getCurrentUser();
+        Log.i(CarLog.TAG_PACKAGE, "Updating allowlist and denylist mapping for package: "
+                + packageName + " for UserId: " + userId);
+        // Get the apps/activities that are allowlisted in the configuration XML resources.
+        Map<String, Set<String>> configAllowlist = generateConfigAllowlist();
+        Map<String, Set<String>> configBlocklist = generateConfigBlocklist();
+
+        AppBlockingPackageInfoWrapper wrapper =
+                getPackageInfoWrapperForUser(packageName, userId, configAllowlist, configBlocklist);
+
+        if (wrapper == null && userId != UserHandle.USER_SYSTEM) {
+            Log.i(CarLog.TAG_PACKAGE, "Updating allowlist and denylist mapping for package: "
+                    + packageName + " for UserId: " + UserHandle.USER_SYSTEM);
+            // check package for system user, in case package is disabled for current user
+            wrapper = getPackageInfoWrapperForUser(packageName, UserHandle.USER_SYSTEM,
+                    configAllowlist, configBlocklist);
+        }
+
+        synchronized (mLock) {
+            if (wrapper != null) {
+                Log.i(CarLog.TAG_PACKAGE, "Package: " + packageName + " added in allowlist.");
+                mActivityAllowlistMap.put(packageName, wrapper);
+            } else {
+                Log.i(CarLog.TAG_PACKAGE, "Package: " + packageName + " added in denylist.");
+                mActivityDenylistPackages.add(packageName);
+            }
+        }
+    }
+
+    private Map<String, Set<String>> generateConfigAllowlist() {
+        synchronized (mLock) {
+            if (mConfiguredAllowlistMap != null) return mConfiguredAllowlistMap;
+
+            Map<String, Set<String>> configAllowlist = new HashMap<>();
+            mConfiguredAllowlist = mContext.getString(R.string.activityWhitelist);
+            if (mConfiguredAllowlist == null) {
+                if (DBG_POLICY_CHECK) {
+                    Log.w(CarLog.TAG_PACKAGE, "Allowlist is null.");
+                }
+            }
+            parseConfigList(mConfiguredAllowlist, configAllowlist);
+
+            mConfiguredSystemAllowlist = mContext.getString(R.string.systemActivityWhitelist);
+            if (mConfiguredSystemAllowlist == null) {
+                if (DBG_POLICY_CHECK) {
+                    Log.w(CarLog.TAG_PACKAGE, "System allowlist is null.");
+                }
+            }
+            parseConfigList(mConfiguredSystemAllowlist, configAllowlist);
+
+            // Add the blocking overlay activity to the allowlist, since that needs to run in a
+            // restricted state to communicate the reason an app was blocked.
+            Set<String> defaultActivity = new ArraySet<>();
+            if (mActivityBlockingActivity != null) {
+                defaultActivity.add(mActivityBlockingActivity.getClassName());
+                configAllowlist.put(mActivityBlockingActivity.getPackageName(), defaultActivity);
+            }
+
+            mConfiguredAllowlistMap = configAllowlist;
+            return configAllowlist;
+        }
+    }
+
+    private Map<String, Set<String>> generateConfigBlocklist() {
+        synchronized (mLock) {
+            if (mConfiguredBlocklistMap != null) return mConfiguredBlocklistMap;
+
+            Map<String, Set<String>> configBlocklist = new HashMap<>();
+            mConfiguredBlocklist = mContext.getString(R.string.activityBlacklist);
+            if (mConfiguredBlocklist == null) {
+                if (DBG_POLICY_CHECK) {
+                    Log.d(CarLog.TAG_PACKAGE, "Null blocklist in config");
+                }
+            }
+            parseConfigList(mConfiguredBlocklist, configBlocklist);
+
+            mConfiguredBlocklistMap = configBlocklist;
+            return configBlocklist;
+        }
     }
 
     private boolean isDebugBuild() {
@@ -821,9 +851,9 @@
      * included.
      *
      * When there are multiple entries regarding one package, the entry with
-     * greater scope wins. Namely if there were 2 entires such that one whitelists
-     * an activity, and the other whitelists the entire package of the activity,
-     * the package is whitelisted, regardless of input order.
+     * greater scope wins. Namely if there were 2 entries such that one allowlists
+     * an activity, and the other allowlists the entire package of the activity,
+     * the package is allowlisted, regardless of input order.
      */
     @VisibleForTesting
     /* package */ void parseConfigList(String configList,
@@ -844,7 +874,7 @@
             if (packageActivityPair.length == 1) { // whole package
                 activities.clear();
             } else if (packageActivityPair.length == 2) {
-                // add class name only when the whole package is not whitelisted.
+                // add class name only when the whole package is not allowlisted.
                 if (newPackage || (activities.size() > 0)) {
                     activities.add(packageActivityPair[1]);
                 }
@@ -923,8 +953,8 @@
         try {
             if (policy != null) {
                 if (DBG_POLICY_SET) {
-                    Log.i(CarLog.TAG_PACKAGE, "policy setting from policy service:" +
-                            proxy.getPackageName());
+                    Log.i(CarLog.TAG_PACKAGE, "policy setting from policy service:"
+                            + proxy.getPackageName());
                 }
                 doSetAppBlockingPolicy(proxy.getPackageName(), policy, 0);
             }
@@ -938,7 +968,6 @@
         synchronized (mLock) {
             writer.println("*CarPackageManagerService*");
             writer.println("mEnableActivityBlocking:" + mEnableActivityBlocking);
-            writer.println("mHasParsedPackages:" + mHasParsedPackages);
             List<String> restrictions = new ArrayList<>(mUxRestrictionsListeners.size());
             for (int i = 0; i < mUxRestrictionsListeners.size(); i++) {
                 int displayId = mUxRestrictionsListeners.keyAt(i);
@@ -957,20 +986,20 @@
     private String dumpPoliciesLocked(boolean dumpAll) {
         StringBuilder sb = new StringBuilder();
         if (dumpAll) {
-            sb.append("**System whitelist**\n");
-            for (AppBlockingPackageInfoWrapper wrapper : mActivityWhitelistMap.values()) {
+            sb.append("**System allowlist**\n");
+            for (AppBlockingPackageInfoWrapper wrapper : mActivityAllowlistMap.values()) {
                 sb.append(wrapper.toString() + "\n");
             }
         }
         sb.append("**Client Policies**\n");
         for (Entry<String, ClientPolicy> entry : mClientPolicies.entrySet()) {
             sb.append("Client:" + entry.getKey() + "\n");
-            sb.append("  whitelists:\n");
-            for (AppBlockingPackageInfoWrapper wrapper : entry.getValue().whitelistsMap.values()) {
+            sb.append("  allowlists:\n");
+            for (AppBlockingPackageInfoWrapper wrapper : entry.getValue().mAllowlistsMap.values()) {
                 sb.append(wrapper.toString() + "\n");
             }
-            sb.append("  blacklists:\n");
-            for (AppBlockingPackageInfoWrapper wrapper : entry.getValue().blacklistsMap.values()) {
+            sb.append("  blocklists:\n");
+            for (AppBlockingPackageInfoWrapper wrapper : entry.getValue().mBlocklistsMap.values()) {
                 sb.append(wrapper.toString() + "\n");
             }
         }
@@ -980,14 +1009,20 @@
                 sb.append(proxy.toString() + "\n");
             }
         }
-        sb.append("**Whitelist string in resource**\n");
-        sb.append(mConfiguredWhitelist + "\n");
+        sb.append("**Allowlist string in resource**\n");
+        sb.append(mConfiguredAllowlist + "\n");
 
-        sb.append("**System whitelist string in resource**\n");
-        sb.append(mConfiguredSystemWhitelist + "\n");
+        sb.append("**System allowlist string in resource**\n");
+        sb.append(mConfiguredSystemAllowlist + "\n");
 
-        sb.append("**Blacklist string in resource**\n");
-        sb.append(mConfiguredBlacklist + "\n");
+        sb.append("**Blocklist string in resource**\n");
+        sb.append(mConfiguredBlocklist + "\n");
+
+        sb.append("**Allowlist map from resource**\n");
+        sb.append(mConfiguredAllowlistMap + "\n");
+
+        sb.append("**Blocklist from resource**\n");
+        sb.append(mConfiguredBlocklist + "\n");
 
         return sb.toString();
     }
@@ -1048,35 +1083,28 @@
             return;
         }
 
-        // We are not handling the UI blocking until we know what is allowed and what is not.
-        if (!mHasParsedPackages) {
-            if (Log.isLoggable(CarLog.TAG_PACKAGE, Log.INFO)) {
-                Log.i(CarLog.TAG_PACKAGE, "Packages not parsed, so ignoring block for " + topTask);
-            }
-            return;
-        }
-
         boolean allowed = isActivityDistractionOptimized(
                 topTask.topActivity.getPackageName(),
                 topTask.topActivity.getClassName());
         if (DBG_POLICY_ENFORCEMENT) {
-            Log.i(CarLog.TAG_PACKAGE, "new activity:" + topTask.toString() + " allowed:" + allowed);
+            Log.i(CarLog.TAG_PACKAGE, "new activity:" + topTask.toString() + " allowed:"
+                    + allowed);
         }
         if (allowed) {
             return;
         }
         synchronized (mLock) {
             if (!mEnableActivityBlocking) {
-                Log.d(CarLog.TAG_PACKAGE, "Current activity " + topTask.topActivity +
-                        " not allowed, blocking disabled. Number of tasks in stack:"
+                Log.d(CarLog.TAG_PACKAGE, "Current activity " + topTask.topActivity
+                        + " not allowed, blocking disabled. Number of tasks in stack:"
                         + topTask.stackInfo.taskIds.length);
                 return;
             }
         }
         if (DBG_POLICY_ENFORCEMENT) {
-            Log.i(CarLog.TAG_PACKAGE, "Current activity " + topTask.topActivity +
-                    " not allowed, will block, number of tasks in stack:" +
-                    topTask.stackInfo.taskIds.length);
+            Log.i(CarLog.TAG_PACKAGE, "Current activity " + topTask.topActivity
+                    + " not allowed, will block, number of tasks in stack:"
+                    + topTask.stackInfo.taskIds.length);
         }
 
         // Figure out the root activity of blocked task.
@@ -1232,16 +1260,9 @@
             sendMessage(msg);
         }
 
-        private void requestParsingInstalledPkgs(long delayMs) {
-            // Parse packages for current user.
-            removeMessages(MSG_PARSE_PKG);
-
-            Message msg = obtainMessage(MSG_PARSE_PKG);
-            if (delayMs == 0) {
-                sendMessage(msg);
-            } else {
-                sendMessageDelayed(msg, delayMs);
-            }
+        private void requestParsingInstalledPkg(String packageName) {
+            Message msg = obtainMessage(MSG_PARSE_PKG, packageName);
+            sendMessage(msg);
         }
 
         @Override
@@ -1256,7 +1277,7 @@
                     service.doHandleInit();
                     break;
                 case MSG_PARSE_PKG:
-                    service.doParseInstalledPackages();
+                    service.doParseInstalledPackage((String) msg.obj);
                     break;
                 case MSG_UPDATE_POLICY:
                     Pair<String, CarAppBlockingPolicy> pair =
@@ -1295,61 +1316,61 @@
      * held.
      */
     private static class ClientPolicy {
-        private final HashMap<String, AppBlockingPackageInfoWrapper> whitelistsMap =
+        private final HashMap<String, AppBlockingPackageInfoWrapper> mAllowlistsMap =
                 new HashMap<>();
-        private final HashMap<String, AppBlockingPackageInfoWrapper> blacklistsMap =
+        private final HashMap<String, AppBlockingPackageInfoWrapper> mBlocklistsMap =
                 new HashMap<>();
 
-        private void replaceWhitelists(AppBlockingPackageInfoWrapper[] whitelists) {
-            whitelistsMap.clear();
-            addToWhitelists(whitelists);
+        private void replaceAllowlists(AppBlockingPackageInfoWrapper[] allowlists) {
+            mAllowlistsMap.clear();
+            addToAllowlists(allowlists);
         }
 
-        private void addToWhitelists(AppBlockingPackageInfoWrapper[] whitelists) {
-            if (whitelists == null) {
+        private void addToAllowlists(AppBlockingPackageInfoWrapper[] allowlists) {
+            if (allowlists == null) {
                 return;
             }
-            for (AppBlockingPackageInfoWrapper wrapper : whitelists) {
+            for (AppBlockingPackageInfoWrapper wrapper : allowlists) {
                 if (wrapper != null) {
-                    whitelistsMap.put(wrapper.info.packageName, wrapper);
+                    mAllowlistsMap.put(wrapper.info.packageName, wrapper);
                 }
             }
         }
 
-        private void removeWhitelists(AppBlockingPackageInfoWrapper[] whitelists) {
-            if (whitelists == null) {
+        private void removeAllowlists(AppBlockingPackageInfoWrapper[] allowlists) {
+            if (allowlists == null) {
                 return;
             }
-            for (AppBlockingPackageInfoWrapper wrapper : whitelists) {
+            for (AppBlockingPackageInfoWrapper wrapper : allowlists) {
                 if (wrapper != null) {
-                    whitelistsMap.remove(wrapper.info.packageName);
+                    mAllowlistsMap.remove(wrapper.info.packageName);
                 }
             }
         }
 
-        private void replaceBlacklists(AppBlockingPackageInfoWrapper[] blacklists) {
-            blacklistsMap.clear();
-            addToBlacklists(blacklists);
+        private void replaceBlocklists(AppBlockingPackageInfoWrapper[] blocklists) {
+            mBlocklistsMap.clear();
+            addToBlocklists(blocklists);
         }
 
-        private void addToBlacklists(AppBlockingPackageInfoWrapper[] blacklists) {
-            if (blacklists == null) {
+        private void addToBlocklists(AppBlockingPackageInfoWrapper[] blocklists) {
+            if (blocklists == null) {
                 return;
             }
-            for (AppBlockingPackageInfoWrapper wrapper : blacklists) {
+            for (AppBlockingPackageInfoWrapper wrapper : blocklists) {
                 if (wrapper != null) {
-                    blacklistsMap.put(wrapper.info.packageName, wrapper);
+                    mBlocklistsMap.put(wrapper.info.packageName, wrapper);
                 }
             }
         }
 
-        private void removeBlacklists(AppBlockingPackageInfoWrapper[] blacklists) {
-            if (blacklists == null) {
+        private void removeBlocklists(AppBlockingPackageInfoWrapper[] blocklists) {
+            if (blocklists == null) {
                 return;
             }
-            for (AppBlockingPackageInfoWrapper wrapper : blacklists) {
+            for (AppBlockingPackageInfoWrapper wrapper : blocklists) {
                 if (wrapper != null) {
-                    blacklistsMap.remove(wrapper.info.packageName);
+                    mBlocklistsMap.remove(wrapper.info.packageName);
                 }
             }
         }
@@ -1388,12 +1409,6 @@
                         + restrictions.isRequiresDistractionOptimization()
                         + " : " + restrictions.getActiveRestrictions());
             }
-            // We are not handling the restrictions until we know what is allowed and what is not.
-            // This is to handle some situations, where car service is ready and getting sensor
-            // data but we haven't received the boot complete intents.
-            if (!mHasParsedPackages) {
-                return;
-            }
 
             synchronized (mLock) {
                 mCurrentUxRestrictions = new CarUxRestrictions(restrictions);
@@ -1441,8 +1456,6 @@
      * installed packages.
      */
     private class PackageParsingEventReceiver extends BroadcastReceiver {
-        private static final long PACKAGE_PARSING_DELAY_MS = 500;
-
         @Override
         public void onReceive(Context context, Intent intent) {
             if (intent == null || intent.getAction() == null) {
@@ -1457,10 +1470,25 @@
                 // send a delayed message so if we received multiple related intents, we parse
                 // only once.
                 logEventChange(intent);
-                mHandler.requestParsingInstalledPkgs(PACKAGE_PARSING_DELAY_MS);
+                String packageName = getPackageName(intent);
+                mHandler.requestParsingInstalledPkg(packageName);
             }
         }
 
+        private String getPackageName(Intent intent) {
+            // For mPackageManagerActions, data should contain package name.
+            String dataString = intent.getDataString();
+            if (dataString == null) return null;
+
+            String scheme = intent.getScheme();
+            if (!scheme.equals("package")) return null;
+
+            String[] splitData = intent.getDataString().split(":");
+            if (splitData.length < 2) return null;
+
+            return splitData[1];
+        }
+
         private boolean isPackageManagerAction(String action) {
             return mPackageManagerActions.contains(action);
         }
diff --git a/service/src/com/android/car/user/CarUserService.java b/service/src/com/android/car/user/CarUserService.java
index e4aeea8..1883a8a 100644
--- a/service/src/com/android/car/user/CarUserService.java
+++ b/service/src/com/android/car/user/CarUserService.java
@@ -942,7 +942,8 @@
         halUser.flags = UserHalHelper.convertFlags(userInfo);
         UsersInfo usersInfo = UserHalHelper.newUsersInfo(mUserManager);
 
-        // Do not delete last admin user.
+        // check if the user is last admin user.
+        boolean isLastAdmin = false;
         if (UserHalHelper.isAdmin(halUser.flags)) {
             int size = usersInfo.existingUsers.size();
             int totalAdminUsers = 0;
@@ -952,8 +953,7 @@
                 }
             }
             if (totalAdminUsers == 1) {
-                return logAndGetResults(userId,
-                        UserRemovalResult.STATUS_TARGET_USER_IS_LAST_ADMIN_USER);
+                isLastAdmin = true;
             }
         }
 
@@ -970,7 +970,13 @@
             mHal.removeUser(request);
         }
 
-        return logAndGetResults(userId, UserRemovalResult.STATUS_SUCCESSFUL);
+        if (isLastAdmin) {
+            Log.w(TAG_USER, "Last admin user successfully removed. UserId: " + userId);
+        }
+
+        return logAndGetResults(userId,
+                isLastAdmin ? UserRemovalResult.STATUS_SUCCESSFUL_LAST_ADMIN_REMOVED
+                        : UserRemovalResult.STATUS_SUCCESSFUL);
     }
 
     private UserRemovalResult logAndGetResults(@UserIdInt int userId,
diff --git a/service/src/com/android/car/user/UserMetrics.java b/service/src/com/android/car/user/UserMetrics.java
index 62b9755..cd139cc 100644
--- a/service/src/com/android/car/user/UserMetrics.java
+++ b/service/src/com/android/car/user/UserMetrics.java
@@ -125,7 +125,6 @@
         synchronized (mLock) {
             mHalResponseTime = halResponseTime;
             mFirstUserUnlockDuration.put(userId, duration);
-            onUserUnlockedEventLocked(timestampMs, userId);
         }
     }
 
diff --git a/service/src/com/android/car/watchdog/CarWatchdogService.java b/service/src/com/android/car/watchdog/CarWatchdogService.java
index 8a1ebc7..488165f 100644
--- a/service/src/com/android/car/watchdog/CarWatchdogService.java
+++ b/service/src/com/android/car/watchdog/CarWatchdogService.java
@@ -34,6 +34,7 @@
 import android.car.hardware.power.CarPowerManager.CarPowerStateListener;
 import android.car.hardware.power.ICarPowerStateListener;
 import android.car.watchdog.ICarWatchdogService;
+import android.car.watchdog.ICarWatchdogServiceCallback;
 import android.car.watchdoglib.CarWatchdogDaemonHelper;
 import android.content.Context;
 import android.content.pm.UserInfo;
@@ -172,11 +173,11 @@
     }
 
     /**
-     * Registers {@link android.automotive.watchdog. ICarWatchdogClient} to
+     * Registers {@link android.car.watchdog.ICarWatchdogServiceCallback} to
      * {@link CarWatchdogService}.
      */
     @Override
-    public void registerClient(ICarWatchdogClient client, int timeout) {
+    public void registerClient(ICarWatchdogServiceCallback client, int timeout) {
         ArrayList<ClientInfo> clients = mClientMap.get(timeout);
         if (clients == null) {
             Log.w(TAG, "Cannot register the client: invalid timeout");
@@ -210,11 +211,11 @@
     }
 
     /**
-     * Unregisters {@link android.automotive.watchdog. ICarWatchdogClient} from
+     * Unregisters {@link android.car.watchdog.ICarWatchdogServiceCallback} from
      * {@link CarWatchdogService}.
      */
     @Override
-    public void unregisterClient(ICarWatchdogClient client) {
+    public void unregisterClient(ICarWatchdogServiceCallback client) {
         synchronized (mLock) {
             IBinder binder = client.asBinder();
             for (int timeout : ALL_TIMEOUTS) {
@@ -241,7 +242,7 @@
      * Tells {@link CarWatchdogService} that the client is alive.
      */
     @Override
-    public void tellClientAlive(ICarWatchdogClient client, int sessionId) {
+    public void tellClientAlive(ICarWatchdogServiceCallback client, int sessionId) {
         synchronized (mLock) {
             for (int timeout : ALL_TIMEOUTS) {
                 if (!mClientCheckInProgress.get(timeout)) {
@@ -305,7 +306,7 @@
         }
     }
 
-    private void onClientDeath(ICarWatchdogClient client, int timeout) {
+    private void onClientDeath(ICarWatchdogServiceCallback client, int timeout) {
         synchronized (mLock) {
             removeClientLocked(client.asBinder(), timeout);
         }
@@ -363,7 +364,7 @@
         for (int i = 0; i < clientsToCheck.size(); i++) {
             ClientInfo clientInfo = clientsToCheck.get(i);
             try {
-                clientInfo.client.checkIfAlive(clientInfo.sessionId, timeout);
+                clientInfo.client.onCheckHealthStatus(clientInfo.sessionId, timeout);
             } catch (RemoteException e) {
                 Log.w(TAG, "Sending a ping message to client(pid: " +  clientInfo.pid
                         + ") failed: " + e);
@@ -414,9 +415,9 @@
         for (int i = 0; i < clientsToNotify.size(); i++) {
             ClientInfo clientInfo = clientsToNotify.get(i);
             try {
-                clientInfo.client.prepareProcessTermination();
+                clientInfo.client.onPrepareProcessTermination();
             } catch (RemoteException e) {
-                Log.w(TAG, "Notifying prepareProcessTermination to client(pid: " + clientInfo.pid
+                Log.w(TAG, "Notifying onPrepareProcessTermination to client(pid: " + clientInfo.pid
                         + ") failed: " + e);
             }
         }
@@ -589,13 +590,14 @@
     }
 
     private final class ClientInfo implements IBinder.DeathRecipient {
-        public final ICarWatchdogClient client;
+        public final ICarWatchdogServiceCallback client;
         public final int pid;
         @UserIdInt public final int userId;
         public final int timeout;
         public volatile int sessionId;
 
-        private ClientInfo(ICarWatchdogClient client, int pid, @UserIdInt int userId, int timeout) {
+        private ClientInfo(ICarWatchdogServiceCallback client, int pid, @UserIdInt int userId,
+                int timeout) {
             this.client = client;
             this.pid = pid;
             this.userId = userId;
diff --git a/surround_view/service-impl/CoreLibSetupHelper.cpp b/surround_view/service-impl/CoreLibSetupHelper.cpp
deleted file mode 100644
index 4812efe..0000000
--- a/surround_view/service-impl/CoreLibSetupHelper.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright 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.
- */
-
-#include "CoreLibSetupHelper.h"
-
-using namespace android_auto::surround_view;
-
-namespace android_auto {
-namespace surround_view {
-
-vector<SurroundViewCameraParams> GetCameras() {
-  std::vector<android_auto::surround_view::SurroundViewCameraParams> cameras;
-
-  // Camera 1.
-  {
-    android_auto::surround_view::SurroundViewCameraParams camera_params;
-
-    camera_params.intrinsics[0] = 608.0026093794693;
-    camera_params.intrinsics[1] = 0.0;
-    camera_params.intrinsics[2] = 968.699544102168;
-    camera_params.intrinsics[3] = 0.0;
-    camera_params.intrinsics[4] = 608.205469489769;
-    camera_params.intrinsics[5] = 476.38843298898996;
-    camera_params.intrinsics[6] = 0.0;
-    camera_params.intrinsics[7] = 0.0;
-    camera_params.intrinsics[8] = 1.0;
-
-    camera_params.distorion[0] = -0.03711481733589263;
-    camera_params.distorion[1] = -0.0014805627895442888;
-    camera_params.distorion[2] = -0.00030212056866592464;
-    camera_params.distorion[3] = -0.00020149538570397933;
-
-    camera_params.rvec[0] = 2.26308;
-    camera_params.rvec[1] = 0.0382788;
-    camera_params.rvec[2] = -0.0220549;
-
-    camera_params.tvec[0] = -7.8028875403817685e-02;
-    camera_params.tvec[1] = 1.4537396465103221e+00;
-    camera_params.tvec[2] = -8.4197165554645001e-02;
-
-    camera_params.size.width = 1920;
-    camera_params.size.height = 1024;
-
-    camera_params.circular_fov = 179;
-
-    cameras.push_back(camera_params);
-  }
-
-  // Camera 2.
-  {
-    android_auto::surround_view::SurroundViewCameraParams camera_params;
-
-    camera_params.intrinsics[0] = 607.8691721095306;
-    camera_params.intrinsics[1] = 0.0;
-    camera_params.intrinsics[2] = 975.5686146375716;
-    camera_params.intrinsics[3] = 0.0;
-    camera_params.intrinsics[4] = 608.0112887189435;
-    camera_params.intrinsics[5] = 481.1938786570715;
-    camera_params.intrinsics[6] = 0.0;
-    camera_params.intrinsics[7] = 0.0;
-    camera_params.intrinsics[8] = 1.0;
-
-    camera_params.distorion[0] = -0.040116809827977926;
-    camera_params.distorion[1] = 0.0028769489398543014;
-    camera_params.distorion[2] = -0.002651039958977229;
-    camera_params.distorion[3] = 0.00024260630476736675;
-
-    camera_params.rvec[0] = 1.67415;
-    camera_params.rvec[1] = -1.74075;
-    camera_params.rvec[2] = 0.789399;
-
-    camera_params.tvec[0] = 2.9715052384687407e-01;
-    camera_params.tvec[1] = 1.1407102692699396e+00;
-    camera_params.tvec[2] = 3.0074545273489206e-01;
-
-    camera_params.size.width = 1920;
-    camera_params.size.height = 1024;
-
-    camera_params.circular_fov = 179;
-
-    cameras.push_back(camera_params);
-  }
-
-  // Camera 3.
-  {
-    android_auto::surround_view::SurroundViewCameraParams camera_params;
-
-    camera_params.intrinsics[0] = 608.557299289448;
-    camera_params.intrinsics[1] = 0.0;
-    camera_params.intrinsics[2] = 960.1949354417656;
-    camera_params.intrinsics[3] = 0.0;
-    camera_params.intrinsics[4] = 608.8093878512448;
-    camera_params.intrinsics[5] = 474.74744054048256;
-    camera_params.intrinsics[6] = 0.0;
-    camera_params.intrinsics[7] = 0.0;
-    camera_params.intrinsics[8] = 1.0;
-
-    camera_params.distorion[0] = -0.03998488563470043;
-    camera_params.distorion[1] = 0.0024786686909103388;
-    camera_params.distorion[2] = -0.002354736769480817;
-    camera_params.distorion[3] = 0.00018369619088506146;
-
-    camera_params.rvec[0] = -0.106409;
-    camera_params.rvec[1] = -2.83697;
-    camera_params.rvec[2] = 1.28629;
-
-    camera_params.tvec[0] = 1.7115269161259747e-01;
-    camera_params.tvec[1] = 1.4376160762596599e+00;
-    camera_params.tvec[2] = -1.9028844233159006e-02;
-
-    camera_params.size.width = 1920;
-    camera_params.size.height = 1024;
-
-    camera_params.circular_fov = 179;
-
-    cameras.push_back(camera_params);
-  }
-
-  // Camera 4.
-  {
-    android_auto::surround_view::SurroundViewCameraParams camera_params;
-
-    camera_params.intrinsics[0] = 608.1221963545495;
-    camera_params.intrinsics[1] = 0.0;
-    camera_params.intrinsics[2] = 943.6280444638576;
-    camera_params.intrinsics[3] = 0.0;
-    camera_params.intrinsics[4] = 608.0523818661524;
-    camera_params.intrinsics[5] = 474.8564698210861;
-    camera_params.intrinsics[6] = 0.0;
-    camera_params.intrinsics[7] = 0.0;
-    camera_params.intrinsics[8] = 1.0;
-
-    camera_params.distorion[0] = -0.038096507459563965;
-    camera_params.distorion[1] = 0.0004008114278766646;
-    camera_params.distorion[2] = -0.0013549275607082035;
-    camera_params.distorion[3] = -5.9961182248325556e-06;
-
-    camera_params.rvec[0] = 1.63019;
-    camera_params.rvec[1] = 1.76475;
-    camera_params.rvec[2] = -0.827941;
-
-    camera_params.tvec[0] = -3.0842691427126512e-01;
-    camera_params.tvec[1] = 1.0884122033556984e+00;
-    camera_params.tvec[2] = 3.4419058255954926e-01;
-
-    camera_params.size.width = 1920;
-    camera_params.size.height = 1024;
-
-    camera_params.circular_fov = 179;
-
-    cameras.push_back(camera_params);
-  }
-  return cameras;
-
-}
-
-SurroundView2dParams Get2dParams() {
-  android_auto::surround_view::Size2dInteger
-      resolution{ /*width=*/ 1024, /*height*/ 768};
-  // make sure resolution has the same ratio with physical_size.
-  // {480 *360 }
-  android_auto::surround_view::Size2dFloat physical_size{8.0, 6.0};
-  android_auto::surround_view::Coordinate2dFloat physical_center{0, 0};
-
-  return android_auto::surround_view::SurroundView2dParams(
-      resolution, physical_size, physical_center);
-}
-
-SurroundView3dParams Get3dParams() {
-  return android_auto::surround_view::SurroundView3dParams(
-      /*plane_radius=*/ 8.0f,
-      /*plane_divisions=*/ 50,
-      /*curve_height=*/ 6.0f,
-      /*curve_divisions=*/ 50,
-      /*angular_divisions=*/ 90,
-      /*curve_coefficient=*/ 3.0f,
-      /*resolution=*/ Size2dInteger(1024, 768));
-}
-
-BoundingBox GetBoundingBox() {
-  return android_auto::surround_view::BoundingBox(
-      /*x=*/ -0.01f,
-      /*y=*/ 0.01f,
-      /*width=*/ 0.01f,
-      /*height=*/ 0.01f);
-}
-
-vector<float> GetUndistortionScales() {
-  return vector<float>{1.0f, 1.0f, 1.0f, 1.0f};
-}
-
-
-} // namespace surround_view
-} // namespace audroid_auto
-
diff --git a/surround_view/service-impl/CoreLibSetupHelper.h b/surround_view/service-impl/CoreLibSetupHelper.h
deleted file mode 100644
index 889ebf2..0000000
--- a/surround_view/service-impl/CoreLibSetupHelper.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 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.
- */
-
-#pragma once
-
-#include <string>
-#include <vector>
-#include "core_lib.h"
-
-using namespace std;
-
-// TODO(b/150412555): The helper method should only be used for testing
-// purposes once EVS camera is used.
-namespace android_auto {
-namespace surround_view {
-
-vector<SurroundViewCameraParams> GetCameras();
-
-SurroundView2dParams Get2dParams();
-
-SurroundView3dParams Get3dParams();
-
-BoundingBox GetBoundingBox();
-
-vector<float> GetUndistortionScales();
-
-}  // namespace surround_view
-}  // namespace android_auto
-
diff --git a/surround_view/service-impl/README b/surround_view/service-impl/README
deleted file mode 100644
index d7b5e7c..0000000
--- a/surround_view/service-impl/README
+++ /dev/null
@@ -1 +0,0 @@
-The core_lib.h and the .so files are copied from google3 at Mar 19, 2020.
diff --git a/surround_view/service-impl/lib/arm64/libcore_lib_shared.so b/surround_view/service-impl/lib/arm64/libcore_lib_shared.so
deleted file mode 100755
index 5ca36a5..0000000
--- a/surround_view/service-impl/lib/arm64/libcore_lib_shared.so
+++ /dev/null
Binary files differ
diff --git a/surround_view/service-impl/lib/x86-64/libcore_lib_shared.so b/surround_view/service-impl/lib/x86-64/libcore_lib_shared.so
deleted file mode 100755
index 7f2e039..0000000
--- a/surround_view/service-impl/lib/x86-64/libcore_lib_shared.so
+++ /dev/null
Binary files differ
diff --git a/surround_view/service-impl/lib/x86/libcore_lib_shared.so b/surround_view/service-impl/lib/x86/libcore_lib_shared.so
deleted file mode 100755
index 9d0f4ef..0000000
--- a/surround_view/service-impl/lib/x86/libcore_lib_shared.so
+++ /dev/null
Binary files differ
diff --git a/surround_view/service-impl/mock-evs/MockEvsCamera.cpp b/surround_view/service-impl/mock-evs/MockEvsCamera.cpp
deleted file mode 100644
index f268e5b..0000000
--- a/surround_view/service-impl/mock-evs/MockEvsCamera.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright 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.
- */
-
-#include "MockEvsCamera.h"
-
-namespace android {
-namespace hardware {
-namespace automotive {
-namespace sv {
-namespace V1_0 {
-namespace implementation {
-
-MockEvsCamera::MockEvsCamera() {
-    mConfigManager =
-            ConfigManager::Create(
-                    "/vendor/etc/automotive/evs/evs_sample_configuration.xml");
-}
-
-Return<void> MockEvsCamera::getCameraInfo(getCameraInfo_cb _hidl_cb) {
-    // Not implemented.
-
-    (void)_hidl_cb;
-    return {};
-}
-
-Return<EvsResult> MockEvsCamera::setMaxFramesInFlight(uint32_t bufferCount) {
-    // Not implemented.
-
-    (void)bufferCount;
-    return EvsResult::OK;
-}
-
-Return<EvsResult> MockEvsCamera::startVideoStream(
-        const ::android::sp<IEvsCameraStream_1_0>& stream) {
-    LOG(INFO) << __FUNCTION__;
-
-    (void)stream;
-    return EvsResult::OK;
-}
-
-Return<void> MockEvsCamera::doneWithFrame(const BufferDesc_1_0& buffer) {
-    // Not implemented.
-
-    (void)buffer;
-    return {};
-}
-
-Return<void> MockEvsCamera::stopVideoStream() {
-    LOG(INFO) << __FUNCTION__;
-    return {};
-}
-
-Return<int32_t> MockEvsCamera::getExtendedInfo(uint32_t opaqueIdentifier) {
-    // Not implemented.
-
-    (void)opaqueIdentifier;
-    return 0;
-}
-
-Return<EvsResult> MockEvsCamera::setExtendedInfo(uint32_t opaqueIdentifier,
-                                                 int32_t opaqueValue) {
-    // Not implemented.
-
-    (void)opaqueIdentifier;
-    (void)opaqueValue;
-    return EvsResult::OK;
-}
-
-Return<void> MockEvsCamera::getCameraInfo_1_1(getCameraInfo_1_1_cb _hidl_cb) {
-    // Not implemented.
-
-    (void)_hidl_cb;
-    return {};
-}
-
-Return<void> MockEvsCamera::getPhysicalCameraInfo(
-        const hidl_string& deviceId, getPhysicalCameraInfo_cb _hidl_cb) {
-    CameraDesc_1_1 desc = {};
-    desc.v1.cameraId = deviceId;
-
-    unique_ptr<ConfigManager::CameraInfo>& cameraInfo =
-            mConfigManager->getCameraInfo(deviceId);
-    if (cameraInfo != nullptr) {
-        desc.metadata.setToExternal(
-                (uint8_t*)cameraInfo->characteristics,
-                get_camera_metadata_size(cameraInfo->characteristics));
-    }
-
-    _hidl_cb(desc);
-
-    return {};
-}
-
-Return<EvsResult> MockEvsCamera::doneWithFrame_1_1(
-        const hardware::hidl_vec<BufferDesc_1_1>& buffer) {
-    // Not implemented.
-
-    (void)buffer;
-    return EvsResult::OK;
-}
-
-Return<EvsResult> MockEvsCamera::setMaster() {
-    // Not implemented.
-
-    return EvsResult::OK;
-}
-
-Return<EvsResult> MockEvsCamera::forceMaster(
-        const sp<IEvsDisplay_1_0>& display) {
-    // Not implemented.
-
-    (void)display;
-    return EvsResult::OK;
-}
-
-Return<EvsResult> MockEvsCamera::unsetMaster() {
-    // Not implemented.
-
-    return EvsResult::OK;
-}
-
-Return<void> MockEvsCamera::getParameterList(getParameterList_cb _hidl_cb) {
-    // Not implemented.
-
-    (void)_hidl_cb;
-    return {};
-}
-
-Return<void> MockEvsCamera::getIntParameterRange(
-        CameraParam id, getIntParameterRange_cb _hidl_cb) {
-    // Not implemented.
-
-    (void)id;
-    (void)_hidl_cb;
-    return {};
-}
-
-Return<void> MockEvsCamera::setIntParameter(CameraParam id, int32_t value,
-                                            setIntParameter_cb _hidl_cb) {
-    // Not implemented.
-
-    (void)id;
-    (void)value;
-    (void)_hidl_cb;
-    return {};
-}
-
-Return<void> MockEvsCamera::getIntParameter(
-        CameraParam id, getIntParameter_cb _hidl_cb) {
-    // Not implemented.
-
-    (void)id;
-    (void)_hidl_cb;
-    return {};
-}
-
-Return<EvsResult> MockEvsCamera::setExtendedInfo_1_1(
-    uint32_t opaqueIdentifier, const hidl_vec<uint8_t>& opaqueValue) {
-    // Not implemented.
-
-    (void)opaqueIdentifier;
-    (void)opaqueValue;
-    return EvsResult::OK;
-}
-
-Return<void> MockEvsCamera::getExtendedInfo_1_1(
-        uint32_t opaqueIdentifier, getExtendedInfo_1_1_cb _hidl_cb) {
-    // Not implemented.
-
-    (void)opaqueIdentifier;
-    (void)_hidl_cb;
-    return {};
-}
-
-Return<void> MockEvsCamera::importExternalBuffers(
-        const hidl_vec<BufferDesc_1_1>& buffers,
-        importExternalBuffers_cb _hidl_cb) {
-    // Not implemented.
-
-    (void)buffers;
-    (void)_hidl_cb;
-    return {};
-}
-
-}  // namespace implementation
-}  // namespace V1_0
-}  // namespace sv
-}  // namespace automotive
-}  // namespace hardware
-}  // namespace android
diff --git a/tests/BugReportApp/res/values-ky/strings.xml b/tests/BugReportApp/res/values-ky/strings.xml
index 0cdce1c..dda03bb 100644
--- a/tests/BugReportApp/res/values-ky/strings.xml
+++ b/tests/BugReportApp/res/values-ky/strings.xml
@@ -22,7 +22,7 @@
     <string name="bugreport_info_start" msgid="667324824650830832">"Мүчүлүштүк тууралуу кабарды берип баштоо"</string>
     <string name="bugreport_info_status" msgid="7211044508792815451">"Абалы:"</string>
     <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Тапшыруу"</string>
-    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Жокко чыгаруу"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Жок"</string>
     <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Жүктөп берүү"</string>
     <string name="bugreport_dialog_save" msgid="3291363266190644226">"Сактоо"</string>
     <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Мүчүлүштүк тууралуу кабарларды көрсөтүү"</string>
diff --git a/tests/BugReportApp/res/values-mr/strings.xml b/tests/BugReportApp/res/values-mr/strings.xml
index 50a97e7..8f8d94d 100644
--- a/tests/BugReportApp/res/values-mr/strings.xml
+++ b/tests/BugReportApp/res/values-mr/strings.xml
@@ -45,5 +45,5 @@
     <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"डंप स्थितीवर बदलता आले नाही"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"बग रिपोर्ट तयार करणे प्रगतिपथावर आहे"</string>
     <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"बग रिपोर्ट गोळा केला"</string>
-    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"बग रिपोर्ट स्थिती चॅनेल"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"बग रिपोर्ट स्थिती चॅनल"</string>
 </resources>
diff --git a/tests/BugReportApp/res/values-ne/strings.xml b/tests/BugReportApp/res/values-ne/strings.xml
index 997cea1..7a8464a 100644
--- a/tests/BugReportApp/res/values-ne/strings.xml
+++ b/tests/BugReportApp/res/values-ne/strings.xml
@@ -41,7 +41,7 @@
     <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"बग रिपोर्ट पहिलेदेखि नै सङ्कलन भइरहेको छ"</string>
     <string name="toast_bug_report_started" msgid="7154589593986557754">"बगबारे रिपोर्ट गर्ने कार्य सुरु भयो"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"बग रिपोर्ट सङ्कलन गर्न सकिएन"</string>
-    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"स्क्रिनको तस्बिर खिच्न सकिएन"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"स्क्रिनको फोटो खिच्न सकिएन"</string>
     <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"डम्प स्टेटले काम गर्न सकेन"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"बग रिपोर्ट सङ्कलन गर्ने कार्य जारी छ"</string>
     <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"बग रिपोर्ट सङ्कलन गरियो"</string>
diff --git a/tests/BugReportApp/res/values-sv/strings.xml b/tests/BugReportApp/res/values-sv/strings.xml
index 18b19ef..05dc627 100644
--- a/tests/BugReportApp/res/values-sv/strings.xml
+++ b/tests/BugReportApp/res/values-sv/strings.xml
@@ -41,7 +41,7 @@
     <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Felrapporten samlas redan in"</string>
     <string name="toast_bug_report_started" msgid="7154589593986557754">"Felrapportering startas"</string>
     <string name="toast_status_failed" msgid="6365384202315043395">"Felrapporten misslyckades"</string>
-    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Skärmdumpen misslyckades"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Skärmbilden misslyckades"</string>
     <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Statusdumpen misslyckades"</string>
     <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Felrapporten har påbörjats"</string>
     <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Felrapporten samlas in"</string>
diff --git a/tests/CarDeveloperOptions/res/values-af/strings.xml b/tests/CarDeveloperOptions/res/values-af/strings.xml
index 9857323..80fe046 100644
--- a/tests/CarDeveloperOptions/res/values-af/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-af/strings.xml
@@ -1615,7 +1615,7 @@
     <string name="tether_settings_title_bluetooth" msgid="1999590158102569959">"Bluetooth-verbinding"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="1159128764162788159">"Verbinding"</string>
     <string name="tether_settings_title_all" msgid="6935843543433954181">"Warmkol en verbinding"</string>
-    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="1289593649526514499">"Warmkol is aan, verbinding"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="1289593649526514499">"Warmkol is aan, verbind"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="8010689354668285422">"Warmkol is aan"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1349909238672649877">"Verbinding"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="3682544845899910726">"Kan nie verbind of Wi-Fi-warmkol gebruik wanneer Databespaarder aan is nie"</string>
diff --git a/tests/CarDeveloperOptions/res/values-am/arrays.xml b/tests/CarDeveloperOptions/res/values-am/arrays.xml
index acbc14e..860c396 100644
--- a/tests/CarDeveloperOptions/res/values-am/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-am/arrays.xml
@@ -323,7 +323,7 @@
     <item msgid="6844485713404805301">"ዋናው የድምጽ መቆጣጠሪያ"</item>
     <item msgid="1600379420669104929">"የድምጽ መጠን"</item>
     <item msgid="6296768210470214866">"የጥሪ ድምጽ መጠን"</item>
-    <item msgid="510690696071629241">"የማህደረመረጃ ክፍልፍል"</item>
+    <item msgid="510690696071629241">"የማህደረ መረጃ ድምጽ መጠን"</item>
     <item msgid="406861638631430109">"የማንቂያ ድምፅ መጠን"</item>
     <item msgid="4715864795872233884">"የማሳወቂያ ድምጽ መጠን"</item>
     <item msgid="2311478519251301183">"የብሉቱዝ ድምፅ መጠን"</item>
diff --git a/tests/CarDeveloperOptions/res/values-am/strings.xml b/tests/CarDeveloperOptions/res/values-am/strings.xml
index ba77bc5..f52435a 100644
--- a/tests/CarDeveloperOptions/res/values-am/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-am/strings.xml
@@ -3134,7 +3134,7 @@
     <string name="sound_settings_summary_vibrate" msgid="2194491116884798590">"ደዋዩ ወደ ንዘር ተቀናብሯል"</string>
     <string name="sound_settings_summary_silent" msgid="899823817462768876">"ደዋዩ ወደ ጸጥታ ተቀናብሯል"</string>
     <string name="sound_settings_example_summary" msgid="2091822107298841827">"የጥሪ ድምጽ መጠን 80% ላይ"</string>
-    <string name="media_volume_option_title" msgid="3553411883305505682">"የማህደረመረጃ ክፍልፍል"</string>
+    <string name="media_volume_option_title" msgid="3553411883305505682">"የማህደረ መረጃ ድምጽ መጠን"</string>
     <string name="remote_media_volume_option_title" msgid="6355710054191873836">"ድምፅን Cast አድርግ"</string>
     <string name="call_volume_option_title" msgid="5028003296631037334">"የስልክ ጥሪ ድምጽ መጠን"</string>
     <string name="alarm_volume_option_title" msgid="3184076022438477047">"የማንቂያ ድምፅ መጠን"</string>
diff --git a/tests/CarDeveloperOptions/res/values-ar/strings.xml b/tests/CarDeveloperOptions/res/values-ar/strings.xml
index b5310ee..04050a1 100644
--- a/tests/CarDeveloperOptions/res/values-ar/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ar/strings.xml
@@ -107,7 +107,7 @@
     <string name="bluetooth_device_name" msgid="3682016026866302981">"اسم الجهاز"</string>
     <string name="bluetooth_device_details" msgid="2500840679106321361">"إعدادات الجهاز"</string>
     <string name="bluetooth_profile_details" msgid="1785505059738682493">"إعدادات الملف الشخصي"</string>
-    <string name="bluetooth_name_not_set" msgid="1886067683138385142">"لم يتم تعيين اسم، استخدام اسم الحساب"</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_button" msgid="8946904845821073267">"إعادة التسمية"</string>
@@ -182,7 +182,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>
@@ -216,7 +216,7 @@
     <string name="radio_info_dl_kbps" msgid="2903778264453410272">"معدّل نقل بيانات DL (كيلوبت في الثانية):"</string>
     <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_phy_chan_config" msgid="1184401689381480522">"إعداد قناة LTE Physical:"</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>
@@ -235,7 +235,7 @@
     <string name="radio_info_band_mode_label" msgid="9181607879920091762">"تحديد النطاق اللاسلكي"</string>
     <string name="radio_info_voice_network_type_label" msgid="3686471589514241007">"نوع الشبكة الصوتية:"</string>
     <string name="radio_info_data_network_type_label" msgid="5108279335070879015">"نوع شبكة البيانات:"</string>
-    <string name="radio_info_set_perferred_label" msgid="1447353131819041587">"تعيين نوع الشبكة المفضل:"</string>
+    <string name="radio_info_set_perferred_label" msgid="1447353131819041587">"ضبط نوع الشبكة المفضل:"</string>
     <string name="radio_info_ping_hostname_v4" msgid="4377067049156466290">"فحص اتصال اسم المضيف (www.google.com) عبر IPv4:"</string>
     <string name="radio_info_ping_hostname_v6" msgid="3541896405771734445">"فحص اتصال اسم المضيف (www.google.com) عبر IPv6:"</string>
     <string name="radio_info_http_client_test" msgid="781411599778629953">"اختبار عميل HTTP:"</string>
@@ -308,7 +308,7 @@
     <string name="settings_label" msgid="7263237773415875813">"الإعدادات"</string>
     <string name="settings_label_launcher" msgid="500627679902923496">"الإعدادات"</string>
     <string name="settings_shortcut" msgid="4503714880251502167">"اختصار الإعدادات"</string>
-    <string name="airplane_mode" msgid="4508870277398231073">"وضع الطائرة"</string>
+    <string name="airplane_mode" msgid="4508870277398231073">"وضع الطيران"</string>
     <string name="wireless_networks_settings_title" msgid="4298430520189173949">"اللاسلكي والشبكات"</string>
     <string name="radio_controls_summary" msgid="4596981962167684814">"إدارة Wi-Fi والبلوتوث ووضع الطائرة وشبكات الجوّال والشبكات الافتراضية الخاصة (VPN)"</string>
     <string name="cellular_data_title" msgid="7909624119432695022">"بيانات الجوّال"</string>
@@ -552,9 +552,9 @@
     <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>
-    <string name="suggested_lock_settings_summary" product="device" msgid="7127114417250029182">"تعيين قفل شاشة لحماية الجهاز"</string>
-    <string name="suggested_lock_settings_summary" product="default" msgid="1090621950888321990">"تعيين قفل شاشة لحماية الهاتف"</string>
+    <string name="suggested_lock_settings_summary" product="tablet" msgid="1861066918594412519">"ضبط قفل شاشة لحماية الجهاز اللوحي"</string>
+    <string name="suggested_lock_settings_summary" product="device" msgid="7127114417250029182">"ضبط قفل شاشة لحماية الجهاز"</string>
+    <string name="suggested_lock_settings_summary" product="default" msgid="1090621950888321990">"ضبط قفل شاشة لحماية الهاتف"</string>
     <string name="suggested_fingerprint_lock_settings_title" msgid="2860380076519822398">"إضافة بصمة الإصبع لإلغاء القفل"</string>
     <string name="suggested_fingerprint_lock_settings_summary" product="tablet" msgid="8114514312665251311"></string>
     <string name="suggested_fingerprint_lock_settings_summary" product="device" msgid="8114514312665251311"></string>
@@ -913,7 +913,7 @@
     <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_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>
@@ -951,7 +951,7 @@
     <string name="wifi_menu_p2p" msgid="4945665601551289791">"اتصال Wi-Fi مباشر"</string>
     <string name="wifi_menu_scan" msgid="9082691677803181629">"فحص"</string>
     <string name="wifi_menu_advanced" msgid="5984484498045511072">"إعدادات متقدمة"</string>
-    <string name="wifi_menu_configure" msgid="52192491120701266">"تهيئة"</string>
+    <string name="wifi_menu_configure" msgid="52192491120701266">"إعداد"</string>
     <string name="wifi_menu_connect" msgid="3984327567173931219">"اتصال بالشبكة"</string>
     <string name="wifi_menu_remember" msgid="717257200269700641">"تذكر الشبكة"</string>
     <string name="wifi_menu_forget" msgid="7561140554450163075">"حذف الشبكة"</string>
@@ -973,7 +973,7 @@
     <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">"إذا لم يكن جهاز التوجيه يبث معرّف شبكة وتريد الاتصال به في المستقبل، يمكنك تعيين الشبكة كشبكة مخفية.\n\nربما ينشئ هذا خطرًا أمنيًا حيث سيبث هاتفك إشارته بانتظام للعثور على الشبكة.\n\nلن يؤدي تعيين الشبكة كشبكة مخفية إلى تغيير إعدادات جهاز التوجيه."</string>
+    <string name="wifi_hidden_network_warning" msgid="8182333050353796473">"إذا لم يكن جهاز التوجيه يبث معرّف شبكة وتريد الاتصال به في المستقبل، يمكنك ضبط الشبكة كشبكة مخفية.\n\nربما ينشئ هذا خطرًا أمنيًا حيث سيبث هاتفك إشارته بانتظام للعثور على الشبكة.\n\nلن يؤدي تعيين الشبكة كشبكة مخفية إلى تغيير إعدادات جهاز التوجيه."</string>
     <string name="wifi_signal" msgid="696548364467704808">"قوة الإشارة"</string>
     <string name="wifi_status" msgid="3439931558930689940">"الحالة"</string>
     <string name="tx_wifi_speed" msgid="2571810085003261073">"سرعة نقل الرابط"</string>
@@ -1133,7 +1133,7 @@
     <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_no_password_subtext" msgid="5400500962974373706">"لم يتم تعيين كلمة مرور"</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_connected" msgid="8387768642326756749">"يمكن توصيل الأجهزة الأخرى بشبكة <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
@@ -1402,8 +1402,8 @@
     <string name="device_status_summary" product="tablet" msgid="8975790197766171710">"حالة البطارية والشبكة ومعلومات أخرى"</string>
     <string name="device_status_summary" product="default" msgid="8282235230720651642">"رقم الهاتف أو الإشارة أو غير ذلك."</string>
     <string name="storage_settings" msgid="7009733301485139652">"التخزين"</string>
-    <string name="storage_settings_for_app" msgid="3028887232073069965">"التخزين وذاكرة التخزين المؤقت"</string>
-    <string name="storage_usb_settings" msgid="4470138799276333403">"التخزين"</string>
+    <string name="storage_settings_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>
@@ -1521,7 +1521,7 @@
     <string name="storage_dialog_unmountable" msgid="7082856306456936054">"بطاقة <xliff:g id="NAME_0">^1</xliff:g> هذه تالفة. \n\nلاستخدام بطاقة <xliff:g id="NAME_1">^1</xliff:g> هذه، عليك إعدادها أولاً."</string>
     <string name="storage_dialog_unsupported" msgid="8274023677580782553">"هذا الجهاز غير متوافق مع <xliff:g id="NAME_0">^1</xliff:g> هذه. \n\nلاستخدام <xliff:g id="NAME_1">^1</xliff:g> هذه مع هذا الجهاز، عليك إعدادها أولاً."</string>
     <string name="storage_internal_format_details" msgid="2780806013122012384">"بعد إجراء التنسيق، يمكنك استخدام <xliff:g id="NAME_0">^1</xliff:g> هذه على أجهزة أخرى. \n\nوسيتم محو جميع البيانات الموجودة على <xliff:g id="NAME_1">^1</xliff:g> هذه. يمكنك إجراء النسخ الاحتياطي أولاً. \n\n"<b>"النسخ الاحتياطي للصور والوسائط الأخرى"</b>" \nيمكنك نقل ملفات الوسائط إلى وحدة تخزين بديلة على هذا الجهاز أو نقلها إلى جهاز كمبيوتر باستخدام كابل USB. \n\n"<b>"النسخ الاحتياطي للتطبيقات"</b>" \nستتم إزالة جميع التطبيقات المخزنة على <xliff:g id="NAME_6">^1</xliff:g> هذه وكذلك سيتم محو بياناتها. وللاحتفاظ بهذه التطبيقات، يمكنك نقلها إلى وحدة تخزين بديلة على هذا الجهاز."</string>
-    <string name="storage_internal_unmount_details" msgid="4667435317528624039"><b>"عند إخراج <xliff:g id="NAME_0">^1</xliff:g> هذه، فإن التطبيقات المخزنة عليها ستتوقف عن العمل ولن تكون ملفات الوسائط المخزنة عليها متاحة حتى يتم إعادة إدخالها."</b>" \n\nلقد تمت تهيئة <xliff:g id="NAME_1">^1</xliff:g> للعمل على هذا الجهاز فقط. ولن تعمل على أي أجهزة أخرى."</string>
+    <string name="storage_internal_unmount_details" msgid="4667435317528624039"><b>"عند إخراج <xliff:g id="NAME_0">^1</xliff:g> هذه، فإن التطبيقات المخزنة عليها ستتوقف عن العمل ولن تكون ملفات الوسائط المخزنة عليها متاحة حتى يتم إعادة إدخالها."</b>" \n\nلقد تم إعداد <xliff:g id="NAME_1">^1</xliff:g> للعمل على هذا الجهاز فقط. ولن تعمل على أي أجهزة أخرى."</string>
     <string name="storage_internal_forget_details" msgid="5655856574682184453">"لاستخدام التطبيقات أو الصور أو البيانات التي يحتوي عليها <xliff:g id="NAME">^1</xliff:g> يمكنك إعادة إدخاله. \n\nبدلاً من ذلك، يمكنك اختيار حذف وحدة التخزين هذه إذا لم يكن الجهاز متاحًا. \n\nوإذا اخترت الحذف، فستفقد جميع البيانات التي يحتوي عليها الجهاز للأبد. \n\nويمكنك إعادة تثبيت التطبيقات لاحقًا، إلا أنه سيتم فقد بياناتها المخزنة على هذا الجهاز."</string>
     <string name="storage_internal_forget_confirm_title" msgid="331032276130605241">"هل تريد حذف <xliff:g id="NAME">^1</xliff:g>؟"</string>
     <string name="storage_internal_forget_confirm" msgid="3052483375203727176">"سيتم فقد كل التطبيقات والصور والبيانات المخزنة على <xliff:g id="NAME">^1</xliff:g> هذه للأبد."</string>
@@ -1544,7 +1544,7 @@
     <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_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>
@@ -1604,7 +1604,7 @@
     <string name="battery_level_title" msgid="5207775387973771646">"مستوى البطارية"</string>
     <string name="apn_settings" msgid="8130776653826271664">"أسماء نقاط الوصول"</string>
     <string name="apn_edit" msgid="4350571070853305357">"تعديل نقطة الوصول"</string>
-    <string name="apn_not_set" msgid="5344235604466825691">"لم يتم التعيين"</string>
+    <string name="apn_not_set" msgid="5344235604466825691">"لم يتم الضبط"</string>
     <string name="apn_name" msgid="8431432886706852226">"الاسم"</string>
     <string name="apn_apn" msgid="190519449579357696">"APN"</string>
     <string name="apn_http_proxy" msgid="8816906767987944465">"الخادم الوكيل"</string>
@@ -1725,7 +1725,7 @@
     <string name="location_title" msgid="8664674161765477168">"موقعي"</string>
     <string name="managed_profile_location_switch_title" msgid="8157384427925389680">"موقع الملف الشخصي للعمل"</string>
     <string name="location_app_level_permissions" msgid="1298041503927632960">"إذن التطبيقات"</string>
-    <string name="location_app_permission_summary_location_off" msgid="541372845344796336">"تم إيقاف خدمة الموقع الجغرافي."</string>
+    <string name="location_app_permission_summary_location_off" msgid="541372845344796336">"الموقع الجغرافي غير مفعّل"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="7904821382328758218">
       <item quantity="zero">لدى <xliff:g id="BACKGROUND_LOCATION_APP_COUNT_2">%1$d</xliff:g> من أصل <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> تطبيق إذن وصول غير محدود.</item>
       <item quantity="two">لدى <xliff:g id="BACKGROUND_LOCATION_APP_COUNT_2">%1$d</xliff:g> من أصل <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> تطبيق إذن وصول غير محدود.</item>
@@ -1801,8 +1801,8 @@
     <string name="lockpassword_draw_your_pattern_again_header" msgid="9017394036814402348">"ارسم النقش مرة أخرى"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="4418423132980560119">"اختيار طريقة فتح القفل"</string>
     <string name="lockpassword_password_set_toast" msgid="601928982984489868">"تم ضبط كلمة المرور"</string>
-    <string name="lockpassword_pin_set_toast" msgid="172594825722240059">"تم تعيين رمز PIN"</string>
-    <string name="lockpassword_pattern_set_toast" msgid="6923260369475481406">"تم تعيين النقش"</string>
+    <string name="lockpassword_pin_set_toast" msgid="172594825722240059">"تم ضبط رمز PIN"</string>
+    <string name="lockpassword_pattern_set_toast" msgid="6923260369475481406">"تم ضبط النقش"</string>
     <string name="lockpassword_choose_your_password_header_for_face" msgid="8823110536502072216">"لاستخدام المصادقة بالوجه، اضبط كلمة المرور"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="5563793748503883666">"لاستخدام المصادقة بالوجه، اضبط النمط"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="7238352632535405068">"لاستخدام المصادقة بالوجه، اضبط رقم التعريف الشخصي"</string>
@@ -1913,7 +1913,7 @@
     <string name="app_factory_reset" msgid="8718986000278776272">"إزالة التحديثات"</string>
     <string name="auto_launch_enable_text" msgid="3372898942144027341">"لقد اخترت تشغيل هذا التطبيق بشكل تلقائي لبعض الإجراءات."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2286211654774611037">"لقد اخترت السماح لهذا التطبيق بإنشاء الأدوات والوصول إلى بياناتها."</string>
-    <string name="auto_launch_disable_text" msgid="8560921288036801416">"لم يتم تعيين إعدادات تلقائية."</string>
+    <string name="auto_launch_disable_text" msgid="8560921288036801416">"لم يتم ضبط إعدادات تلقائية."</string>
     <string name="clear_activities" msgid="2068014972549235347">"محو الإعدادات التلقائية"</string>
     <string name="screen_compatibility_text" msgid="1768064020294301496">"ربما لم يتم تصميم هذا التطبيق ليلائم شاشتك، يمكنك التحكم في كيفية ضبطه ليلائم شاشتك هنا."</string>
     <string name="ask_compatibility" msgid="6687958195768084807">"السؤال عند الإطلاق"</string>
@@ -2144,7 +2144,7 @@
     <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_navbar_configuration_warning" msgid="6477234309484795550">"تم تعيين زر إمكانية الوصول لخدمة <xliff:g id="SERVICE">%1$s</xliff:g>. لاستخدام التكبير، المس زر إمكانية الوصول مع الاستمرار ثم اختر التكبير."</string>
+    <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="6477234309484795550">"تم ضبط زر إمكانية الوصول لخدمة <xliff:g id="SERVICE">%1$s</xliff:g>. لاستخدام التكبير، المس زر إمكانية الوصول مع الاستمرار ثم اختر التكبير."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="3842279082831426816">"مفتاح الاختصار لمستوى الصوت"</string>
     <string name="accessibility_shortcut_service_title" msgid="3516052294376744060">"خدمة الاختصار"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="1279441617927949980">"السماح من شاشة القفل"</string>
@@ -2335,7 +2335,7 @@
     <string name="print_restart" msgid="4090462480288441779">"إعادة تشغيل"</string>
     <string name="print_cancel" msgid="4567831028966698753">"إلغاء"</string>
     <string name="print_job_summary" msgid="438156926959424058">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="print_configuring_state_title_template" msgid="5052801061241050737">"جارٍ تهيئة <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
+    <string name="print_configuring_state_title_template" msgid="5052801061241050737">"جارٍ إعداد <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="print_printing_state_title_template" msgid="8796814912920963803">"جارٍ طباعة <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="print_cancelling_state_title_template" msgid="4627355699517405600">"جارٍ إلغاء <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="print_failed_state_title_template" msgid="6575080578316671101">"خطأ في الطابعة في تنفيذ <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
@@ -2508,7 +2508,7 @@
     <string name="power_flashlight" msgid="6939780588882301575">"الفلاش"</string>
     <string name="power_camera" msgid="8670998854830327437">"الكاميرا"</string>
     <string name="power_wifi" msgid="5017436332655362332">"Wi‑Fi"</string>
-    <string name="power_bluetooth" msgid="7097844828420335867">"بلوتوث"</string>
+    <string name="power_bluetooth" msgid="7097844828420335867">"البلوتوث"</string>
     <string name="power_cell" msgid="8493476823107385547">"وضع الاستعداد لشبكة الجوّال"</string>
     <string name="power_phone" msgid="4644276202135343197">"المكالمات الصوتية"</string>
     <string name="power_idle" product="tablet" msgid="5220710816048070792">"الجهاز اللوحي خامل"</string>
@@ -2546,7 +2546,7 @@
     <string name="battery_desc_standby" product="tablet" msgid="2941777996429933419">"البطارية المستخدمة عندما يكون الجهاز اللوحي خاملاً"</string>
     <string name="battery_desc_standby" product="default" msgid="8889482616564520287">"يتم استخدام البطارية عندما يكون الهاتف في وضع الخمول"</string>
     <string name="battery_desc_radio" msgid="5119078473833865414">"البطارية مستخدمة بواسطة الراديو الخلوي"</string>
-    <string name="battery_sugg_radio" msgid="3616364509738133415">"تبديل إلى وضع الطائرة للحفاظ على الطاقة في المناطق التي لا توجد بها تغطية للشبكة"</string>
+    <string name="battery_sugg_radio" msgid="3616364509738133415">"تبديل إلى وضع الطيران للحفاظ على الطاقة في المناطق التي لا توجد بها تغطية للشبكة"</string>
     <string name="battery_desc_flashlight" msgid="4574819522143720917">"طاقة البطارية المستخدمة بواسطة ضوء الفلاش"</string>
     <string name="battery_desc_camera" msgid="517966830222999462">"طاقة البطارية التي استهلكتها الكاميرا"</string>
     <string name="battery_desc_display" msgid="6701005808894183097">"طاقة البطارية المستخدمة بواسطة العرض والإضاءة الخلفية"</string>
@@ -3078,7 +3078,7 @@
     <string name="nfc_payment_how_it_works" msgid="7607901964687787177">"آلية العمل"</string>
     <string name="nfc_payment_no_apps" msgid="8844440783395420860">"استخدِم هاتفك للدفع في المتاجر"</string>
     <string name="nfc_payment_default" msgid="7869273092463612271">"التطبيق التلقائي للدفع"</string>
-    <string name="nfc_payment_default_not_set" msgid="955804193510335338">"لم يتم التعيين"</string>
+    <string name="nfc_payment_default_not_set" msgid="955804193510335338">"لم يتم الضبط"</string>
     <string name="nfc_payment_app_and_desc" msgid="102312684211458190">"<xliff:g id="APP">%1$s</xliff:g> - <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="nfc_payment_use_default" msgid="3098724195746409476">"استخدام التلقائي"</string>
     <string name="nfc_payment_favor_default" msgid="7555356982142464260">"دومًا"</string>
@@ -3149,7 +3149,7 @@
     <string name="sim_settings_title" msgid="8818243954752261922">"بطاقات SIM"</string>
     <string name="sim_settings_summary" msgid="6516330865408217800">"<xliff:g id="SIM_NAME">%1$s</xliff:g> - <xliff:g id="SIM_NUMBER">%2$s</xliff:g>"</string>
     <string name="sim_cards_changed_message" msgid="1012486903583092731">"تم تغيير بطاقات SIM"</string>
-    <string name="sim_cards_changed_message_summary" msgid="5753692480107865077">"انقر لتعيين الأنشطة."</string>
+    <string name="sim_cards_changed_message_summary" msgid="5753692480107865077">"انقر لضبط الأنشطة."</string>
     <string name="sim_cellular_data_unavailable" msgid="1832472508352891641">"بيانات الجوّال غير متاحة"</string>
     <string name="sim_cellular_data_unavailable_summary" msgid="3093797406601964131">"انقر لاختيار شريحة SIM للبيانات."</string>
     <string name="sim_calls_always_use" msgid="5322696995795851734">"استخدام هذا للمكالمات دائمًا"</string>
@@ -3203,7 +3203,7 @@
     <string name="connected_devices_dashboard_summary" msgid="1072664369515033179">"بلوتوث، وضع القيادة، NFC"</string>
     <string name="connected_devices_dashboard_no_nfc_summary" msgid="2610085597733526722">"بلوتوث، وضع القيادة"</string>
     <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="3524409078596318803">"بلوتوث وNFC"</string>
-    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="7881286613528299400">"بلوتوث"</string>
+    <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="7881286613528299400">"البلوتوث"</string>
     <string name="app_and_notification_dashboard_title" msgid="8448096608058843730">"التطبيقات والإشعارات"</string>
     <string name="app_and_notification_dashboard_summary" msgid="4165181440955038145">"المساعد، التطبيقات المستخدمة مؤخرًا، التطبيقات التلقائية"</string>
     <string name="notification_settings_work_profile" msgid="7190550347842400029">"لا تتوفر إمكانية الدخول إلى الإشعارات للتطبيقات في الملف الشخصي للعمل."</string>
@@ -3295,8 +3295,8 @@
     <string name="default_sound" msgid="6675629744816442953">"الصوت التلقائي"</string>
     <string name="sound_settings_summary" msgid="8467549670633195109">"مستوى صوت الرنين على <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="5187301919242823508">"مستوى الصوت والاهتزاز ووضع\"عدم الإزعاج\""</string>
-    <string name="sound_settings_summary_vibrate" msgid="2194491116884798590">"تم تعيين الرنين على اهتزاز"</string>
-    <string name="sound_settings_summary_silent" msgid="899823817462768876">"تم تعيين الرنين على صامت"</string>
+    <string name="sound_settings_summary_vibrate" msgid="2194491116884798590">"تم ضبط الرنين على اهتزاز"</string>
+    <string name="sound_settings_summary_silent" msgid="899823817462768876">"تم ضبط الرنين على صامت"</string>
     <string name="sound_settings_example_summary" msgid="2091822107298841827">"مستوى صوت الرنين على ۸۰٪"</string>
     <string name="media_volume_option_title" msgid="3553411883305505682">"مستوى صوت الوسائط"</string>
     <string name="remote_media_volume_option_title" msgid="6355710054191873836">"مستوى صوت الإرسال"</string>
@@ -3867,7 +3867,7 @@
     <string name="filter_notif_blocked_channels" msgid="6110799550327612670">"الفئات: متوفقة"</string>
     <string name="filter_notif_dnd_channels" msgid="3251570137256371092">"الفئات: تتجاوز خيار \"عدم الإزعاج\""</string>
     <string name="advanced_apps" msgid="6643869089344883537">"إعدادات متقدّمة"</string>
-    <string name="configure_apps" msgid="4066683118857400943">"تهيئة التطبيقات"</string>
+    <string name="configure_apps" msgid="4066683118857400943">"إعداد التطبيقات"</string>
     <string name="unknown_app" msgid="2312052973570376877">"تطبيق غير معروف"</string>
     <string name="app_permissions" msgid="3215958256821756086">"مدير الأذونات"</string>
     <string name="app_permissions_summary" msgid="8785798165776061594">"التطبيقات التي تستخدم <xliff:g id="APPS">%1$s</xliff:g>"</string>
@@ -3973,7 +3973,7 @@
     <string name="usb_use_MIDI" msgid="4710632870781041401">"MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="1770966187150010947">"يمكنك استخدام هذا الجهاز باعتباره MIDI"</string>
     <string name="usb_use" msgid="8940500223316278632">"استخدام USB في"</string>
-    <string name="usb_default_label" msgid="7471316635263936101">"تهيئة USB التلقائية"</string>
+    <string name="usb_default_label" msgid="7471316635263936101">"إعداد USB التلقائي"</string>
     <string name="usb_default_info" msgid="953775292571786528">"عند الاتصال بجهاز آخر وإلغاء قفل هاتفك، سيتم تطبيق هذه الإعدادات. لذلك يجب الاتصال بالأجهزة الموثوق بها فقط."</string>
     <string name="usb_pref" msgid="6194821550693495068">"USB"</string>
     <string name="usb_preference" msgid="7092987095048592826">"إعدادات USB"</string>
@@ -4132,7 +4132,7 @@
     <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>
@@ -4217,7 +4217,7 @@
     <string name="set_data_limit" msgid="5043770023229990674">"ضبط الحد الأقصى للبيانات"</string>
     <string name="data_limit" msgid="5793521160051596228">"الحد الأقصى للبيانات"</string>
     <string name="data_usage_template" msgid="6848274347956096882">"<xliff:g id="ID_1">%1$s</xliff:g> مستخدمة خلال <xliff:g id="ID_2">%2$s</xliff:g>"</string>
-    <string name="configure" msgid="8232696842838580549">"تهيئة"</string>
+    <string name="configure" msgid="8232696842838580549">"إعداد"</string>
     <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>
@@ -4300,7 +4300,7 @@
     <string name="notification_log_details_parcel" msgid="4024970850647594029">"حجم طرد"</string>
     <string name="notification_log_details_ashmem" msgid="4272241723105041393">"ashmem"</string>
     <string name="notification_log_details_alerted" msgid="1891749888625061319">"تمّ تفعيل التنبيه للإشعار."</string>
-    <string name="notification_log_details_sound" msgid="4028782443557466322">"صوت"</string>
+    <string name="notification_log_details_sound" msgid="4028782443557466322">"الصوت"</string>
     <string name="notification_log_details_vibrate" msgid="8372400602058888072">"اهتزاز"</string>
     <string name="notification_log_details_vibrate_pattern" msgid="7015554755444260922">"النقش"</string>
     <string name="notification_log_details_default" msgid="455451833359888182">"تلقائي"</string>
@@ -4436,7 +4436,7 @@
     <string name="domain_url_section_title" msgid="206403507921518321">"التطبيقات المثبَّتة"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="2630083316417707308">"تتم إدارة مساحة التخزين لجهازك الآن عن طريق مدير مساحة التخزين"</string>
     <string name="account_for_section_header" msgid="5975241715840642563">"حسابات <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
-    <string name="configure_section_header" msgid="6988981883075615136">"تهيئة"</string>
+    <string name="configure_section_header" msgid="6988981883075615136">"إعداد"</string>
     <string name="auto_sync_account_title" msgid="2394463123733529506">"مزامنة البيانات تلقائيًا"</string>
     <string name="auto_sync_personal_account_title" msgid="6844465157916100655">"مزامنة البيانات الشخصية تلقائيًا"</string>
     <string name="auto_sync_work_account_title" msgid="2403222633447522376">"مزامنة بيانات العمل تلقائيًا"</string>
@@ -4482,11 +4482,11 @@
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> تطبيق</item>
     </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_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_global_http_proxy" msgid="3862135895716080830">"تم تعيين الخادم الوكيل HTTP العام"</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>
     <string name="enterprise_privacy_ca_certs_work" msgid="836419648894546893">"بيانات اعتماد موثوقة في ملفك الشخصي للعمل"</string>
@@ -4594,7 +4594,7 @@
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"عرض مربع حوار الأعطال دائمًا"</string>
     <string name="show_first_crash_dialog_summary" msgid="8197987550025401754">"عرض مربع الحوار في كل مرة يتعطل فيها تطبيق"</string>
     <string name="angle_enabled_app" msgid="4359266182151708733">"اختيار التطبيق الذي يستخدم ANGLE"</string>
-    <string name="angle_enabled_app_not_set" msgid="7428910515748621910">"لم يتم تعيين تطبيق لاستخدام ANGLE"</string>
+    <string name="angle_enabled_app_not_set" msgid="7428910515748621910">"لم يتم ضبط تطبيق لاستخدام ANGLE"</string>
     <string name="angle_enabled_app_set" msgid="7313088703610569320">"التطبيق الذي يستخدم ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <string name="game_driver_dashboard_title" msgid="219443350404091201">"إعدادات Game Driver المفضّلة"</string>
     <string name="game_driver_dashboard_summary" msgid="1500674075618790528">"تعديل إعدادات Game Driver"</string>
@@ -4719,14 +4719,14 @@
     <string name="mobile_network_list_add_more" msgid="65420172175416318">"إضافة المزيد"</string>
     <string name="mobile_network_active_sim" msgid="7660119090716084589">"مفعّلة / SIM"</string>
     <string name="mobile_network_inactive_sim" msgid="8296195866147486039">"غير مفعّلة / SIM"</string>
-    <string name="mobile_network_active_esim" msgid="2919290915755581140">"مفعّلة / شريحة SIM التي تم تنزيلها"</string>
-    <string name="mobile_network_inactive_esim" msgid="6525747163540293028">"غير مفعّلة / شريحة SIM التي تم تنزيلها"</string>
+    <string name="mobile_network_active_esim" msgid="2919290915755581140">"مفعّلة / شريحة SIM تم تنزيلها"</string>
+    <string name="mobile_network_inactive_esim" msgid="6525747163540293028">"غير مفعّلة / شريحة SIM تم تنزيلها"</string>
     <string name="mobile_network_sim_name" msgid="8228870017368926761">"اسم شريحة SIM"</string>
     <string name="mobile_network_sim_name_rename" msgid="4810736493612513152">"إعادة تسمية"</string>
     <string name="mobile_network_use_sim_on" msgid="1944823242539751387">"استخدام شريحة SIM"</string>
     <string name="mobile_network_use_sim_off" msgid="2077820358051946635">"غير مفعّل"</string>
     <string name="mobile_network_esim_swap_confirm_title" msgid="6077154427380613615">"هل تريد التبديل إلى <xliff:g id="CARRIER">%1$s</xliff:g>؟"</string>
-    <string name="mobile_network_esim_swap_confirm_body" msgid="1192274915146275063">"لا يمكن تفعيل أكثر من شريحة SIM واحدة تم تنزيلها في آن واحد.\n\nلن يؤدي اختيار <xliff:g id="CARRIER1">%1$s</xliff:g> كبديل إلى إلغاء خدمة <xliff:g id="CARRIER2">%2$s</xliff:g>."</string>
+    <string name="mobile_network_esim_swap_confirm_body" msgid="1192274915146275063">"لا يمكن تفعيل أكثر من شريحة SIM واحدة تم تنزيلها.\n\nلن يؤدي اختيار <xliff:g id="CARRIER1">%1$s</xliff:g> كبديل إلى إلغاء خدمة <xliff:g id="CARRIER2">%2$s</xliff:g>."</string>
     <string name="mobile_network_esim_swap_confirm_ok" msgid="4253442720111626242">"التبديل إلى <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="mobile_network_erase_sim" msgid="7813251003613841044">"محو بيانات شريحة SIM"</string>
     <string name="mobile_network_erase_sim_dialog_title" msgid="3796268164204467499">"هل تريد محو بيانات شريحة SIM التي تم تنزيلها هذه؟"</string>
@@ -4781,7 +4781,7 @@
     <string name="settings_panel_title" msgid="8181989386118232534">"لوحة الإعدادات"</string>
     <string name="internet_connectivity_panel_title" msgid="341712994620215750">"اتصال الإنترنت"</string>
     <string name="volume_connectivity_panel_title" msgid="4998755371496690971">"مستوى الصوت"</string>
-    <string name="mobile_data_ap_mode_disabled" msgid="2452716524753472885">"غير متاح أثناء وضع الطائرة"</string>
+    <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">"إلغاء ميزة فرض تعتيم الشاشة"</string>
diff --git a/tests/CarDeveloperOptions/res/values-as/strings.xml b/tests/CarDeveloperOptions/res/values-as/strings.xml
index 1abc711..55b7121 100644
--- a/tests/CarDeveloperOptions/res/values-as/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-as/strings.xml
@@ -1168,7 +1168,7 @@
     <string name="accessibility_category_personal" msgid="1423427301759058762">"ব্যক্তিগত প্ৰ’ফাইলৰ একাউণ্টসমূহ"</string>
     <string name="accessibility_work_account_title" msgid="3195468574776888011">"কৰ্মস্থানৰ একাউণ্ট - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_personal_account_title" msgid="7251761883688839354">"ব্যক্তিগত একাউণ্ট - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
-    <string name="search_settings" msgid="5809250790214921377">"অনুসন্ধান"</string>
+    <string name="search_settings" msgid="5809250790214921377">"Search"</string>
     <string name="display_settings" msgid="1045535829232307190">"ডিছপ্লে’"</string>
     <string name="accelerometer_title" msgid="2427487734964971453">"স্বয়ং-ঘূৰ্ণন স্ক্ৰীণ"</string>
     <string name="color_mode_title" msgid="8164858320869449142">"ৰংবোৰ"</string>
@@ -1450,7 +1450,7 @@
     <string name="storage_internal_forget_confirm_title" msgid="331032276130605241">"<xliff:g id="NAME">^1</xliff:g>ক পাহৰিব বিচাৰেনে?"</string>
     <string name="storage_internal_forget_confirm" msgid="3052483375203727176">"এই <xliff:g id="NAME">^1</xliff:g>ত সঞ্চিত সকলো এপ্, ফট\' আৰু ডেটা চিৰদিনৰ কাৰণে হেৰুৱাব।"</string>
     <string name="storage_detail_apps" msgid="8154648512504196820">"এপ্"</string>
-    <string name="storage_detail_images" msgid="6996202225684468964">"ফট\'"</string>
+    <string name="storage_detail_images" msgid="6996202225684468964">"Images"</string>
     <string name="storage_detail_videos" msgid="6030983354721080849">"ভিডিঅ\'"</string>
     <string name="storage_detail_audio" msgid="6011098436589663944">"অডিঅ’"</string>
     <string name="storage_detail_cached" msgid="5761648455067920683">"কেশ্ব কৰা ডেটা"</string>
@@ -1890,7 +1890,7 @@
     <string name="app_disable_dlg_positive" msgid="5508828271100168073">"এপ্ অক্ষম কৰক"</string>
     <string name="app_disable_dlg_text" msgid="9221864774943530281">"আপুনি যদি এই এপ্‌টো অক্ষম কৰে, তেন্তে Android আৰু অন্য এপ্‌সমূহে বিচৰাৰ দৰে কাম নকৰিব পাৰে। মনত ৰাখিব, আপুনি এই এপ্‌টো মচিব নোৱাৰে কাৰণ এইটো আপোনাৰ ডিভাইচত আগৰেপৰা ইনষ্টল কৰি থোৱা আছে। অক্ষম কৰি আপুনি এই এপ্‌টো অফ কৰে আৰু ইয়াক আপোনাৰ ডিভাইচৰপৰা লুকুৱায়।"</string>
     <string name="app_disable_notifications_dlg_title" msgid="699530661413553928">"জাননীসমুহ অফ কৰিবনে?"</string>
-    <string name="app_install_details_group_title" msgid="2909597319422976921">"ষ্ট’ৰ"</string>
+    <string name="app_install_details_group_title" msgid="2909597319422976921">"Store"</string>
     <string name="app_install_details_title" msgid="6954953384372934881">"এপ্‌ৰ সবিশেষ"</string>
     <string name="app_install_details_summary" msgid="6612222941121363940">"<xliff:g id="APP_STORE">%1$s</xliff:g>ৰ পৰা এপ্ ইনষ্টল কৰা হৈছে"</string>
     <string name="instant_app_details_summary" msgid="6384264315914966114">"<xliff:g id="APP_STORE">%1$s</xliff:g>ত আৰু অধিক তথ্য"</string>
@@ -2211,7 +2211,7 @@
     <string name="print_feature_state_off" msgid="208580346723223688">"অফ হৈ আছে"</string>
     <string name="print_menu_item_add_service" msgid="6803000110578493782">"সেৱা যোগ কৰক"</string>
     <string name="print_menu_item_add_printer" msgid="8529196211179574921">"প্ৰিণ্টাৰ যোগ কৰক"</string>
-    <string name="print_menu_item_search" msgid="1165316329772287360">"সন্ধান কৰক"</string>
+    <string name="print_menu_item_search" msgid="1165316329772287360">"Search"</string>
     <string name="print_searching_for_printers" msgid="6538687129687642542">"সংযোগ কৰিবলৈ প্ৰিণ্টাৰ বিচাৰি থকা হৈছে"</string>
     <string name="print_service_disabled" msgid="6376344992705893436">"সেৱা নিষ্ক্ৰিয়হৈ আছে"</string>
     <string name="print_print_jobs" msgid="7357841034181762157">"প্ৰিণ্টিঙৰ কামবোৰ"</string>
@@ -2446,7 +2446,7 @@
     <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>
-    <string name="battery_saver" msgid="3989710213758938398">"বেটাৰি সঞ্চয়কাৰী"</string>
+    <string name="battery_saver" msgid="3989710213758938398">"বেটাৰী সঞ্চয়কাৰী"</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>
@@ -3394,7 +3394,7 @@
     <string name="zen_access_detail_switch" msgid="8706332327904974500">"অসুবিধা নিদিব ম’ডক অনুমতি দিয়ক"</string>
     <string name="zen_access_empty_text" msgid="7667538993781607731">"ইনষ্টল কৰি থোৱা কোনো এপে অসুবিধা নিদিবত প্ৰৱেশৰ অনুমতি বিচৰা নাই"</string>
     <string name="loading_notification_apps" msgid="1978345231934072091">"এপ্‌সমূহ ল’ড কৰি থকা হৈছে..."</string>
-    <string name="app_notifications_off_desc" msgid="3904090905748895146">"আপোনাৰ অনুৰোধত, Android-এ এই ডিভাইচটোত এই এপৰ জাননীসমূহ দেখাবলৈ বাধা দি আছে"</string>
+    <string name="app_notifications_off_desc" msgid="3904090905748895146">"আপোনাৰ অনুৰোধমৰ্মে, Androidএ এই এপৰ জাননীসমূহ এই ডিভাইচটোত দৃশ্যমান হোৱাত বাধা দি আছে"</string>
     <string name="channel_notifications_off_desc" msgid="8005444443218306611">"আপোনাৰ অনুৰোধমৰ্মে, Androidএ জাননীসমূহৰ এই শ্ৰেণীটোক এই ডিভাইচটোত দৃশ্যমান হ\'বলৈ দিয়া নাই"</string>
     <string name="channel_group_notifications_off_desc" msgid="7154205544298672850">"আপোনাৰ অনুৰোধমৰ্মে, Androidএ জাননীসমূহৰ এই গোটটোক এই ডিভাইচটোত দৃশ্যমান হ\'বলৈ দিয়া নাই"</string>
     <string name="notification_channels" msgid="956764228116145956">"শ্ৰেণী"</string>
@@ -3726,7 +3726,7 @@
     <string name="sharing_remote_bugreport_dialog_message" msgid="3814787466701526359">"আপোনাৰ আইটি প্ৰশাসকৰ সৈতে এই বাগ প্ৰতিবেদনটো শ্বেয়াৰ কৰা হৈছে। অধিক তথ্যৰ বাবে তেওঁলোকৰ সৈতে যোগাযোগ কৰক।"</string>
     <string name="share_remote_bugreport_action" msgid="8600797271670537888">"শ্বেয়াৰ কৰক"</string>
     <string name="decline_remote_bugreport_action" msgid="706319275774199033">"প্ৰত্যাখ্যান কৰক"</string>
-    <string name="usb_use_charging_only" msgid="2344625733377110164">"কোনো ডেটা স্থানান্তৰণ কৰিব নোৱাৰি"</string>
+    <string name="usb_use_charging_only" msgid="2344625733377110164">"ডেটা স্থানান্তৰ কৰিব নোৱাৰি"</string>
     <string name="usb_use_charging_only_desc" msgid="3283518562582478950">"ডিভাইচটো কেৱল চাৰ্জ কৰক"</string>
     <string name="usb_use_power_only" msgid="6595783381323810697">"চ্চাৰ্জাৰ ডিভাইচত সংযোগ কৰা হ’ল"</string>
     <string name="usb_use_file_transfers" msgid="6153021302176151884">"ফাইল স্থানান্তৰণৰ বাবে"</string>
@@ -3792,7 +3792,7 @@
     <string name="zen_access_revoke_warning_dialog_title" msgid="6850994585577513299">"<xliff:g id="APP">%1$s</xliff:g>ৰ অসুবিধা নিদিবলৈ থকা প্ৰৱেশৰ অনুমতি প্ৰত্যাহাৰ কৰিবনে?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="3487422193181311403">"এই এপে সৃষ্টি কৰা সকলো অসুবিধা নিদিব নিয়ম আঁতৰোৱা হ\'ব।"</string>
     <string name="ignore_optimizations_on" msgid="4373971641328943551">"অপ্টিমাইজ নকৰিব"</string>
-    <string name="ignore_optimizations_off" msgid="4372289432580282870">"অপ্টিমাইজ"</string>
+    <string name="ignore_optimizations_off" msgid="4372289432580282870">"Optimize"</string>
     <string name="ignore_optimizations_on_desc" msgid="2904484569799521559">"আপোনাৰ বেটাৰি খৰকৈ শেষ কৰিব পাৰে। এপটোক নেপথ্যত বেটাৰি ব্যৱহাৰ কৰাত আৰু বাধা দিয়া নহ’ব।"</string>
     <string name="ignore_optimizations_off_desc" msgid="5598702251817814289">"বেটাৰিৰ অৱস্থা উন্নত কৰাৰ বাবে পৰামৰ্শ দিয়া হৈছে"</string>
     <string name="ignore_optimizations_title" msgid="7924345545276166305">"<xliff:g id="APP">%s</xliff:g>-ক বেটাৰি অপ্টিমাইজেশ্বন অবজ্ঞা কৰিবলৈ অনুমতি দিবনে?"</string>
diff --git a/tests/CarDeveloperOptions/res/values-az/strings.xml b/tests/CarDeveloperOptions/res/values-az/strings.xml
index 35b1f01..1c02a12 100644
--- a/tests/CarDeveloperOptions/res/values-az/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-az/strings.xml
@@ -1399,7 +1399,7 @@
     <string name="dlg_confirm_unmount_text" product="default" msgid="4099391737780732622">"SD kartınızı çıxarsanız, istifadə etdiyiniz bəzi tətbiqlər SD kartı geri qaytarana kimi işləməyəcəklər."</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 yaddaşı çıxarmaq mümkün olmadı. Daha sonra yenidən cəhd edin."</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="4710773826053117136">"USB-ni çıxarmaq olmur. Sonra cəhd edin."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="8243603872321575219">"SD kart çıxarıla bilmədi. Sonra cəhd edin.."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="2460118115494815052">"USB yaddaş çıxarılacaq."</string>
     <string name="unmount_inform_text" product="default" msgid="6467461731634304997">"SD cart çıxarılacaq."</string>
@@ -2707,7 +2707,7 @@
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="4935430284683238901">"İnternet üzərindən hesabınıza etdiyiniz istənilən dəyişiklik planşetdə avtomatik qeyd ediləcək.\n\nBəzi hesablar planşet vasitəsilə internetdə etdiyiniz dəyişiklikləri avtomatik kopyalaya bilər. Google Hesabları da belə edir."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="5004823486046340090">"İnternet üzərindən hesabınıza etdiyiniz istənilən dəyişiklik telefonda avtomatik qeyd ediləcək.\n\nBəzi hesablar telefon vasitəsilə internetdə etdiyiniz dəyişiklikləri avtomatik kopyalaya bilər. Google Hesabları da belə edir."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="7105334544291643305">"Avto-sinxronizasiya deaktiv edilsin?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4057984234450947964">"Bu, data və batareya istifadəsinə qənaət edəcək, lakin Siz sonuncu məlumatları toplamaq üçün hər hesabı əl ilə sinxronlaşdırmalı olacaqsınız. Və güncəlləşmə vaxtı gələndə Sizə bildiriş gəlməyəcək."</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4057984234450947964">"Trafik və enerji sərfiyyatı azalacaq, lakin yeni datanın əldə edilməsi üçün hesab əl ilə sinxronlaşdırılmalı olacaq. Yeni güncəllənmə olanda sizə bildiriş gəlməyəcək."</string>
     <string name="data_usage_cycle_editor_title" msgid="4967309390043599889">"Tarixin dövri sıfırlanması istifadəsi"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="6043098041946166597">"Hər ayın tarixi:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="9155752056537811646">"Ayarlayın"</string>
diff --git a/tests/CarDeveloperOptions/res/values-b+sr+Latn/arrays.xml b/tests/CarDeveloperOptions/res/values-b+sr+Latn/arrays.xml
index 5db0763..56a4885 100644
--- a/tests/CarDeveloperOptions/res/values-b+sr+Latn/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-b+sr+Latn/arrays.xml
@@ -230,7 +230,7 @@
     <item msgid="2260380357119423209">"menjanje evidencije poziva"</item>
     <item msgid="6550710385014530934">"čitanje kalendara"</item>
     <item msgid="3575906174264853951">"menjanje kalendara"</item>
-    <item msgid="4319843242568057174">"Wi-Fi skeniranje"</item>
+    <item msgid="4319843242568057174">"WiFi skeniranje"</item>
     <item msgid="2981791890467303819">"obaveštenje"</item>
     <item msgid="6617825156152476692">"skeniranje telefona"</item>
     <item msgid="8865260890611559753">"pozivanje telefona"</item>
diff --git a/tests/CarDeveloperOptions/res/values-b+sr+Latn/strings.xml b/tests/CarDeveloperOptions/res/values-b+sr+Latn/strings.xml
index 9e025f3..efe4368 100644
--- a/tests/CarDeveloperOptions/res/values-b+sr+Latn/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-b+sr+Latn/strings.xml
@@ -36,7 +36,7 @@
     <string name="radio_info_data_connection_disable" msgid="2430609627397999371">"Onemogući vezu za prenos podataka"</string>
     <string name="volte_provisioned_switch_string" msgid="6326756678226686704">"Dodeljeno za VoLTE"</string>
     <string name="vt_provisioned_switch_string" msgid="7458479879009293613">"Video pozivanje je dodeljeno"</string>
-    <string name="wfc_provisioned_switch_string" msgid="5446697646596639516">"Pozivanje preko Wifi veze je dodeljeno"</string>
+    <string name="wfc_provisioned_switch_string" msgid="5446697646596639516">"Pozivanje preko WiFi veze je dodeljeno"</string>
     <string name="eab_provisioned_switch_string" msgid="3921103790584572430">"EAB/Dodeljeno prisustvo"</string>
     <string name="cbrs_data_switch_string" msgid="9120919504831536183">"Cbrs podaci"</string>
     <string name="dsds_switch_string" msgid="2606482598327613264">"Omogući DSDS"</string>
@@ -54,7 +54,7 @@
     <string name="radio_info_ims_reg_status_not_registered" msgid="1286050699734226077">"Nije registrovano"</string>
     <string name="radio_info_ims_feature_status_available" msgid="2040629393134756058">"Dostupno"</string>
     <string name="radio_info_ims_feature_status_unavailable" msgid="3348223769202693596">"Nedostupno"</string>
-    <string name="radio_info_ims_reg_status" msgid="4771711884059371514">"Registracija usluge za razmenu trenutnih poruka: <xliff:g id="STATUS">%1$s</xliff:g>\nGlas preko LTE-a: <xliff:g id="AVAILABILITY_0">%2$s</xliff:g>\nGlas preko WiFi-ja: <xliff:g id="AVAILABILITY_1">%3$s</xliff:g>\nVideo poziv: <xliff:g id="AVAILABILITY_2">%4$s</xliff:g>\nUT interfejs: <xliff:g id="AVAILABILITY_3">%5$s</xliff:g>"</string>
+    <string name="radio_info_ims_reg_status" msgid="4771711884059371514">"Registracija usluge za razmenu trenutnih poruka: <xliff:g id="STATUS">%1$s</xliff:g>\nGlas preko LTE-a: <xliff:g id="AVAILABILITY_0">%2$s</xliff:g>\nGlas preko WiFi-a: <xliff:g id="AVAILABILITY_1">%3$s</xliff:g>\nVideo poziv: <xliff:g id="AVAILABILITY_2">%4$s</xliff:g>\nUT interfejs: <xliff:g id="AVAILABILITY_3">%5$s</xliff:g>"</string>
     <string name="radioInfo_service_in" msgid="1297020186765943857">"Radi"</string>
     <string name="radioInfo_service_out" msgid="8460363463722476510">"Ne radi"</string>
     <string name="radioInfo_service_emergency" msgid="7674989004735662599">"Samo hitni pozivi"</string>
@@ -304,7 +304,7 @@
     <string name="settings_shortcut" msgid="4503714880251502167">"Prečica podešavanja"</string>
     <string name="airplane_mode" msgid="4508870277398231073">"Režim rada u avionu"</string>
     <string name="wireless_networks_settings_title" msgid="4298430520189173949">"Bežična veza i mreže"</string>
-    <string name="radio_controls_summary" msgid="4596981962167684814">"Upravljanje Wi-Fi mrežom, Bluetooth-om, režimom rada u avionu, mobilnim mrežama i VPN-om"</string>
+    <string name="radio_controls_summary" msgid="4596981962167684814">"Upravljanje WiFi mrežom, Bluetooth-om, režimom rada u avionu, mobilnim mrežama i VPN-om"</string>
     <string name="cellular_data_title" msgid="7909624119432695022">"Mobilni podaci"</string>
     <string name="calls_title" msgid="875693497825736550">"Dozvoli pozive"</string>
     <string name="sms_messages_title" msgid="934188835214592753">"SMS poruke"</string>
@@ -833,8 +833,8 @@
     <string name="wifi_tap_to_sign_in" msgid="1075925570550560453">"Dodirnite ovde da biste se prijavili na mrežu"</string>
     <string name="tx_link_speed" msgid="4557508597788146162">"<xliff:g id="TRANSMIT_LINK_SPEED">%1$d</xliff:g> Mb/s"</string>
     <string name="rx_link_speed" msgid="3735337600274627581">"<xliff:g id="RECEIVE_LINK_SPEED">%1$d</xliff:g> Mb/s"</string>
-    <string name="wifi_ask_enable" msgid="925862998663619616">"<xliff:g id="REQUESTER">%s</xliff:g> želi da uključi Wi-Fi"</string>
-    <string name="wifi_ask_disable" msgid="2146839060110412974">"<xliff:g id="REQUESTER">%s</xliff:g> želi da isključi Wi-Fi"</string>
+    <string name="wifi_ask_enable" msgid="925862998663619616">"<xliff:g id="REQUESTER">%s</xliff:g> želi da uključi WiFi"</string>
+    <string name="wifi_ask_disable" msgid="2146839060110412974">"<xliff:g id="REQUESTER">%s</xliff:g> želi da isključi WiFi"</string>
     <string name="art_verifier_for_debuggable_title" msgid="5223835619409464642">"Potvrdi binarni kôd aplikacija iz kojih mogu da se otklone greške"</string>
     <string name="art_verifier_for_debuggable_summary" msgid="2204242476996701111">"Dozvoli da ART potvrdi binarni kôd aplikacija iz kojih mogu da se otklone greške"</string>
     <string name="nfc_quick_toggle_title" msgid="4990697912813795002">"NFC"</string>
@@ -851,15 +851,15 @@
     <string name="android_beam_label" msgid="5340299879556025708">"Android Beam"</string>
     <string name="android_beam_explained" msgid="4501176353247859329">"Kada je ova funkcija uključena, možete da prebacujete sadržaj aplikacija na drugi uređaj na kome je omogućen NFC tako što ćete približiti uređaje jedan drugome. Na primer, možete da prebacujete veb-stranice, YouTube video snimke, kontakte i još toga.\n\nSamo prislonite uređaje jedan na drugi (obično sa zadnje strane), a zatim dodirnite ekran. Aplikacija određuje šta će biti prebačeno."</string>
     <string name="wifi_quick_toggle_title" msgid="7935778388625246184">"Wi‑Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="2879870570547594266">"Uključivanje Wi-Fi-ja"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2879870570547594266">"Uključivanje WiFi-a"</string>
     <string name="wifi_settings" msgid="7486492317310514109">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="3917916944694253946">"Koristi Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="9094716747565527901">"Wi-Fi podešavanja"</string>
+    <string name="wifi_settings_master_switch_title" msgid="3917916944694253946">"Koristi WiFi"</string>
+    <string name="wifi_settings_category" msgid="9094716747565527901">"WiFi podešavanja"</string>
     <string name="wifi_settings_title" msgid="5265554991622344805">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="7117267255799892820">"Podešavanje i upravljanje bežičnim pristupnim tačkama"</string>
-    <string name="wifi_select_network" msgid="2541598480767312831">"Izaberi Wi-Fi"</string>
-    <string name="wifi_starting" msgid="1299466156783469023">"Uključivanje Wi-Fi-ja..."</string>
-    <string name="wifi_stopping" msgid="413711069039939520">"Isključivanje Wi-Fi-ja..."</string>
+    <string name="wifi_select_network" msgid="2541598480767312831">"Izaberi WiFi"</string>
+    <string name="wifi_starting" msgid="1299466156783469023">"Uključivanje WiFi-a..."</string>
+    <string name="wifi_stopping" msgid="413711069039939520">"Isključivanje WiFi-ja..."</string>
     <string name="wifi_error" msgid="5605801874484465557">"Greška"</string>
     <string name="wifi_sap_no_channel_error" msgid="6881796988574851628">"Opseg od 5 GHz nije dostupan u ovoj zemlji"</string>
     <string name="wifi_in_airplane_mode" msgid="4729571191578262246">"U Režimu rada u avionu"</string>
@@ -871,7 +871,7 @@
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="6820040651529910914">"Nedostupno je jer je isključeno Wi‑Fi skeniranje"</string>
     <string name="wifi_wakeup_summary_scoring_disabled" msgid="7067018832237903151">"Da biste koristili funkciju, izaberite dobavljača ocene mreže"</string>
     <string name="wifi_poor_network_detection" msgid="7193423327400703073">"Izbegavaj loše veze"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="5539951465985614590">"Ne koristi Wi-Fi mrežu ako nema dobru internet vezu"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="5539951465985614590">"Ne koristi WiFi mrežu ako nema dobru internet vezu"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="1976503191780928104">"Koristi samo one mreže koje imaju dobru internet vezu"</string>
     <string name="use_open_wifi_automatically_title" msgid="3084513215481454350">"Povezuj se sa otvorenim mrežama"</string>
     <string name="use_open_wifi_automatically_summary" msgid="8338020172673161754">"Automatski se povezuj sa javnim mrežama visokog kvaliteta"</string>
@@ -879,15 +879,15 @@
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="1123080670578756834">"Da biste koristili funkciju, izaberite kompatibilnog dobavljača ocene mreže"</string>
     <string name="wifi_install_credentials" msgid="5650088113710858289">"Instaliraj sertifikate"</string>
     <string name="wifi_scan_notify_text" msgid="7614101215028336927">"Da bi poboljšale preciznost lokacije, aplikacije i usluge mogu i dalje da traže Wi‑Fi mreže u bilo kom trenutku, čak i kada je Wi‑Fi isključen. Ovo može da se koristi, na primer, za poboljšanje funkcija i usluga zasnovanih na lokaciji. Ovo možete da promenite u <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>podešavanjima pretraživanja<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
-    <string name="wifi_scan_notify_text_scanning_off" msgid="723796963816095410">"Da biste poboljšali preciznost lokacije, uključite Wi-Fi skeniranje u <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>podešavanjima skeniranja<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="wifi_scan_notify_text_scanning_off" msgid="723796963816095410">"Da biste poboljšali preciznost lokacije, uključite WiFi skeniranje u <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>podešavanjima skeniranja<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="1235445971400237444">"Ne prikazuj ponovo"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="2120785188625932076">"Ne isključuj Wi-Fi tokom spavanja"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="2120785188625932076">"Ne isključuj WiFi tokom spavanja"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="856670183023402715">"Wi‑Fi je uključen tokom spavanja"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="9029652631829560733">"Došlo je do problema prilikom promene podešavanja"</string>
     <string name="wifi_suspend_efficiency_title" msgid="5292408676086580527">"Poboljšaj efikasnost"</string>
-    <string name="wifi_suspend_optimizations" msgid="8826033336622472222">"Wi-Fi optimizacija"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="2375789014394339008">"Smanji korišćenje baterije kada je Wi-Fi uključen"</string>
-    <string name="wifi_limit_optimizations_summary" msgid="1192849485764156570">"Ogran. bat. koju koristi Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations" msgid="8826033336622472222">"WiFi optimizacija"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2375789014394339008">"Smanji korišćenje baterije kada je WiFi uključen"</string>
+    <string name="wifi_limit_optimizations_summary" msgid="1192849485764156570">"Ogran. bat. koju koristi WiFi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="2418577764071293971">"Pređi na mobilne podatke ako Wi‑Fi izgubi pristup internetu."</string>
     <string name="wifi_cellular_data_fallback_title" msgid="5067241930716252665">"Automatski pređi na mobilne podatke"</string>
     <string name="wifi_cellular_data_fallback_summary" msgid="2721467405851519769">"Koristite mobilne podatke kada Wi‑Fi nema pristup internetu. Može da vam bude naplaćena potrošnja podataka."</string>
@@ -895,7 +895,7 @@
     <string name="wifi_configure_settings_preference_title" msgid="2678534679408777268">"Podešavanja Wi‑Fi-ja"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="5714892572614655675">"Wi‑Fi se automatski uključuje ponovo"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="286904094152909651">"Wi‑Fi se ne uključuje ponovo automatski"</string>
-    <string name="wifi_access_points" msgid="1647976498906871869">"Wi-Fi mreže"</string>
+    <string name="wifi_access_points" msgid="1647976498906871869">"WiFi mreže"</string>
     <string name="wifi_menu_more_options" msgid="8318269834264035524">"Još opcija"</string>
     <string name="wifi_menu_p2p" msgid="4945665601551289791">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="9082691677803181629">"Skeniraj"</string>
@@ -905,14 +905,14 @@
     <string name="wifi_menu_remember" msgid="717257200269700641">"Zapamti mrežu"</string>
     <string name="wifi_menu_forget" msgid="7561140554450163075">"Zaboravi mrežu"</string>
     <string name="wifi_menu_modify" msgid="4080178040721021101">"Izmeni mrežu"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="272877164691346240">"Da biste videli dostupne mreže, uključite Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="881478805041020600">"Traženje Wi-Fi mreža..."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="272877164691346240">"Da biste videli dostupne mreže, uključite WiFi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="881478805041020600">"Traženje WiFi mreža..."</string>
     <string name="wifi_empty_list_user_restricted" msgid="2341613007817352431">"Nemate dozvolu da menjate Wi‑Fi mrežu."</string>
     <string name="wifi_more" msgid="3538241640407382185">"Još"</string>
     <string name="wifi_setup_wps" msgid="6730131677695521321">"Automatsko podešavanje (WPS)"</string>
-    <string name="wifi_settings_scanning_required_title" msgid="3593457187659922490">"Želite li da uključite Wi-Fi skeniranje?"</string>
+    <string name="wifi_settings_scanning_required_title" msgid="3593457187659922490">"Želite li da uključite WiFi skeniranje?"</string>
     <string name="wifi_settings_scanning_required_summary" msgid="7469610959462708782">"Da bi se automatski uključivao Wi‑Fi, prvo treba da uključite Wi‑Fi skeniranje."</string>
-    <string name="wifi_settings_scanning_required_info" msgid="5913535073390607386">"Wi-Fi skeniranje omogućava aplikacijama i uslugama da traže Wi‑Fi mreže u bilo kom trenutku, čak i kada je Wi‑Fi isključen. Ovo, na primer, može da se koristi za poboljšanje funkcija i usluga zasnovanih na lokaciji."</string>
+    <string name="wifi_settings_scanning_required_info" msgid="5913535073390607386">"WiFi skeniranje omogućava aplikacijama i uslugama da traže Wi‑Fi mreže u bilo kom trenutku, čak i kada je Wi‑Fi isključen. Ovo, na primer, može da se koristi za poboljšanje funkcija i usluga zasnovanih na lokaciji."</string>
     <string name="wifi_settings_scanning_required_turn_on" msgid="4327570180594277049">"Uključi"</string>
     <string name="wifi_settings_scanning_required_enabled" msgid="3336102100425307040">"Wi‑Fi skeniranje je uključeno"</string>
     <string name="wifi_show_advanced" msgid="8199779277168030597">"Napredne opcije"</string>
@@ -978,7 +978,7 @@
     <string name="wifi_dpp_connecting" msgid="4229290407210299897">"Povezuje se…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="847987212473038179">"Delite hotspot"</string>
     <string name="wifi_dpp_lockscreen_title" msgid="3910665850075275963">"Potvrdite da ste to vi"</string>
-    <string name="wifi_dpp_wifi_password" msgid="8007558344032612455">"Lozinka za Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
+    <string name="wifi_dpp_wifi_password" msgid="8007558344032612455">"Lozinka za WiFi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="6172326289042241924">"Lozinka hotspota: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_add_device" msgid="1347056725253936358">"Dodaj uređaj"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="115993715600532357">"Povežite se na ovu mrežu pomoću QR koda"</string>
@@ -997,7 +997,7 @@
     <string name="wifi_wps_available_second_item" msgid="5703265526619705185">" (WPS je dostupan)"</string>
     <string name="wifi_carrier_connect" msgid="7202618367339982884">"Wi‑Fi mreža mobilnog operatera"</string>
     <string name="wifi_carrier_content" msgid="3467402515071949783">"Povežite se preko <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="7811846312032594248">"Zbog poboljšanja preciznosti lokacije i u druge svrhe, <xliff:g id="APP_NAME">%1$s</xliff:g> želi da uključi skeniranje mreže čak i kada je Wi-Fi isključen.\n\nŽelite li da dozvolite ovo za sve aplikacije koje žele da skeniraju?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="7811846312032594248">"Zbog poboljšanja preciznosti lokacije i u druge svrhe, <xliff:g id="APP_NAME">%1$s</xliff:g> želi da uključi skeniranje mreže čak i kada je WiFi isključen.\n\nŽelite li da dozvolite ovo za sve aplikacije koje žele da skeniraju?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="556993843641750002">"Da biste ovo isključili, idite na Napredno u preklopnom meniju."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="8857664849515496237">"Dozvoli"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="6190909841125369403">"Odbij"</string>
@@ -1013,7 +1013,7 @@
     <string name="lost_internet_access_cancel" msgid="6577871064062518744">"Ostani na Wi‑Fi-ju"</string>
     <string name="lost_internet_access_persist" msgid="6368659013482055611">"Ne prikazuj ponovo"</string>
     <string name="wifi_connect" msgid="5653612760223533650">"Poveži"</string>
-    <string name="wifi_turned_on_message" msgid="3377779146238242894">"Wi-Fi je uključen"</string>
+    <string name="wifi_turned_on_message" msgid="3377779146238242894">"WiFi je uključen"</string>
     <!-- no translation found for wifi_connected_to_message (2875589636437599620) -->
     <skip />
     <string name="wifi_connecting" msgid="384192498836395892">"Povezuje se…"</string>
@@ -1034,7 +1034,7 @@
       <item quantity="few">%d mreže</item>
       <item quantity="other">%d mreža</item>
     </plurals>
-    <string name="wifi_advanced_titlebar" msgid="4899310977865228904">"Napredna Wi-Fi podešavanja"</string>
+    <string name="wifi_advanced_titlebar" msgid="4899310977865228904">"Napredna WiFi podešavanja"</string>
     <string name="wifi_advanced_ssid_title" msgid="4229741334913894856">"SSID"</string>
     <string name="wifi_advanced_mac_address_title" msgid="1162782083754021737">"MAC adresa"</string>
     <string name="wifi_advanced_ip_address_title" msgid="2708185994512829071">"IP adresa"</string>
@@ -1074,7 +1074,7 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="2465200999145769427">"Želite li da otkažete pozivnicu?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="3752679335020392154">"Želite li da otkažete pozivnicu za povezivanje sa uređajem <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="3206660449067701089">"Želite li da zaboravite ovu grupu?"</string>
-    <string name="wifi_hotspot_checkbox_text" msgid="12062341344410520">"Wi-Fi hotspot"</string>
+    <string name="wifi_hotspot_checkbox_text" msgid="12062341344410520">"WiFi hotspot"</string>
     <string name="wifi_hotspot_off_subtext" msgid="6177054857136221058">"Ni internet ni sadržaj se ne dele sa drugim uređajima"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="71421730039785897">"Internet veza ovog tableta se deli preko hotspota"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="8914285514605049879">"Internet veza ovog telefona se deli preko hotspota"</string>
@@ -1093,11 +1093,11 @@
     <string name="wifi_tether_stopping" msgid="7478561853791953349">"Isključivanje hotspota..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7534760116478734006">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktivan"</string>
     <string name="wifi_tether_failed_subtext" msgid="3501001612207106">"Greška prenosnog Wi‑Fi hotspota"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="4081852770996455902">"Podesi Wi-Fi hotspot"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="4081852770996455902">"Podesi WiFi hotspot"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="1000003286253019522">"Podešavanje Wi‑Fi hotspota"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="2303120188509955656">"AndroidAP WPA2 PSK hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="1722238925876152663">"AndroidHotspot"</string>
-    <string name="wifi_calling_settings_title" msgid="626821542308601806">"Pozivanje preko Wi-Fi-ja"</string>
+    <string name="wifi_calling_settings_title" msgid="626821542308601806">"Pozivanje preko WiFi-a"</string>
     <string name="wifi_calling_suggestion_title" msgid="1402265373543523970">"Produžite pozive pomoću Wi‑Fi-ja"</string>
     <string name="wifi_calling_suggestion_summary" msgid="198402175473169630">"Uklj. pozivanje preko Wi‑Fi-ja da proširite pokrivenost"</string>
     <string name="wifi_calling_mode_title" msgid="3350624859819920176">"Podešavanje pozivanja"</string>
@@ -1112,30 +1112,30 @@
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_v2">
-    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="9149346657812979257">"WiFi"</item>
     <item msgid="4421333712484542489">"Mobilni podaci"</item>
-    <item msgid="6007360612667098926">"Samo Wi-Fi"</item>
+    <item msgid="6007360612667098926">"Samo WiFi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
-    <item msgid="6452246499629557266">"Wi-Fi"</item>
+    <item msgid="6452246499629557266">"WiFi"</item>
     <item msgid="2271962426654621656">"Mobilni podaci"</item>
   </string-array>
     <string name="wifi_calling_mode_wifi_preferred_summary" msgid="8298294808362169798">"Ako je Wi‑Fi nedostupan, koristite mobilnu mrežu"</string>
     <string name="wifi_calling_mode_cellular_preferred_summary" msgid="4906499810156794061">"Ako mobilna mreža nije dostupna, koristi Wi‑Fi"</string>
-    <string name="wifi_calling_mode_wifi_only_summary" msgid="6928556021002500522">"Pozivanje preko Wi-Fi-ja. Ako se Wi‑Fi veza izgubi, poziv će se završiti."</string>
-    <string name="wifi_calling_off_explanation" msgid="1653424723742898015">"Kada je pozivanje preko Wi-Fi-ja uključeno, telefon može da preusmerava pozive preko Wi-Fi mreža ili mreže mobilnog operatera u zavisnosti od toga koje ste podešavanje izabrali i koji signal je jači. Pre nego što uključite ovu funkciju, informišite se kod mobilnog operatera o naknadama i drugim detaljima.<xliff:g id="ADDITIONAL_TEXT">%1$s</xliff:g>"</string>
+    <string name="wifi_calling_mode_wifi_only_summary" msgid="6928556021002500522">"Pozivanje preko WiFi-a. Ako se Wi‑Fi veza izgubi, poziv će se završiti."</string>
+    <string name="wifi_calling_off_explanation" msgid="1653424723742898015">"Kada je pozivanje preko WiFi-a uključeno, telefon može da preusmerava pozive preko WiFi mreža ili mreže mobilnog operatera u zavisnosti od toga koje ste podešavanje izabrali i koji signal je jači. Pre nego što uključite ovu funkciju, informišite se kod mobilnog operatera o naknadama i drugim detaljima.<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">"Adresa za hitne slučajeve"</string>
-    <string name="emergency_address_summary" msgid="478668478569851714">"Koristi se kao vaša lokacija kada uputite hitni poziv pomoću Wi-Fi-ja"</string>
+    <string name="emergency_address_summary" msgid="478668478569851714">"Koristi se kao vaša lokacija kada uputite hitni poziv pomoću WiFi-a"</string>
     <string name="private_dns_help_message" msgid="7633526525131196650"><annotation id="url">"Saznajte više"</annotation>" o funkcijama Privatnog DNS-a"</string>
     <string name="wifi_calling_pref_managed_by_carrier" msgid="5458050015417972072">"Mobilni operater upravlja podešavanjem"</string>
-    <string name="wifi_calling_settings_activation_instructions" msgid="2863642668648110908">"Aktivirajte Pozivanje preko Wi-Fi-ja"</string>
-    <string name="wifi_calling_turn_on" msgid="1212277809455062043">"Uključite pozivanje preko Wi-Fi-ja"</string>
-    <string name="wifi_calling_not_supported" msgid="216781767605669775">"Pozivanje preko Wi-Fi-ja nije podržano za %1$s"</string>
+    <string name="wifi_calling_settings_activation_instructions" msgid="2863642668648110908">"Aktivirajte Pozivanje preko WiFi-a"</string>
+    <string name="wifi_calling_turn_on" msgid="1212277809455062043">"Uključite pozivanje preko WiFi-a"</string>
+    <string name="wifi_calling_not_supported" msgid="216781767605669775">"Pozivanje preko WiFi-a nije podržano za %1$s"</string>
     <string name="carrier" msgid="3413463182542176886">"Mobilni operater"</string>
     <string name="display_settings_title" msgid="1243571562133261601">"Prikaz"</string>
     <string name="sound_settings" msgid="3306063041029638807">"Zvuk"</string>
@@ -1376,7 +1376,7 @@
     <string name="status_signal_strength" msgid="4302597886933728789">"Jačina signala"</string>
     <string name="status_roaming" msgid="5191044997355099561">"Roming"</string>
     <string name="status_operator" msgid="6017986100643755390">"Mreža"</string>
-    <string name="status_wifi_mac_address" msgid="3868452167971295995">"Wi-Fi MAC adresa"</string>
+    <string name="status_wifi_mac_address" msgid="3868452167971295995">"WiFi MAC adresa"</string>
     <string name="status_bt_address" msgid="460568179311735657">"Bluetooth adresa"</string>
     <string name="status_serial_number" msgid="8257722124627415159">"Serijski broj"</string>
     <string name="status_up_time" msgid="77128395333934087">"Vreme rada"</string>
@@ -1392,7 +1392,7 @@
     <string name="memory_media_usage" msgid="2744652206722240527">"Mediji"</string>
     <string name="memory_downloads_usage" msgid="7039979723012065168">"Preuzimanja"</string>
     <string name="memory_dcim_usage" msgid="599009211606524732">"Slike, video snimci"</string>
-    <string name="memory_music_usage" msgid="809605300042546279">"Audio (muzika, zvukovi zvona, potkasti itd.)"</string>
+    <string name="memory_music_usage" msgid="809605300042546279">"Audio (muzika, zvukovi zvona, podkasti itd.)"</string>
     <string name="memory_media_misc_usage" msgid="6258827529046910705">"Druge datoteke"</string>
     <string name="memory_media_cache_usage" msgid="1307620682751377717">"Keširani podaci"</string>
     <string name="sd_eject" product="nosdcard" msgid="3016608823130472449">"Isklj. deljene memorije"</string>
@@ -1589,7 +1589,7 @@
     <string name="restore_default_apn_completed" msgid="5671734152740058937">"Ponovno postavljanje podrazumevanih podešavanja naziva pristupne tačke je završeno."</string>
     <string name="reset_dashboard_title" msgid="7084966342252178530">"Opcije za resetovanje"</string>
     <string name="reset_dashboard_summary" msgid="8778383341461126642">"Mreža, aplikacije ili uređaj mogu da se resetuju"</string>
-    <string name="reset_network_title" msgid="8944059136930806211">"Resetuj Wi-Fi, mobilnu mrežu i Bluetooth"</string>
+    <string name="reset_network_title" msgid="8944059136930806211">"Resetuj WiFi, mobilnu mrežu i Bluetooth"</string>
     <string name="reset_network_desc" msgid="4982633363916261109">"Ovim resetujete sva podešavanja mreže, uključujući:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobilne podatke"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_esim_title" msgid="7630781767040831893">"Obriši preuzete SIM kartice"</string>
     <string name="reset_esim_desc" msgid="433226911566802">"Da biste preuzeli zamenske SIM kartice, kontaktirajte mobilnog operatera. Time se neće otkazati nijedan tarifni paket."</string>
@@ -1644,7 +1644,7 @@
     <string name="usb_tethering_subtext" product="tablet" msgid="154536000235361034">"Deljenje internet veze tableta preko USB-a"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="7257293066139372774">"Bluetooth privezivanje"</string>
     <string name="bluetooth_tethering_subtext" product="tablet" msgid="6868756914621131635">"Delite internet vezu tableta preko Bluetooth-a"</string>
-    <string name="bluetooth_tethering_subtext" product="default" msgid="9167912297565425178">"Delite internet vezu telefona preko Bluetooth-a"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="9167912297565425178">"Deljenje internet veze telefona preko Bluetooth-a"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="3981528184780083266">"Internet veza uređaja <xliff:g id="DEVICE_NAME">%1$d</xliff:g> se deli preko Bluetooth-a"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="6946561351369376943">"Privezivanje na više od <xliff:g id="MAXCONNECTION">%1$d</xliff:g> uređaja nije moguće."</string>
     <string name="bluetooth_untether_blank" msgid="5428300773782256084">"Internet veza sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g> će biti prekinuta."</string>
@@ -1686,9 +1686,9 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="196241746742607453">"Bluetooth skeniranje"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="3796673798637848690">"Dozvolite aplikacijama i uslugama da traže uređaje u blizini u svakom trenutku, čak i kada je Bluetooth isključen. Ovo može da se koristi, na primer, za poboljšanje funkcija i usluga zasnovanih na lokaciji."</string>
     <string name="managed_profile_location_services" msgid="224925483299159541">"Usluge lokacije za posao"</string>
-    <string name="location_network_based" msgid="1535812159327454835">"Lokac. na osnovu Wi-Fi i mob. mreže"</string>
+    <string name="location_network_based" msgid="1535812159327454835">"Lokac. na osnovu WiFi i mob. mreže"</string>
     <string name="location_neighborhood_level" msgid="8459352741296587916">"Neka apl. koriste Google-ovu uslugu lociranja za brže određivanje lokacije. Anonimni podaci o lokaciji prikupljaće se i slati Google-u."</string>
-    <string name="location_neighborhood_level_wifi" msgid="6120133551482003840">"Lokacija se određuje pomoću Wi-Fi-ja"</string>
+    <string name="location_neighborhood_level_wifi" msgid="6120133551482003840">"Lokacija se određuje pomoću WiFi-a"</string>
     <string name="location_gps" msgid="688049341158297763">"GPS sateliti"</string>
     <string name="location_street_level" product="tablet" msgid="4459804798444296650">"Neka aplikacije koriste GPS na tabletu kako bi tačno odredile vašu lokaciju"</string>
     <string name="location_street_level" product="default" msgid="7407688345675450051">"Neka aplikacije koriste GPS na telefonu kako bi tačno odredile vašu lokaciju"</string>
@@ -1746,10 +1746,10 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="8823110536502072216">"Potvrda identiteta licem zahteva lozinku"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="5563793748503883666">"Potvrda identiteta licem zahteva šablon"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="7238352632535405068">"Potvrda identiteta licem zahteva PIN"</string>
-    <string name="lockpassword_confirm_your_pattern_generic" msgid="6146545393074070916">"Upotrebite šablon za uređaj da biste nastavili"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="6146545393074070916">"Koristite šablon za uređaj da biste nastavili"</string>
     <string name="lockpassword_confirm_your_pin_generic" msgid="8732268389177735264">"Unesite PIN uređaja da biste nastavili"</string>
     <string name="lockpassword_confirm_your_password_generic" msgid="6304552647060899594">"Unesite lozinku uređaja da biste nastavili"</string>
-    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="3074250084050465513">"Upotrebite šablon za poslovni profil da biste nastavili"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="3074250084050465513">"Koristite šablon za poslovni profil da biste nastavili"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="6037908971086439523">"Unesite PIN za poslovni profil da biste nastavili"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="2646162490703489685">"Unesite lozinku za poslovni profil da biste nastavili"</string>
     <string name="lockpassword_strong_auth_required_device_pattern" msgid="1014214190135045781">"Radi veće bezbednosti koristite šablon za uređaj"</string>
@@ -1863,7 +1863,7 @@
     <string name="show_running_services" msgid="1895994322704667543">"Prikaži pokrenute usluge"</string>
     <string name="show_background_processes" msgid="88012264528093617">"Prikaži keširane procese"</string>
     <string name="default_emergency_app" msgid="286530070173495823">"Aplikacija za hitne slučajeve"</string>
-    <string name="reset_app_preferences" msgid="1426500030595212077">"Resetuj podešavanja aplikacije"</string>
+    <string name="reset_app_preferences" msgid="1426500030595212077">"Resetuj podešavanja aplikacija"</string>
     <string name="reset_app_preferences_title" msgid="792909865493673598">"Želite da resetujete podešavanja aplikacije?"</string>
     <string name="reset_app_preferences_desc" msgid="7935273005301096031">"Ovim ćete vratiti na početne vrednosti sva podešavanja za:\n\n "<li>"Onemogućene aplikacije"</li>\n" "<li>"Obaveštenja o onemogućenim aplikacijama"</li>\n" "<li>"Podrazumevane aplikacije za radnje"</li>\n" "<li>"Ograničenja za pozadinske podatke za aplikacije"</li>\n" "<li>"Bilo kakva ograničenja za dozvole"</li>\n\n" Nećete izgubiti podatke aplikacija."</string>
     <string name="reset_app_preferences_button" msgid="2041894727477934656">"Resetuj aplikacije"</string>
@@ -2288,8 +2288,8 @@
     <!-- no translation found for battery_stats_last_duration (8190573267292309839) -->
     <skip />
     <string name="awake" msgid="8956720170442161285">"Vreme buđenja uređaja"</string>
-    <string name="wifi_on_time" msgid="2487820618265936068">"Vreme od uključivanja Wi-Fi mreže"</string>
-    <string name="bluetooth_on_time" msgid="6400569492287292639">"Vreme od uključivanja Wi-Fi mreže"</string>
+    <string name="wifi_on_time" msgid="2487820618265936068">"Vreme od uključivanja WiFi mreže"</string>
+    <string name="bluetooth_on_time" msgid="6400569492287292639">"Vreme od uključivanja WiFi mreže"</string>
     <string name="advanced_battery_title" msgid="5026866913848464170">"Potrošnja baterije"</string>
     <string name="history_details_title" msgid="8608193822257799936">"Detalji istorije"</string>
     <string name="battery_details_title" msgid="5358230551490703067">"Potrošnja baterije"</string>
@@ -2411,7 +2411,7 @@
     <string name="usage_type_cpu_foreground" msgid="5496661858574622156">"Procesor u prednjem planu"</string>
     <string name="usage_type_wake_lock" msgid="6729977238748413476">"Zadrži van stanja spavanja"</string>
     <string name="usage_type_gps" msgid="5914062195732419196">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="4192567991891907030">"Wi-Fi je aktivan"</string>
+    <string name="usage_type_wifi_running" msgid="4192567991891907030">"WiFi je aktivan"</string>
     <string name="usage_type_phone" product="tablet" msgid="4279605085824633501">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="3901842461077646153">"Telefon"</string>
     <string name="usage_type_data_send" msgid="6339880867171142725">"Poslati mobilni paketi"</string>
@@ -2432,7 +2432,7 @@
     <string name="battery_action_app_details" msgid="1077011181969550402">"Informacije o aplikaciji"</string>
     <string name="battery_action_app_settings" msgid="587998773852488539">"Podešavanja aplikacija"</string>
     <string name="battery_action_display" msgid="4887913003634317465">"Podešavanja ekrana"</string>
-    <string name="battery_action_wifi" msgid="7123520587925323824">"Wi-Fi podešavanja"</string>
+    <string name="battery_action_wifi" msgid="7123520587925323824">"WiFi podešavanja"</string>
     <string name="battery_action_bluetooth" msgid="718594420017519807">"Podešavanja za Bluetooth"</string>
     <string name="battery_desc_voice" msgid="4731966028374974986">"Baterija koju koriste glasovni pozivi"</string>
     <string name="battery_desc_standby" product="tablet" msgid="2941777996429933419">"Iskorišćena baterija kada je tablet neaktivan"</string>
@@ -2443,8 +2443,8 @@
     <string name="battery_desc_camera" msgid="517966830222999462">"Procenat baterije koji troši kamera"</string>
     <string name="battery_desc_display" msgid="6701005808894183097">"Baterija koju koristi ekran i pozadinsko svetlo"</string>
     <string name="battery_sugg_display" msgid="6366790848514389990">"Smanjite osvetljenost ekrana i/ili vreme do gašenja"</string>
-    <string name="battery_desc_wifi" msgid="3497535902126253386">"Baterija koju koristi Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="3796329601134263039">"Isključite Wi-Fi kada ga ne koristite ili kada nije dostupan"</string>
+    <string name="battery_desc_wifi" msgid="3497535902126253386">"Baterija koju koristi WiFi"</string>
+    <string name="battery_sugg_wifi" msgid="3796329601134263039">"Isključite WiFi kada ga ne koristite ili kada nije dostupan"</string>
     <string name="battery_desc_bluetooth" msgid="3468061900485447679">"Baterija koju koristi Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="6353294067057749310">"Isključite Bluetooth kada ga ne koristite"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="2421931037149315202">"Pokušajte da se povežete sa drugim Bluetooth uređajem"</string>
@@ -2575,7 +2575,7 @@
     <string name="credential_storage_type_software" msgid="1335905150062717150">"Samo softverski"</string>
     <string name="credentials_settings_not_available" msgid="5490259681690183274">"Akreditivi nisu dostupni za ovog korisnika"</string>
     <string name="credential_for_vpn_and_apps" msgid="2462642486949593841">"Instalirano za VPN i aplikacije"</string>
-    <string name="credential_for_wifi" msgid="2903295786961726388">"Instalirano za Wi-Fi"</string>
+    <string name="credential_for_wifi" msgid="2903295786961726388">"Instalirano za WiFi"</string>
     <string name="credentials_reset_hint" msgid="3484350477764088169">"Želite li da uklonite sav sadržaj?"</string>
     <string name="credentials_erased" msgid="7287088033523869085">"Skladište akreditiva je izbrisano."</string>
     <string name="credentials_not_erased" msgid="9137227570738627637">"Nije moguće obrisati skladište akreditiva."</string>
@@ -2588,7 +2588,7 @@
     <string name="backup_section_title" msgid="8177209731777904656">"Rezervna kopija i resetovanje"</string>
     <string name="personal_data_section_title" msgid="9161854418510071558">"Lični podaci"</string>
     <string name="backup_data_title" msgid="4461508563849583624">"Pravljenje rezervnih kopija podataka"</string>
-    <string name="backup_data_summary" msgid="555459891017933746">"Pravi rezervne kopije podataka o aplikacijama, Wi-Fi lozinki i drugih podešavanja na Google serverima"</string>
+    <string name="backup_data_summary" msgid="555459891017933746">"Pravi rezervne kopije podataka o aplikacijama, WiFi lozinki i drugih podešavanja na Google serverima"</string>
     <string name="backup_configure_account_title" msgid="1534734650559070294">"Rezervna kopija naloga"</string>
     <string name="backup_data_management_title" msgid="6299288795610243508">"Upravljajte nalogom za rezervne kopije"</string>
     <string name="include_app_data_title" msgid="6117211611131913293">"Uvrštavanje podataka aplikacija"</string>
@@ -2597,9 +2597,9 @@
     <string name="backup_inactive_title" msgid="5513496915638307750">"Usluga pravljenja rezervnih kopija nije aktivna"</string>
     <string name="backup_configure_account_default_summary" msgid="5718298066335006412">"Trenutno nijedan nalog ne čuva rezervne kopije podataka"</string>
     <string name="backup_erase_dialog_title" msgid="8178424339104463014"></string>
-    <string name="backup_erase_dialog_message" msgid="8767843355330070902">"Želite li da zaustavite pravljenje rezervnih kopija Wi-Fi lozinki, obeleživača, ostalih podešavanja i podataka o aplikacijama, kao i da izbrišete sve kopije na Google serverima?"</string>
-    <string name="fullbackup_erase_dialog_message" msgid="2588536036471144070">"Želite li da zaustavite pravljenje rezervnih kopija podataka uređaja (poput Wi-Fi lozinki i istorije poziva) i podataka aplikacija (poput podešavanja i datoteka sačuvanih u aplikacijama) i izbrišete sve kopije na udaljenim serverima?"</string>
-    <string name="fullbackup_data_summary" msgid="406274198094268556">"Automatski pravite rezervne kopije podataka uređaja (poput Wi-Fi lozinki i istorije poziva) i podataka aplikacija (poput podešavanja i datoteka sačuvanih u aplikacijama) daljinski.\n\nKada uključite automatsko pravljenje rezervnih kopija, podaci uređaja i aplikacija se povremeno čuvaju daljinski. Podaci aplikacija mogu da budu bilo koji podaci koje je aplikacija sačuvala (na osnovu podešavanja programera), uključujući potencijalno osetljive podatke kao što su kontakti, poruke i slike."</string>
+    <string name="backup_erase_dialog_message" msgid="8767843355330070902">"Želite li da zaustavite pravljenje rezervnih kopija WiFi lozinki, obeleživača, ostalih podešavanja i podataka o aplikacijama, kao i da izbrišete sve kopije na Google serverima?"</string>
+    <string name="fullbackup_erase_dialog_message" msgid="2588536036471144070">"Želite li da zaustavite pravljenje rezervnih kopija podataka uređaja (poput WiFi lozinki i istorije poziva) i podataka aplikacija (poput podešavanja i datoteka sačuvanih u aplikacijama) i izbrišete sve kopije na udaljenim serverima?"</string>
+    <string name="fullbackup_data_summary" msgid="406274198094268556">"Automatski pravite rezervne kopije podataka uređaja (poput WiFi lozinki i istorije poziva) i podataka aplikacija (poput podešavanja i datoteka sačuvanih u aplikacijama) daljinski.\n\nKada uključite automatsko pravljenje rezervnih kopija, podaci uređaja i aplikacija se povremeno čuvaju daljinski. Podaci aplikacija mogu da budu bilo koji podaci koje je aplikacija sačuvala (na osnovu podešavanja programera), uključujući potencijalno osetljive podatke kao što su kontakti, poruke i slike."</string>
     <string name="device_admin_settings_title" msgid="2074319456047334589">"Podešavanja administratora uređaja"</string>
     <string name="active_device_admin_msg" msgid="6929247869516924549">"Aplikacija za administratora uređaja"</string>
     <string name="remove_device_admin" msgid="4413438593788336400">"Deaktiviraj ovu aplikaciju za administratora uređaja"</string>
@@ -2665,9 +2665,9 @@
     <string name="remove_account_label" msgid="5885425720323823387">"Ukloni nalog"</string>
     <string name="header_add_an_account" msgid="8482614556580804956">"Dodajte nalog"</string>
     <string name="really_remove_account_title" msgid="4166512362915154319">"Želite li da uklonite nalog?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Uklanjanjem ovog naloga izbrisaćete sve poruke, kontakte i druge podatke sa tableta!"</string>
-    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Uklanjanjem ovog naloga izbrisaćete sve poruke, kontakte i druge podatke sa telefona!"</string>
-    <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Ako uklonite ovaj nalog, izbrisaćete sve poruke, kontakte i druge podatke sa uređaja!"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Ako uklonite ovaj nalog, izbrisaćete sve poruke, kontakte i druge podatke sa tableta."</string>
+    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Ako uklonite ovaj nalog, izbrisaćete sve poruke, kontakte i druge podatke sa telefona."</string>
+    <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Ako uklonite ovaj nalog, izbrisaćete sve poruke, kontakte i druge podatke sa uređaja."</string>
     <string name="remove_account_failed" msgid="491458185327106966">"Administrator ne dozvoljava ovu promenu"</string>
     <string name="cant_sync_dialog_title" msgid="5483419398223189881">"Ručno sinhronizovanje nije moguće"</string>
     <string name="cant_sync_dialog_message" msgid="3467126947262857534">"Sinhronizacija za ovu stavku je trenutno onemogućena. Da biste promenili ovo podešavanje, privremeno uključite pozadinske podatke i automatsku sinhronizaciju."</string>
@@ -2718,7 +2718,7 @@
     <string name="data_usage_disable_mobile_limit" msgid="1937796699758613667">"Podesi ograničenje za mobil. pod."</string>
     <string name="data_usage_disable_4g_limit" msgid="7131367986548147266">"Podesi ograničenje za 4G podatke"</string>
     <string name="data_usage_disable_3g_limit" msgid="6746819313032692220">"Podesi ograničenje za 2G-3G podatke"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8214267551888018353">"Ograniči Wi-Fi podatke"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="8214267551888018353">"Ograniči WiFi podatke"</string>
     <string name="data_usage_tab_wifi" msgid="7224124683039634055">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="5053077378022543867">"Eternet"</string>
     <string name="data_usage_tab_mobile" msgid="540101181815160147">"Mobilni"</string>
@@ -2753,9 +2753,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="2000713577999830647">"Tablet će isključiti mobilne podatke čim dostigne ograničenje koje ste podesili.\n\nPošto potrošnju podataka meri tablet, a mobilni operater može drugačije da računa potrošnju, razmislite o tome da podesite niže ograničenje."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="943546278705619205">"Telefon će isključiti mobilne podatke čim dostigne ograničenje koje ste podesili.\n\nPošto potrošnju podataka meri telefon, a mobilni operater može drugačije da računa potrošnju, razmislite o tome da podesite niže ograničenje."</string>
     <string name="data_usage_restrict_background_title" msgid="3568746530413220844">"Želite li da ograničite pozadinske podatke?"</string>
-    <string name="data_usage_restrict_background" msgid="995811034744808575">"Ako ograničite mobilne pozadinske podatke, neke aplikacije i usluge neće funkcionisati ako niste povezani sa Wi-Fi-jem."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="6032810839234864814">"Ako ograničite mobilne pozadinske podatke, neke aplikacije i usluge neće funkcionisati ako niste povezani sa Wi-Fi-jem.\n\nOvo podešavanje utiče na sve korisnike na ovom tabletu."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="6846901756455789858">"Ako ograničite mobilne pozadinske podatke, neke aplikacije i usluge neće funkcionisati ako niste povezani sa Wi-Fi-jem.\n\nOvo podešavanje utiče na sve korisnike na ovom telefonu."</string>
+    <string name="data_usage_restrict_background" msgid="995811034744808575">"Ako ograničite mobilne pozadinske podatke, neke aplikacije i usluge neće funkcionisati ako niste povezani sa WiFi-em."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="6032810839234864814">"Ako ograničite mobilne pozadinske podatke, neke aplikacije i usluge neće funkcionisati ako niste povezani sa WiFi-em.\n\nOvo podešavanje utiče na sve korisnike na ovom tabletu."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="6846901756455789858">"Ako ograničite mobilne pozadinske podatke, neke aplikacije i usluge neće funkcionisati ako niste povezani sa WiFi-em.\n\nOvo podešavanje utiče na sve korisnike na ovom telefonu."</string>
     <string name="data_usage_sweep_warning" msgid="4646401408698778092"><font size="12">"upoz."</font>\n<font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
     <string name="data_usage_sweep_limit" msgid="6101105504557548269"><font size="12">"ogran."</font>\n<font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="4152786786140875769">"Uklonjene aplikacije"</string>
@@ -2768,7 +2768,7 @@
     <string name="data_usage_metered_body" msgid="1342905101297753439">"Mreže sa ograničenjem se tretiraju kao mobilne mreže kada postoji ograničenje za pozadinske podatke. Aplikacije mogu da vas upozore kada nameravate da koristite te mreže za velika preuzimanja."</string>
     <string name="data_usage_metered_mobile" msgid="3675591449158207593">"Mobilne mreže"</string>
     <string name="data_usage_metered_wifi" msgid="2955256408132426720">"Wi‑Fi mreže sa ograničenjem"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="5771083253782103415">"Da biste izabrali mreže sa ograničenjem, uključite Wi-Fi."</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5771083253782103415">"Da biste izabrali mreže sa ograničenjem, uključite WiFi."</string>
     <string name="data_usage_metered_auto" msgid="7924116401382629319">"Automatski"</string>
     <string name="data_usage_metered_yes" msgid="7333744880035386073">"Sa ograničenjem"</string>
     <string name="data_usage_metered_no" msgid="1961524615778610008">"Bez ograničenja"</string>
@@ -3102,7 +3102,7 @@
     <string name="keywords_flashlight" msgid="7733996050628473024">"Baterijska lampa, svetlo, lampa"</string>
     <string name="keywords_change_wifi_state" msgid="7697524907886303535">"wifi, wi-fi, uključi/isključi, kontrola"</string>
     <string name="keywords_more_mobile_networks" msgid="5605342743169059942">"mobilna mreža, mobilni podaci, mobilni operater, bežično, podaci, 4g, 3g, 2g, lte"</string>
-    <string name="keywords_wifi_calling" msgid="3554052148729818521">"WiFi, Wi-Fi, poziv, pozivanje"</string>
+    <string name="keywords_wifi_calling" msgid="3554052148729818521">"WiFi, WiFi, poziv, pozivanje"</string>
     <string name="keywords_display" msgid="355147521915213375">"ekran, dodirni ekran"</string>
     <string name="keywords_display_brightness_level" msgid="7649410848561920512">"zatamni ekran, dodirni ekran, baterija, svetlo"</string>
     <string name="keywords_display_night_display" msgid="3647370193110044967">"zatamni ekran, noć, senka, treća smena, osvetljenost, boja ekrana, boja"</string>
@@ -3998,12 +3998,12 @@
     <string name="usage" msgid="9172908720164431622">"Potrošnja"</string>
     <string name="cellular_data_usage" msgid="1236562234207782386">"Potrošnja mobil. podataka"</string>
     <string name="app_cellular_data_usage" msgid="8499761516172121957">"Korišćenje podataka aplikacije"</string>
-    <string name="wifi_data_usage" msgid="275569900562265895">"Potrošnja Wi-Fi podataka"</string>
+    <string name="wifi_data_usage" msgid="275569900562265895">"Potrošnja WiFi podataka"</string>
     <string name="ethernet_data_usage" msgid="747614925362556718">"Potrošnja podataka na eternetu"</string>
-    <string name="wifi" msgid="1586738489862966138">"Wi-Fi"</string>
+    <string name="wifi" msgid="1586738489862966138">"WiFi"</string>
     <string name="ethernet" msgid="2365753635113154667">"Eternet"</string>
     <string name="cell_data_template" msgid="5473177306229738078">"<xliff:g id="AMOUNT">^1</xliff:g> mobilnih podataka"</string>
-    <string name="wifi_data_template" msgid="3146090439147042068">"<xliff:g id="AMOUNT">^1</xliff:g> Wi-Fi podataka"</string>
+    <string name="wifi_data_template" msgid="3146090439147042068">"<xliff:g id="AMOUNT">^1</xliff:g> WiFi podataka"</string>
     <string name="ethernet_data_template" msgid="6414118030827090119">"<xliff:g id="AMOUNT">^1</xliff:g> podataka na eternetu"</string>
     <string name="billing_cycle" msgid="5740717948341713190">"Upozorenje za podatke i ograničenje"</string>
     <string name="app_usage_cycle" msgid="213483325132959663">"Ciklus potrošnje podataka apl."</string>
@@ -4384,9 +4384,9 @@
     <string name="unknown_unavailability_setting_summary" msgid="5785931810977403534">"Podešavanje je nedostupno"</string>
     <string name="my_device_info_account_preference_title" msgid="7965847995028952373">"Nalog"</string>
     <string name="my_device_info_device_name_preference_title" msgid="7384446683248009296">"Naziv uređaja"</string>
-    <string name="change_wifi_state_title" msgid="5140754955787584174">"Kontrola Wi-Fi veze"</string>
-    <string name="change_wifi_state_app_detail_switch" msgid="6489090744937816260">"Omogućite da aplikacija kontroliše Wi-Fi"</string>
-    <string name="change_wifi_state_app_detail_summary" msgid="614854822469259860">"Omogućite da ova aplikacija uključi ili isključi Wi-Fi, traži i povezuje se na Wi-Fi mreže, dodaje i uklanja mreže ili pokreće samo lokalni hotspot"</string>
+    <string name="change_wifi_state_title" msgid="5140754955787584174">"Kontrola WiFi veze"</string>
+    <string name="change_wifi_state_app_detail_switch" msgid="6489090744937816260">"Omogućite da aplikacija kontroliše WiFi"</string>
+    <string name="change_wifi_state_app_detail_summary" msgid="614854822469259860">"Omogućite da ova aplikacija uključi ili isključi WiFi, traži i povezuje se na WiFi mreže, dodaje i uklanja mreže ili pokreće samo lokalni hotspot"</string>
     <string name="media_output_title" msgid="8710632337456601848">"Puštaj medijski sadržaj na"</string>
     <string name="media_output_default_summary" msgid="3159237976830415584">"Ovaj uređaj"</string>
     <string name="media_output_summary" product="default" msgid="6294261435613551178">"Telefon"</string>
@@ -4410,7 +4410,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="3509459199090688328">"Uključeno (zvuk je isključen)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="5152618221093037451">"Isključeno"</string>
     <string name="pref_title_network_details" msgid="3971074015034595956">"Detalji o mreži"</string>
-    <string name="about_phone_device_name_warning" msgid="9088572775969880106">"Ime uređaja vide aplikacije na telefonu. Mogu da ga vide i drugi ljudi kad se povežete sa Bluetooth uređajima ili podesite Wi-Fi hotspot."</string>
+    <string name="about_phone_device_name_warning" msgid="9088572775969880106">"Ime uređaja vide aplikacije na telefonu. Mogu da ga vide i drugi ljudi kad se povežete sa Bluetooth uređajima ili podesite WiFi hotspot."</string>
     <string name="devices_title" msgid="4768432575951993648">"Uređaji"</string>
     <string name="homepage_all_settings" msgid="3201220879559136116">"Sva podešavanja"</string>
     <string name="homepage_personal_settings" msgid="7472638597249114564">"Predlozi"</string>
@@ -4602,5 +4602,5 @@
     <string name="automatic_system_heap_dump_summary" msgid="4962129546638974661">"Automatski snima dinamički deo memorije za Android sistem kada koristi previše memorije"</string>
     <string name="wifi_disconnect_button_text" msgid="787688024070426706">"Prekini vezu"</string>
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="26884532087670844">"Hitni pozivi"</string>
-    <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="8726152486964822599">"Mobilni operater ne podržava hitne pozive pomoću funkcije Pozivanje preko Wi-Fi-ja.\nUređaj automatski prelazi na mobilnu mrežu da bi uputio hitan poziv.\nHitni pozivi su mogući samo u oblastima pokrivenim mobilnom mrežom."</string>
+    <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="8726152486964822599">"Mobilni operater ne podržava hitne pozive pomoću funkcije Pozivanje preko WiFi-a.\nUređaj automatski prelazi na mobilnu mrežu da bi uputio hitan poziv.\nHitni pozivi su mogući samo u oblastima pokrivenim mobilnom mrežom."</string>
 </resources>
diff --git a/tests/CarDeveloperOptions/res/values-be/strings.xml b/tests/CarDeveloperOptions/res/values-be/strings.xml
index 2ae5de9..ade04a5 100644
--- a/tests/CarDeveloperOptions/res/values-be/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-be/strings.xml
@@ -55,7 +55,7 @@
     <string name="radio_info_ims_reg_status_not_registered" msgid="1286050699734226077">"Не зарэгістраваны"</string>
     <string name="radio_info_ims_feature_status_available" msgid="2040629393134756058">"Даступны"</string>
     <string name="radio_info_ims_feature_status_unavailable" msgid="3348223769202693596">"Недаступны"</string>
-    <string name="radio_info_ims_reg_status" msgid="4771711884059371514">"Рэгістрацыя IMS: <xliff:g id="STATUS">%1$s</xliff:g>\nГолас па LTE: <xliff:g id="AVAILABILITY_0">%2$s</xliff:g>\nГолас па WiFi: <xliff:g id="AVAILABILITY_1">%3$s</xliff:g>\nВідэавыклік: <xliff:g id="AVAILABILITY_2">%4$s</xliff:g>\nІнтэрфейс UT: <xliff:g id="AVAILABILITY_3">%5$s</xliff:g>"</string>
+    <string name="radio_info_ims_reg_status" msgid="4771711884059371514">"Рэгістрацыя IMS: <xliff:g id="STATUS">%1$s</xliff:g>\nГаласавая сувязь па LTE: <xliff:g id="AVAILABILITY_0">%2$s</xliff:g>\nГаласавая сувязь па Wi-Fi: <xliff:g id="AVAILABILITY_1">%3$s</xliff:g>\nВідэавыклікі: <xliff:g id="AVAILABILITY_2">%4$s</xliff:g>\nІнтэрфейс UT: <xliff:g id="AVAILABILITY_3">%5$s</xliff:g>"</string>
     <string name="radioInfo_service_in" msgid="1297020186765943857">"Працуе"</string>
     <string name="radioInfo_service_out" msgid="8460363463722476510">"Не працуе"</string>
     <string name="radioInfo_service_emergency" msgid="7674989004735662599">"Толькі экстранныя выклікі"</string>
@@ -794,7 +794,7 @@
     <string name="bluetooth_device_context_connect" msgid="1812090541371432890">"Падключыцца"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8085015949275771802">"Адключыць"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="1503322591778810032">"Спарыць і падключыць"</string>
-    <string name="bluetooth_device_context_unpair" msgid="250588431708253041">"Разарваць пару"</string>
+    <string name="bluetooth_device_context_unpair" msgid="250588431708253041">"Разлучыць"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="4519151805677280077">"Адключыць і разарваць пару"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="423463405499392444">"Параметры..."</string>
     <string name="bluetooth_menu_advanced" msgid="7566858513372603652">"Пашыраныя налады"</string>
@@ -935,7 +935,7 @@
     <string name="wifi_show_advanced" msgid="8199779277168030597">"Дадатковыя параметры"</string>
     <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" msgid="6746270925975522641">"Назва сеткі"</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>
@@ -1105,7 +1105,7 @@
     <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_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">"Хот-спот Wi‑Fi выключыцца, калі прылады непадключаныя"</string>
     <string name="wifi_tether_starting" msgid="7676952148471297900">"Уключэнне хот-спота..."</string>
     <string name="wifi_tether_stopping" msgid="7478561853791953349">"Выключэнне хот-спота..."</string>
@@ -1411,7 +1411,7 @@
     <string name="memory_media_usage" msgid="2744652206722240527">"Медыя"</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_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>
@@ -2951,7 +2951,7 @@
     <string name="user_add_profile_item_title" msgid="4932743891449790664">"Абмежаваны профiль"</string>
     <string name="user_add_user_title" msgid="2320897397066676472">"Дадаць новага карыстальніка?"</string>
     <string name="user_add_user_message_long" msgid="686637203224195465">"Вы можаце адкрыць доступ да гэтай прылады іншым людзям шляхам стварэння дадатковых карыстальнікаў. Кожны карыстальнік мае свой уласны раздзел, на якім ён можа наладзіць свае праграмы, шпалеры і іншае. Карыстальнікі таксама могуць наладжваць параметры прылады, напрыклад Wi-Fi, якія ўплываюць на ўсіх.\n\nКалі вы дадаяце новага карыстальніка, ён павінен наладзіць свой раздзел.\n\nЛюбы карыстальнік можа абнаўляць праграмы для ўсіх астатніх карыстальнікаў. Спецыяльныя магчымасці наладжваюцца асабіста кожным карыстальнікам."</string>
-    <string name="user_add_user_message_short" msgid="1802594476285458254">"Пасля стварэння профіля яго трэба наладзіць.\n\nЛюбы карыстальнік прылады можа абнаўляць праграмы ўсіх іншых карыстальнікаў."</string>
+    <string name="user_add_user_message_short" msgid="1802594476285458254">"Пасля стварэння профілю яго трэба наладзіць.\n\nЛюбы карыстальнік прылады можа абнаўляць праграмы ўсіх іншых карыстальнікаў."</string>
     <string name="user_setup_dialog_title" msgid="6748950002206392396">"Наладзіць профіль?"</string>
     <string name="user_setup_dialog_message" msgid="2988559933258353919">"Пераканайцеся, што чалавек мае магчымасць узяць прыладу і наладзіць свой раздзел"</string>
     <string name="user_setup_profile_dialog_message" msgid="7611900802824048526">"Наладзiць профiль?"</string>
@@ -3231,14 +3231,14 @@
     <string name="other_sound_settings" msgid="5250376066099818676">"Іншыя гукі"</string>
     <string name="dial_pad_tones_title" msgid="8877212139988655769">"Гукі панэлі набору"</string>
     <string name="screen_locking_sounds_title" msgid="4407110895465866809">"Гукі блакіроўкі экрана"</string>
-    <string name="charging_sounds_title" msgid="5070437987230894287">"Сігнал зарадкі і вібрацыя"</string>
+    <string name="charging_sounds_title" msgid="5070437987230894287">"Гукі і вібрацыя пры зарадцы"</string>
     <string name="docking_sounds_title" msgid="2573137471605541366">"Гукі док-станцыі"</string>
     <string name="touch_sounds_title" msgid="165237488496165652">"Гукі пры дотыку"</string>
     <string name="vibrate_on_touch_title" msgid="6360155469279157684">"Вібрацыя пры націсканні"</string>
     <string name="vibrate_on_touch_summary" msgid="5504424764028676043">"Тактыльны водгук пры націсканні на кнопкі, клавіятуру і г.д."</string>
     <string name="dock_audio_media_title" msgid="1859521680502040781">"Уключыць док-дынамік"</string>
     <string name="dock_audio_media_disabled" msgid="4300752306178486302">"Усё аўдыё"</string>
-    <string name="dock_audio_media_enabled" msgid="2873275045878628153">"Толькі медыяаўдыё"</string>
+    <string name="dock_audio_media_enabled" msgid="2873275045878628153">"Толькі аўдыя медыяфайлаў"</string>
     <string name="emergency_tone_silent" msgid="804809075282717882">"Без гуку"</string>
     <string name="emergency_tone_alert" msgid="907868135091891015">"Танальныя сігналы"</string>
     <string name="emergency_tone_vibrate" msgid="5020068066905681181">"Вібрацыя"</string>
@@ -4416,7 +4416,7 @@
     <string name="autofill_reset_developer_options_complete" msgid="5686061993002179524">"Аўтазапаўненне параметраў распрацоўшчыка было скінута"</string>
     <string name="device_theme" msgid="8992291311481135893">"Тэма прылады"</string>
     <string name="default_theme" msgid="5986996377385956138">"Стандартная"</string>
-    <string name="show_operator_name_title" msgid="5056163028128447308">"Імя сеткі"</string>
+    <string name="show_operator_name_title" msgid="5056163028128447308">"Назва сеткі"</string>
     <string name="show_operator_name_summary" msgid="6352180285743777497">"Паказваць імя сеткі на панэлі стану"</string>
     <string name="storage_manager_indicator" msgid="4255140732848476875">"Менеджар сховішча: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="6404056007102580777">"Выключаны"</string>
diff --git a/tests/CarDeveloperOptions/res/values-bg/strings.xml b/tests/CarDeveloperOptions/res/values-bg/strings.xml
index 6d0ce88..3778d2d 100644
--- a/tests/CarDeveloperOptions/res/values-bg/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-bg/strings.xml
@@ -1572,7 +1572,7 @@
     <string name="reset_dashboard_summary" msgid="8778383341461126642">"Мрежата, приложенията или устройството могат да бъдат нулирани"</string>
     <string name="reset_network_title" msgid="8944059136930806211">"Нулиране на настройките за Wi-Fi, мобилни данни и Bluetooth"</string>
     <string name="reset_network_desc" msgid="4982633363916261109">"Така ще нулирате всички мрежови настройки, включително тези за:\n\n"<li>"Wi‑Fi;"</li>\n<li>"мобилни данни;"</li>\n<li>"Bluetooth."</li></string>
-    <string name="reset_esim_title" msgid="7630781767040831893">"Изтеглени SIM карти: Изтриване"</string>
+    <string name="reset_esim_title" msgid="7630781767040831893">"Изтриване на изтеглените SIM карти"</string>
     <string name="reset_esim_desc" msgid="433226911566802">"За да изтеглите SIM карти за замяна, свържете се с оператора си. Плановете за мобилни услуги няма да бъдат анулирани."</string>
     <string name="reset_network_button_text" msgid="4293271046867912819">"Нулиране на настройките"</string>
     <string name="reset_network_final_desc" msgid="2463817067048751373">"Да се нулират ли всички настройки за мрежата? Не можете да отмените това действие."</string>
@@ -1887,7 +1887,7 @@
     <string name="force_stop_dlg_text" msgid="7435245769456493398">"Ако принудително спрете приложение, то може да не функционира правилно."</string>
     <string name="app_install_location_title" msgid="5121617802063021720">"Предпочитано място за инсталиране"</string>
     <string name="app_install_location_summary" msgid="109719780117187797">"Промяна на предпочитаното място за инсталиране на нови приложения"</string>
-    <string name="app_disable_dlg_positive" msgid="5508828271100168073">"Деактивиране на приложението"</string>
+    <string name="app_disable_dlg_positive" msgid="5508828271100168073">"Деактивиране"</string>
     <string name="app_disable_dlg_text" msgid="9221864774943530281">"Ако деактивирате това приложение, Android и други приложения може да спрат да работят както трябва. Имайте предвид, че не можете да изтриете това приложение, тъй като е предварително инсталирано на устройството ви. Като деактивирате приложението, го изключвате и скривате на устройството си."</string>
     <string name="app_disable_notifications_dlg_title" msgid="699530661413553928">"Да се изключат ли известията?"</string>
     <string name="app_install_details_group_title" msgid="2909597319422976921">"App Store"</string>
@@ -3285,7 +3285,7 @@
     <string name="work_use_personal_sounds_summary" msgid="2886871383995187441">"Звуците за служебния и личния потребителски профил са едни и същи"</string>
     <string name="work_ringtone_title" msgid="5499360583947410224">"Служебна мелодия на телефона"</string>
     <string name="work_notification_ringtone_title" msgid="8059159087214025757">"Стандартен звук за служебните известия"</string>
-    <string name="work_alarm_ringtone_title" msgid="5328487181385375130">"Стандартен звук за служебните будилници"</string>
+    <string name="work_alarm_ringtone_title" msgid="5328487181385375130">"Стандартен звук за служебните аларми"</string>
     <string name="work_sound_same_as_personal" msgid="7728560881697159758">"Като за личния потребителски профил"</string>
     <string name="work_sync_dialog_title" msgid="4799120971202956837">"Да се заменят ли звуците?"</string>
     <string name="work_sync_dialog_yes" msgid="2110726233746476066">"Замяна"</string>
diff --git a/tests/CarDeveloperOptions/res/values-bn/strings.xml b/tests/CarDeveloperOptions/res/values-bn/strings.xml
index 2f6b1b5..770dc62 100644
--- a/tests/CarDeveloperOptions/res/values-bn/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-bn/strings.xml
@@ -719,7 +719,7 @@
     </plurals>
     <string name="manage_trust_agents" msgid="8129970926213142261">"বিশ্বস্ত এজেন্ট"</string>
     <string name="disabled_because_no_backup_security" msgid="8127039979909203528">"ব্যবহার করার জন্য প্রথমে একটি স্ক্রিন লক সেট করুন"</string>
-    <string name="manage_trust_agents_summary" msgid="2023116850759962248">"কোনো কিছুই নয়"</string>
+    <string name="manage_trust_agents_summary" msgid="2023116850759962248">"কোনও কিছুই নয়"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="5550538038916606097">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g>টি সক্রিয় বিশ্বস্ত এজেন্ট</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g>টি সক্রিয় বিশ্বস্ত এজেন্ট</item>
@@ -1168,7 +1168,7 @@
     <string name="accessibility_category_personal" msgid="1423427301759058762">"ব্যক্তিগত প্রোফাইল অ্যাকাউন্টগুলি"</string>
     <string name="accessibility_work_account_title" msgid="3195468574776888011">"কাজের অ্যাকাউন্ট - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_personal_account_title" msgid="7251761883688839354">"ব্যক্তিগত অ্যাকাউন্ট - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
-    <string name="search_settings" msgid="5809250790214921377">"সার্চ"</string>
+    <string name="search_settings" msgid="5809250790214921377">"Search"</string>
     <string name="display_settings" msgid="1045535829232307190">"ডিসপ্লে"</string>
     <string name="accelerometer_title" msgid="2427487734964971453">"অটো-রোটেট স্ক্রিন"</string>
     <string name="color_mode_title" msgid="8164858320869449142">"রঙ"</string>
@@ -1450,7 +1450,7 @@
     <string name="storage_internal_forget_confirm_title" msgid="331032276130605241">"<xliff:g id="NAME">^1</xliff:g> ভুলতে চান?"</string>
     <string name="storage_internal_forget_confirm" msgid="3052483375203727176">"<xliff:g id="NAME">^1</xliff:g> -এ সঞ্চিত সমস্ত অ্যাপ্লিকেশন, ফটো, এবং ডেটা চিরতরে হারিয়ে যাবে।"</string>
     <string name="storage_detail_apps" msgid="8154648512504196820">"অ্যাপ"</string>
-    <string name="storage_detail_images" msgid="6996202225684468964">"ছবি"</string>
+    <string name="storage_detail_images" msgid="6996202225684468964">"Images"</string>
     <string name="storage_detail_videos" msgid="6030983354721080849">"ভিডিও"</string>
     <string name="storage_detail_audio" msgid="6011098436589663944">"অডিও"</string>
     <string name="storage_detail_cached" msgid="5761648455067920683">"ক্যাশে করা ডেটা"</string>
@@ -1570,9 +1570,9 @@
     <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">"ওয়াই-ফাই, মোবাইল ও ব্লুটুথ রিসেট"</string>
+    <string name="reset_network_title" msgid="8944059136930806211">"ওয়াই-ফাই, মোবাইল ও ব্লুটুথ রিসেট করুন"</string>
     <string name="reset_network_desc" msgid="4982633363916261109">"এগুলি সহ সমস্ত নেটওয়ার্ক সেটিংস আবার সেট করবে:\n\n"<li>"ওয়াই ফাই "</li>\n<li>"সেলুলার ডাটা "</li>\n<li>"ব্লুটুথ"</li></string>
-    <string name="reset_esim_title" msgid="7630781767040831893">"ডাউনলোড করা সিম মুছে ফেলা"</string>
+    <string name="reset_esim_title" msgid="7630781767040831893">"ডাউনলোড করা সিম মুছে ফেলুন"</string>
     <string name="reset_esim_desc" msgid="433226911566802">"পরিবর্ত সিম ডাউনলোড করতে আপনার পরিষেবা প্রদানকারীর সাথে যোগাযোগ করুন। এটি মোবাইল পরিষেবার কোনও প্ল্যান বাতিল করবে না।"</string>
     <string name="reset_network_button_text" msgid="4293271046867912819">"সেটিংস রিসেট করুন"</string>
     <string name="reset_network_final_desc" msgid="2463817067048751373">"সব নেটওয়ার্ক সেটিংস রিসেট করবেন? আগের সেটিংসে আর ফিরে যেতে পারবেন না।"</string>
@@ -1890,7 +1890,7 @@
     <string name="app_disable_dlg_positive" msgid="5508828271100168073">"অ্যাপ্লিকেশান অক্ষম করুন"</string>
     <string name="app_disable_dlg_text" msgid="9221864774943530281">"আপনি এই অ্যাপ বন্ধ করে দিলে, Android এবং অন্যান্য অ্যাপ যেভাবে কাজ করার কথা সেইভাবে আর নাও কাজ করতে পারে। মনে রাখবেন যে এই অ্যাপ আপনার ডিভাইসে আগে থেকেই ইনস্টল করা আছে বলে এটি আপনি মুছে ফেলতে পারবেন না। বন্ধ করার মাধ্যমে, আপনি অ্যাপটিকে বন্ধ করে লুকিয়ে রাখতে পারেন।"</string>
     <string name="app_disable_notifications_dlg_title" msgid="699530661413553928">"বিজ্ঞপ্তিগুলি বন্ধ করবেন?"</string>
-    <string name="app_install_details_group_title" msgid="2909597319422976921">"স্টোর"</string>
+    <string name="app_install_details_group_title" msgid="2909597319422976921">"Store"</string>
     <string name="app_install_details_title" msgid="6954953384372934881">"অ্যাপের বিশদ বিবরণ"</string>
     <string name="app_install_details_summary" msgid="6612222941121363940">"অ্যাপটিকে <xliff:g id="APP_STORE">%1$s</xliff:g> থেকে ইনস্টল করা হয়েছে"</string>
     <string name="instant_app_details_summary" msgid="6384264315914966114">"<xliff:g id="APP_STORE">%1$s</xliff:g> সম্পর্কে আরও তথ্য"</string>
@@ -2211,7 +2211,7 @@
     <string name="print_feature_state_off" msgid="208580346723223688">"বন্ধ করুন"</string>
     <string name="print_menu_item_add_service" msgid="6803000110578493782">"পরিষেবা যোগ করুন"</string>
     <string name="print_menu_item_add_printer" msgid="8529196211179574921">"প্রিন্টার যোগ করুন"</string>
-    <string name="print_menu_item_search" msgid="1165316329772287360">"সার্চ করুন"</string>
+    <string name="print_menu_item_search" msgid="1165316329772287360">"Search"</string>
     <string name="print_searching_for_printers" msgid="6538687129687642542">"প্রিন্টার খোঁজা হচ্ছে"</string>
     <string name="print_service_disabled" msgid="6376344992705893436">"পরিষেবা অক্ষমিত"</string>
     <string name="print_print_jobs" msgid="7357841034181762157">"প্রিন্ট কাজগুলি"</string>
diff --git a/tests/CarDeveloperOptions/res/values-bs/arrays.xml b/tests/CarDeveloperOptions/res/values-bs/arrays.xml
index 220dbb9..f1ec36d 100644
--- a/tests/CarDeveloperOptions/res/values-bs/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-bs/arrays.xml
@@ -72,7 +72,7 @@
     <item msgid="5848277343965362748">"Autentifikacija..."</item>
     <item msgid="3391238031431440676">"Dobivanje IP adrese…"</item>
     <item msgid="5257597310494000224">"Povezano"</item>
-    <item msgid="8472497592913050396">"Suspendirano"</item>
+    <item msgid="8472497592913050396">"Obustavljeno"</item>
     <item msgid="1228072488815999109">"Prekidanje veze…"</item>
     <item msgid="7253087004422991731">"Isključena"</item>
     <item msgid="4169850917304751227">"Neuspješno"</item>
@@ -86,7 +86,7 @@
     <item msgid="7547609081339573756">"Autentifikacija s mrežom <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="5145158315060185414">"Dohvaćanje IP adrese s mreže <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="3283243151651124831">"Povezano s mrežom <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
-    <item msgid="6600156231416890902">"Suspendirano"</item>
+    <item msgid="6600156231416890902">"Obustavljeno"</item>
     <item msgid="4133290864821295785">"Prekidanje veze s mrežom <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="3980154971187953257">"Isključena"</item>
     <item msgid="2847316776634969068">"Neuspješno"</item>
@@ -202,13 +202,13 @@
     <item msgid="3778273775365258534">"IS95A"</item>
   </string-array>
   <string-array name="mvno_type_entries">
-    <item msgid="6984770764726663331">"Nema"</item>
+    <item msgid="6984770764726663331">"Ništa"</item>
     <item msgid="1469208769491004112">"SPN"</item>
     <item msgid="7556656048009090524">"IMSI"</item>
     <item msgid="8636516530542473799">"GID"</item>
   </string-array>
   <string-array name="app_install_location_entries">
-    <item msgid="6621866711026016227">"Interna pohrana uređaja"</item>
+    <item msgid="6621866711026016227">"Unutrašnja pohrana uređaja"</item>
     <item msgid="3186681694079967527">"Izmjenjiva SD kartica"</item>
     <item msgid="6902033473986647035">"Neka sistem odluči"</item>
   </string-array>
diff --git a/tests/CarDeveloperOptions/res/values-bs/strings.xml b/tests/CarDeveloperOptions/res/values-bs/strings.xml
index 8b2ff8d..0e1fd33 100644
--- a/tests/CarDeveloperOptions/res/values-bs/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-bs/strings.xml
@@ -67,7 +67,7 @@
     <string name="radioInfo_data_disconnected" msgid="5311119240521915279">"Isključena"</string>
     <string name="radioInfo_data_connecting" msgid="47095003276717745">"Povezivanje"</string>
     <string name="radioInfo_data_connected" msgid="3755289851642913750">"Povezano"</string>
-    <string name="radioInfo_data_suspended" msgid="5013451375409737795">"Suspendirano"</string>
+    <string name="radioInfo_data_suspended" msgid="5013451375409737795">"Obustavljeno"</string>
     <string name="radioInfo_unknown" msgid="3148839102896278859">"Nepoznato"</string>
     <string name="radioInfo_display_packets" msgid="5472652398031589527">"paketi"</string>
     <string name="radioInfo_display_bytes" msgid="2357292401820837630">"bajtova"</string>
@@ -124,7 +124,7 @@
     <string name="bluetooth_device" msgid="3170974107364990008">"Neimenovani Bluetooth uređaj"</string>
     <string name="progress_scanning" msgid="633923400401041181">"Pretraživanje"</string>
     <string name="bluetooth_no_devices_found" msgid="4396050022213494322">"Nema Bluetooth uređaja u blizini."</string>
-    <string name="bluetooth_notif_ticker" msgid="8398481099943141819">"Zahtjev za Bluetooth uparivanje"</string>
+    <string name="bluetooth_notif_ticker" msgid="8398481099943141819">"Zahtjev za uparivanje putem Bluetootha"</string>
     <string name="bluetooth_notif_title" msgid="5090288898529286011">"Zahtjev za uparivanje"</string>
     <string name="bluetooth_notif_message" msgid="6612367890895077938">"Dodirnite za spajanje s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5060846395852236652">"Primljeni fajlovi"</string>
@@ -253,7 +253,7 @@
     <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="5419085128792417589">"USB pohrana nije aktivirana."</string>
     <string name="sdcard_settings_not_present_status" product="default" msgid="5831286239151349794">"Nema SD kartice."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="2392868635606041278">"Dostupno bajtova:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="5888349723543445382">"USB memorija se koristi kao uređaj za masovnu pohranu."</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="5888349723543445382">"USB pohrana se koristi kao uređaj za masovnu pohranu."</string>
     <string name="sdcard_settings_mass_storage_status" product="default" msgid="637014061735266364">"SD kartica se koristi kao uređaj za masovnu pohranu."</string>
     <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="1489916516292644696">"Sigurno je izbaciti USB."</string>
     <string name="sdcard_settings_unmounted_status" product="default" msgid="6250598657624241686">"Sada je sigurno ukloniti SD karticu."</string>
@@ -278,8 +278,8 @@
     <string name="dlg_remove_locales_error_title" msgid="9090578326002163975">"Ne mogu se ukloniti svi jezici"</string>
     <string name="dlg_remove_locales_error_message" msgid="6799897638891903618">"Zadržite najmanje jedan preferirani jezik"</string>
     <string name="locale_not_translated" msgid="7943669576006420058">"Možda nije dostupno u nekim aplikacijama"</string>
-    <string name="action_drag_label_move_up" msgid="2074064283966078352">"Pomjeri prema gore"</string>
-    <string name="action_drag_label_move_down" msgid="1367989732445492291">"Pomjeri prema dolje"</string>
+    <string name="action_drag_label_move_up" msgid="2074064283966078352">"Pomjeri nagore"</string>
+    <string name="action_drag_label_move_down" msgid="1367989732445492291">"Pomjeri nadolje"</string>
     <string name="action_drag_label_move_top" msgid="2033098833739345957">"Pomjeri na vrh"</string>
     <string name="action_drag_label_move_bottom" msgid="5583190721915611567">"Pomjeri na dno"</string>
     <string name="action_drag_label_remove" msgid="3362982836323040394">"Ukloni jezik"</string>
@@ -456,9 +456,9 @@
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7553945981266845264">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj tablet ako ga izgubite, ako vam ga ukradu ili ga vratite na početne postavke."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="1378243257238015603">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj uređaj ako ga izgubite, ako vam ga ukradu ili ga vratite na početne postavke."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="8395540117461339748">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj telefon ako ga izgubite, ako vam ga ukradu ili ga vratite na početne postavke."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="7572334562915795226">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj tablet ako ga izgubite ili vam ga ukradu."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3819285334459763813">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj uređaj ako ga izgubite ili vam ga ukradu."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="5361573789585652826">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj telefon ako ga izgubite ili vam ga ukradu."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="7572334562915795226">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj tablet ako ga izgubite ili ga neko ukrade."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3819285334459763813">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj uređaj ako ga izgubite ili ga neko ukrade."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="5361573789585652826">"Funkcije za zaštitu uređaja neće se uključiti. Nećete moći spriječiti druge osobe da koriste ovaj telefon ako ga izgubite ili ga neko ukrade."</string>
     <string name="skip_anyway_button_label" msgid="4437815969645175429">"Ipak preskoči"</string>
     <string name="go_back_button_label" msgid="7310586887969860472">"Nazad"</string>
     <string name="skip_lock_screen_dialog_button_label" msgid="6706047245716780006">"Preskoči"</string>
@@ -478,12 +478,12 @@
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="1473280156532146933">"Uradit ću to kasnije"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="2816424026528101690">"Preskočiti postavljanje otiska prsta?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="8139299964344809780">"Odabrali ste da koristite otisak prsta kao jedan od načina za otključavanja telefona. Ukoliko sada preskočite ovaj korak, morat ćete ga postaviti kasnije. Postavka traje otprilike samo jednu minutu."</string>
-    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="tablet" msgid="1384438077720821127">"Zaštitite tablet zaključavanjem ekrana tako da ga niko ne može koristiti ako ga izgubite ili vam ga ukradu. Zaključavanje ekrana vam je potrebno i za postavljanje otiska prsta. Dodirnite Otkaži, a zatim postavite PIN ili odaberite drugu opciju zaključavanja ekrana."</string>
-    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="device" msgid="7207112623501771824">"Zaštitite uređaj zaključavanjem ekrana tako da ga niko ne može koristiti ako ga izgubite ili vam ga ukradu. Zaključavanje ekrana vam je potrebno i za postavljanje otiska prsta. Dodirnite Otkaži, a zatim postavite PIN ili odaberite drugu opciju zaključavanja ekrana."</string>
-    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="default" msgid="7623975730623531606">"Zaštitite telefon zaključavanjem ekrana tako da ga niko ne može koristiti ako ga izgubite ili vam ga ukradu. Zaključavanje ekrana vam je potrebno i za postavljanje otiska prsta. Dodirnite Otkaži, a zatim postavite PIN ili odaberite drugu opciju zaključavanja ekrana."</string>
-    <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Zaštitite tablet zaključavanjem ekrana tako da ga niko ne može koristiti ako ga izgubite ili vam ga ukradu. Zaključavanje ekrana vam je potrebno i za postavljanje autentifikacije licem. Dodirnite Otkaži, a zatim postavite PIN ili odaberite drugu opciju zaključavanja ekrana."</string>
-    <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Zaštitite uređaj zaključavanjem ekrana tako da ga niko ne može koristiti ako ga izgubite ili vam ga ukradu. Zaključavanje ekrana vam je potrebno i za postavljanje autentifikacije licem. Dodirnite Otkaži, a zatim postavite PIN ili odaberite drugu opciju zaključavanja ekrana."</string>
-    <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Zaštitite telefon zaključavanjem ekrana tako da ga niko ne može koristiti ako ga izgubite ili vam ga ukradu. Zaključavanje ekrana vam je potrebno i za postavljanje autentifikacije licem. Dodirnite Otkaži, a zatim postavite PIN ili odaberite drugu opciju zaključavanja ekrana."</string>
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="tablet" msgid="1384438077720821127">"Zaštitite tablet zaključavanjem ekrana tako da ga niko ne može koristiti ako ga izgubite ili ga neko ukrade. Zaključavanje ekrana vam je potrebno i za postavljanje otiska prsta. Dodirnite Otkaži, a zatim postavite PIN ili odaberite drugu opciju zaključavanja ekrana."</string>
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="device" msgid="7207112623501771824">"Zaštitite uređaj zaključavanjem ekrana tako da ga niko ne može koristiti ako ga izgubite ili ga neko ukrade. Zaključavanje ekrana vam je potrebno i za postavljanje otiska prsta. Dodirnite Otkaži, a zatim postavite PIN ili odaberite drugu opciju zaključavanja ekrana."</string>
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="default" msgid="7623975730623531606">"Zaštitite telefon zaključavanjem ekrana tako da ga niko ne može koristiti ako ga izgubite ili ga neko ukrade. Zaključavanje ekrana vam je potrebno i za postavljanje otiska prsta. Dodirnite Otkaži, a zatim postavite PIN ili odaberite drugu opciju zaključavanja ekrana."</string>
+    <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Zaštitite tablet zaključavanjem ekrana tako da ga niko ne može koristiti ako ga izgubite ili ga neko ukrade. Zaključavanje ekrana vam je potrebno i za postavljanje autentifikacije licem. Dodirnite Otkaži, a zatim postavite PIN ili odaberite drugu opciju zaključavanja ekrana."</string>
+    <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Zaštitite uređaj zaključavanjem ekrana tako da ga niko ne može koristiti ako ga izgubite ili ga neko ukrade. Zaključavanje ekrana vam je potrebno i za postavljanje autentifikacije licem. Dodirnite Otkaži, a zatim postavite PIN ili odaberite drugu opciju zaključavanja ekrana."</string>
+    <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Zaštitite telefon zaključavanjem ekrana tako da ga niko ne može koristiti ako ga izgubite ili ga neko ukrade. Zaključavanje ekrana vam je potrebno i za postavljanje autentifikacije licem. Dodirnite Otkaži, a zatim postavite PIN ili odaberite drugu opciju zaključavanja ekrana."</string>
     <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Preskočiti postavljanje PIN-a?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Preskočiti postavljanje lozinke?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Preskočiti postavljanje uzorka?"</string>
@@ -583,12 +583,12 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="886426673328906002">"Otisak prsta i PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="3325527833422156515">"Otisak prsta i lozinka"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="2063700014903801639">"Nastavi bez postavljanja otiska prsta"</string>
-    <string name="fingerprint_unlock_title" msgid="8009992449332532869">"Možete otključati telefon pomoću otiska prsta. Iz sigurnosnih razloga, ova opcija zahtijeva alternativni način zaključavanja ekrana."</string>
+    <string name="fingerprint_unlock_title" msgid="8009992449332532869">"Možete otključati telefon pomoću otiska prsta. Iz sigurnosnih razloga ova opcija zahtijeva alternativni način zaključavanja ekrana."</string>
     <string name="face_unlock_set_unlock_pattern" msgid="3748596996869406905">"Autentifikacija licem + uzorak"</string>
     <string name="face_unlock_set_unlock_pin" msgid="3320824093518497476">"Autentifikacija licem + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8962344604388383659">"Autentifikacija licem + lozinka"</string>
     <string name="face_unlock_skip_face" msgid="7173197040501143880">"Nastavi bez autentifikacije licem"</string>
-    <string name="face_unlock_title" msgid="1298031162909236127">"Možete otključati telefon pomoću svog lica. Iz sigurnosnih razloga, ova opcija zahtijeva alternativni način zaključavanja ekrana."</string>
+    <string name="face_unlock_title" msgid="1298031162909236127">"Možete otključati telefon pomoću svog lica. Iz sigurnosnih razloga ova opcija zahtijeva alternativni način zaključavanja ekrana."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="1713159782896140817">"Onemogućio administrator, pravila šifriranja ili pohrana akreditiva"</string>
     <string name="unlock_set_unlock_mode_off" msgid="2950701212659081973">"Ništa"</string>
     <string name="unlock_set_unlock_mode_none" msgid="3441605629077912292">"Prevlačenje prstom"</string>
@@ -719,7 +719,7 @@
     <string name="lockpassword_password_recently_used" msgid="6944729699375087431">"Administrator uređaja ne dozvoljava korištenje nedavne lozinke"</string>
     <string name="lockpassword_password_blacklisted_by_admin" msgid="4988166770148440755">"Vaš IT administrator je blokirao česte lozinke. Probajte drugu lozinku."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="3902387296149848324">"Nije dozvoljen rastući, opadajući ili ponavljajući niz cifara"</string>
-    <string name="lockpassword_confirm_label" msgid="1512364313516715624">"Potvrdi"</string>
+    <string name="lockpassword_confirm_label" msgid="1512364313516715624">"Potvrdite"</string>
     <string name="lockpassword_cancel_label" msgid="3799907375604482766">"Otkaži"</string>
     <string name="lockpassword_clear_label" msgid="3201458533657963554">"Obriši"</string>
     <string name="lockpassword_credential_changed" msgid="5183961439209866170">"Zaključavanje ekrana je već promijenjeno. Pokušajte ponovo s novim zaključavanjem ekrana."</string>
@@ -735,7 +735,7 @@
     </plurals>
     <string name="manage_trust_agents" msgid="8129970926213142261">"Pouzdani agenti"</string>
     <string name="disabled_because_no_backup_security" msgid="8127039979909203528">"Da biste ovo koristili, prvo postavite zaključavanje ekrana"</string>
-    <string name="manage_trust_agents_summary" msgid="2023116850759962248">"Nema"</string>
+    <string name="manage_trust_agents_summary" msgid="2023116850759962248">"Ništa"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="5550538038916606097">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> aktivni pouzdani agent</item>
       <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> aktivna pouzdana agenta</item>
@@ -747,7 +747,7 @@
     <string name="bluetooth_settings_title" msgid="7261244857456521825">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="1221689092429277887">"Upravljajte vezama, postavite ime uređaja i vidljivost"</string>
     <string name="bluetooth_pairing_request" msgid="7221745525632573125">"Upariti s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
-    <string name="bluetooth_pairing_key_msg" msgid="1139230917419961975">"Kod za Bluetooth uparivanje"</string>
+    <string name="bluetooth_pairing_key_msg" msgid="1139230917419961975">"Kod za uparivanje putem Bluetootha"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="6205151011298670207">"Upišite kod za uparivanje, zatim pritisnite Return ili Enter"</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="9138308197078115672">"PIN sadrži slova ili simbole"</string>
     <string name="bluetooth_pin_values_hint" msgid="8044671726261326240">"Obično 0000 ili 1234"</string>
@@ -826,7 +826,7 @@
     <string name="wifi_display_options_title" msgid="4587264519668872213">"Opcije Bežičnog prikaza"</string>
     <string name="wifi_display_options_forget" msgid="7882982544626742073">"Zaboraviti"</string>
     <string name="wifi_display_options_done" msgid="5922060890309265817">"Gotovo"</string>
-    <string name="wifi_display_options_name" msgid="8477627781133827607">"Ime"</string>
+    <string name="wifi_display_options_name" msgid="8477627781133827607">"Naziv"</string>
     <string name="wifi_band_24ghz" msgid="2973143764653628618">"2,4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6469832209748522207">"5 GHz"</string>
     <string name="wifi_sign_in_button_text" msgid="7573695522292386360">"Prijava"</string>
@@ -1381,7 +1381,7 @@
     <string name="status_serial_number" msgid="8257722124627415159">"Serijski broj"</string>
     <string name="status_up_time" msgid="77128395333934087">"Vrijeme aktivnosti"</string>
     <string name="status_awake_time" msgid="1251959094010776954">"Vrijeme aktivnosti"</string>
-    <string name="internal_memory" msgid="8632841998435408869">"Interna pohrana"</string>
+    <string name="internal_memory" msgid="8632841998435408869">"Unutrašnja pohrana"</string>
     <string name="sd_memory" product="nosdcard" msgid="1377713983817298275">"USB pohrana"</string>
     <string name="sd_memory" product="default" msgid="8242711740477072757">"SD kartica"</string>
     <string name="memory_available" msgid="7135654170847536323">"Dostupno"</string>
@@ -1407,7 +1407,7 @@
     <string name="sd_mount_summary" product="default" msgid="6849124618494311233"></string>
     <string name="sd_format" product="nosdcard" msgid="918370986254863144">"Izbriši USB pohranu"</string>
     <string name="sd_format" product="default" msgid="1346245995138883960">"Izbriši SD karticu"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1179857727779521920">"Briše sve podatke na internoj USB pohrani, kao što su muzika i fotografije"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="1179857727779521920">"Briše sve podatke na unutrašnjoj USB pohrani, kao što su muzika i fotografije"</string>
     <string name="sd_format_summary" product="default" msgid="4284028411908176234">"Briše sve podatke na SD kartici, kao što su muzika i fotografije"</string>
     <string name="memory_clear_cache_title" msgid="4306793268129306684">"Želite li zbrisati keširane podatke?"</string>
     <string name="memory_clear_cache_message" msgid="6723120398411410031">"Ovo briše keširane podatke za sve aplikacije."</string>
@@ -1418,7 +1418,7 @@
     <string name="dlg_confirm_unmount_text" product="default" msgid="4099391737780732622">"Ako deaktivirate SD karticu, neke aplikacije koje koristite će prestati raditi i može se desiti da budu nedostupne dok ponovo ne aktivirate SD karticu."</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 memorija se ne može isključiti. Pokušajte ponovo kasnije."</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="4710773826053117136">"USB pohrana se ne može isključiti. Pokušajte ponovo kasnije."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="8243603872321575219">"Nije bilo moguće odvojiti SD karticu. Pokušajte ponovo kasnije."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="2460118115494815052">"USB pohrana će biti deaktivirana."</string>
     <string name="unmount_inform_text" product="default" msgid="6467461731634304997">"SD kartica će biti deaktivirana."</string>
@@ -1482,9 +1482,9 @@
     <string name="storage_wizard_init_title" msgid="3407283236421089014">"Podesite uređaj <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="6853250619674645478">"Koristiti kao prijenosnu memoriju"</string>
     <string name="storage_wizard_init_external_summary" msgid="6993815290050489327">"Za premještanje fotografija i drugih medija s jednog uređaja na drugi."</string>
-    <string name="storage_wizard_init_internal_title" msgid="8750856962785644870">"Koristi kao unutrašnju memoriju"</string>
+    <string name="storage_wizard_init_internal_title" msgid="8750856962785644870">"Koristi kao unutrašnju pohranu"</string>
     <string name="storage_wizard_init_internal_summary" msgid="4510546464921608029">"Za memorisanje bilo čega samo na ovaj uređaj uključujući aplikacije i fotografije. Zahtijeva formatiranje koje sprečavaju da radi sa drugim uređajima."</string>
-    <string name="storage_wizard_format_confirm_title" msgid="7785358616068633439">"Formatirajte kao unutr. memoriju"</string>
+    <string name="storage_wizard_format_confirm_title" msgid="7785358616068633439">"Formatirajte kao unutr. pohranu"</string>
     <string name="storage_wizard_format_confirm_body" msgid="4107762933332992624">"To zahtijeva da <xliff:g id="NAME_0">^1</xliff:g> bude formatirana da bi bila sigurna.\n\nNakon formatiranja, ova <xliff:g id="NAME_1">^1</xliff:g> će raditi samo na ovom uređaju. \n\n"<b>"Formatiranje briše sve podatke koji se trenutno na njoj nalaze <xliff:g id="NAME_2">^1</xliff:g>."</b>" Da biste izbjegli gubljenje podataka, razmotrite kreiranje sigurnosne kopije."</string>
     <string name="storage_wizard_format_confirm_public_title" msgid="5866830103788091426">"Formatirajte kao pren. memoriju"</string>
     <string name="storage_wizard_format_confirm_public_body" msgid="1451308701654703353">"Ovo zahtijeva da se <xliff:g id="NAME_0">^1</xliff:g> formatira. \n\n"<b>"Formatiranjem se brišu svi podaci trenutno pohranjeni na uređaju <xliff:g id="NAME_1">^1</xliff:g>."</b>" Da ne biste izgubili podatke, razmislite o kreiranju sigurnosne kopije."</string>
@@ -1492,7 +1492,7 @@
     <string name="storage_wizard_format_progress_title" msgid="6905902731208646436">"Formatiranje <xliff:g id="NAME">^1</xliff:g>..."</string>
     <string name="storage_wizard_format_progress_body" msgid="5346709539457190419">"Nemojte uklanjati pohranu <xliff:g id="NAME">^1</xliff:g> dok se formatira."</string>
     <string name="storage_wizard_migrate_title" msgid="7440473364104826496">"Premjestite pod. u novu memoriju"</string>
-    <string name="storage_wizard_migrate_body" msgid="4959356431201831339">"Možete premjestiti slike, fajlove i neke aplikacije na novi uređaj <xliff:g id="NAME">^1</xliff:g>. \n\nPremještanje traje otprilike <xliff:g id="TIME">^2</xliff:g> te će osloboditi <xliff:g id="SIZE">^3</xliff:g> unutrašnje memorije. Neke aplikacije neće funkcionirati dok je ovo u toku."</string>
+    <string name="storage_wizard_migrate_body" msgid="4959356431201831339">"Možete premjestiti slike, fajlove i neke aplikacije na novi uređaj <xliff:g id="NAME">^1</xliff:g>. \n\nPremještanje traje otprilike <xliff:g id="TIME">^2</xliff:g> te će osloboditi <xliff:g id="SIZE">^3</xliff:g> unutrašnje pohrane. Neke aplikacije neće funkcionirati dok je ovo u toku."</string>
     <string name="storage_wizard_migrate_now" msgid="9004605853000689024">"Premjesti sada"</string>
     <string name="storage_wizard_migrate_later" msgid="5303070653970922924">"Premjesti kasnije"</string>
     <string name="storage_wizard_migrate_confirm_title" msgid="5768497751644935313">"Premjesti podatke sada"</string>
@@ -1537,12 +1537,12 @@
     <string name="storage_wizard_migrate_v2_later" msgid="4909412563144649085">"Premjesti sadržaj kasnije"</string>
     <string name="storage_wizard_migrate_progress_v2_title" msgid="1796255772658203586">"Premještanje sadržaja…"</string>
     <string name="storage_wizard_slow_v2_title" msgid="4662009769135525740">"Spora pohrana <xliff:g id="NAME">^1</xliff:g>"</string>
-    <string name="storage_wizard_slow_v2_body" msgid="4443996335261861797">"I dalje možete koristiti uređaj <xliff:g id="NAME_0">^1</xliff:g>, ali može biti spor. \n\nAplikacije pohranjene na pohrani <xliff:g id="NAME_1">^2</xliff:g> možda neće raditi ispravno, a prijenos sadržaja može dugo trajati. \n\nPokušajte koristiti bržu pohranu <xliff:g id="NAME_2">^3</xliff:g> ili koristite <xliff:g id="NAME_3">^4</xliff:g> kao prenosivu pohranu."</string>
+    <string name="storage_wizard_slow_v2_body" msgid="4443996335261861797">"I dalje možete koristiti uređaj <xliff:g id="NAME_0">^1</xliff:g>, ali može biti spor. \n\nAplikacije pohranjene na uređaju za pohranu <xliff:g id="NAME_1">^2</xliff:g> možda neće raditi ispravno, a prijenos sadržaja može dugo trajati. \n\nPokušajte koristiti brži uređaj za pohranu <xliff:g id="NAME_2">^3</xliff:g> ili koristite ovaj uređaj <xliff:g id="NAME_3">^4</xliff:g> kao prenosivu pohranu."</string>
     <string name="storage_wizard_slow_v2_start_over" msgid="1686964124972424100">"Počni ispočetka"</string>
     <string name="storage_wizard_slow_v2_continue" msgid="2320238517431613392">"Nastavi"</string>
-    <string name="storage_wizard_ready_v2_external_body" msgid="5803422587027895664">"Sadržaj možete premjestiti na pohranu <xliff:g id="NAME">^1</xliff:g>"</string>
-    <string name="storage_wizard_ready_v2_internal_body" msgid="678829432420351228">"Da premjestite sadržaj na pohranu <xliff:g id="NAME">^1</xliff:g>, idite u "<b>"Postavke &gt; Pohrana"</b></string>
-    <string name="storage_wizard_ready_v2_internal_moved_body" msgid="4133133596316768033">"Sadržaj je premješten na pohranu <xliff:g id="NAME_0">^1</xliff:g>. \n\nDa upravljate ovom pohranom <xliff:g id="NAME_1">^2</xliff:g>, idite u "<b>"Postavke &gt; Pohrana"</b>"."</string>
+    <string name="storage_wizard_ready_v2_external_body" msgid="5803422587027895664">"Sadržaj možete premjestiti na uređaj za pohranu <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_ready_v2_internal_body" msgid="678829432420351228">"Da premjestite sadržaj na uređaj za pohranu <xliff:g id="NAME">^1</xliff:g>, idite u "<b>"Postavke &gt; Pohrana"</b></string>
+    <string name="storage_wizard_ready_v2_internal_moved_body" msgid="4133133596316768033">"Sadržaj je premješten na uređaj za pohranu <xliff:g id="NAME_0">^1</xliff:g>. \n\nDa upravljate uređajem za pohranu <xliff:g id="NAME_1">^2</xliff:g>, idite u "<b>"Postavke &gt; Pohrana"</b>"."</string>
     <string name="battery_status_title" msgid="8731200319740671905">"Status baterije"</string>
     <string name="battery_level_title" msgid="5207775387973771646">"Nivo napunjenosti baterije"</string>
     <string name="apn_settings" msgid="8130776653826271664">"APN-ovi"</string>
@@ -1602,20 +1602,20 @@
     <string name="reset_network_complete_toast" msgid="128225929536005495">"Postavke mreže vraćene su na zadano"</string>
     <string name="reset_esim_error_title" msgid="4728931209471875632">"Nije moguće izbrisati SIM-ove"</string>
     <string name="reset_esim_error_msg" msgid="4716366079119742235">"Preuzete SIM-ove nije moguće izbrisati zbog greške.\n\nPonovo pokrenite uređaj i pokušajte ponovo."</string>
-    <string name="master_clear_title" msgid="1560712943955904673">"Izbriši sve podatke (vraćanje na fabričke postavke)"</string>
-    <string name="master_clear_short_title" msgid="919098101581335101">"Potpuno izbriši sve podatke"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3432373610755760899">"Na ovaj način će se izbrisati svi podaci "<b>"interne memorije"</b>" tableta, uključujući:\n\n"<li>"Google račun"</li>\n<li>"sistemske i aplikacijske podatke i postavke"</li>\n<li>"preuzete aplikacije"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8765543541962866697">"Na ovaj način će se izbrisati svi podaci "<b>"interne memorije"</b>" telefona, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podatke i postavke sistema i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
+    <string name="master_clear_title" msgid="1560712943955904673">"Izbriši sve podatke (vrati na fabričke postavke)"</string>
+    <string name="master_clear_short_title" msgid="919098101581335101">"Izbriši sve podatke"</string>
+    <string name="master_clear_desc" product="tablet" msgid="3432373610755760899">"Na ovaj način će se izbrisati svi podaci "<b>"unutrašnje pohrane"</b>" tableta, uključujući:\n\n"<li>"Google račun"</li>\n<li>"sistemske i aplikacijske podatke i postavke"</li>\n<li>"preuzete aplikacije"</li></string>
+    <string name="master_clear_desc" product="default" msgid="8765543541962866697">"Na ovaj način će se izbrisati svi podaci "<b>"unutrašnje pohrane"</b>" telefona, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podatke i postavke sistema i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
     <string name="master_clear_accounts" product="default" msgid="3432884235445405376">\n\n"Trenutno ste prijavljeni u sljedeće račune:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5993259656117566767">\n\n"Drugi korisnici su prisutni na ovom uređaju.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="3947303501615091903"><li>"muziku"</li>\n<li>"fotografije"</li>\n<li>"ostale korisničke podatke"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="4497260499055258773"><li>"eSIM kartice"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="4497260499055258773"><li>"eSIM-ove"</li></string>
     <string name="master_clear_desc_no_cancel_mobile_plan" msgid="6072668588881679461">\n\n"Ovim se neće otkazati vaš plan usluga mobilnog operatera."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="2723272952715259307">\n\n"Da biste izbrisali muziku, slike i ostale korisničke podatke, "<b>"USB pohrana"</b>" treba biti izbrisana."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="9003555775524798797">\n\n"Da biste izbrisali muziku, slike i ostale korisničke podatke, "<b>"SD kartica"</b>" treba biti izbrisana."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="8989746770347525207">"Izbriši USB pohranu"</string>
     <string name="erase_external_storage" product="default" msgid="194249742376770215">"Izbriši SD karticu"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="8020275102431496261">"Izbrišite sve podatke na internoj USB pohrani, poput muzike ili fotografija"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="8020275102431496261">"Izbrišite sve podatke na unutrašnjoj USB pohrani, poput muzike ili fotografija"</string>
     <string name="erase_external_storage_description" product="default" msgid="5029355708082861798">"Izbrišite sve podatke na SD kartici, poput muzike ili fotografija"</string>
     <string name="master_clear_button_text" product="tablet" msgid="8000547818499182920">"Izbriši sve podatke"</string>
     <string name="master_clear_button_text" product="default" msgid="8000547818499182920">"Izbriši sve podatke"</string>
@@ -1879,7 +1879,7 @@
     <string name="not_installed" msgid="6432131218496140253">"Nije instal. za ovog korisnika"</string>
     <string name="installed" msgid="4824212968888080451">"Instalirano"</string>
     <string name="no_applications" msgid="6811396016303576024">"Nema aplikacija."</string>
-    <string name="internal_storage" msgid="7392373600013294853">"Interna pohrana"</string>
+    <string name="internal_storage" msgid="7392373600013294853">"Unutrašnja pohrana"</string>
     <string name="recompute_size" msgid="4290692197892743928">"Ponovno izračunavanje veličine…"</string>
     <string name="clear_data_dlg_title" msgid="7388024498687029597">"Izbrisati podatke aplikacija?"</string>
     <string name="clear_data_dlg_text" msgid="6849657743695013414">"Svi podaci ove aplikacije će biti trajno izbrisani. To uključuje sve fajlove, postavke, račune, baze podataka itd."</string>
@@ -2068,7 +2068,7 @@
     <string name="user_installed_services_category_title" msgid="4288689493753221319">"Preuzete usluge"</string>
     <string name="experimental_category_title" msgid="3797000069740110717">"Eksperimentalno"</string>
     <string name="feature_flags_dashboard_title" msgid="3153034144122754381">"Oznake funkcija"</string>
-    <string name="talkback_title" msgid="3717960404234260050">"Talkback"</string>
+    <string name="talkback_title" msgid="3717960404234260050">"TalkBack"</string>
     <string name="talkback_summary" msgid="6602857105831641574">"Čitač ekrana prvenstveno za slijepe i slabovidne osobe"</string>
     <string name="select_to_speak_summary" msgid="7514180457557735421">"Dodirnite stavke na ekranu da se naglas pročitaju"</string>
     <string name="accessibility_captioning_title" msgid="5878371993023439642">"Titlovi"</string>
@@ -2092,7 +2092,7 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6172987104538172869">"Dugme uklj./isklj. prekida poziv"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="9127905775116570565">"Veliki pokazivač miša"</string>
     <string name="accessibility_disable_animations" msgid="8378441317115710009">"Uklanjanje animacija"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="899550848196702565">"Mono audio"</string>
+    <string name="accessibility_toggle_master_mono_title" msgid="899550848196702565">"Mono zvuk"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="3847052868469033235">"Kombiniranje kanala prilikom reprodukcije zvuka"</string>
     <string name="accessibility_toggle_master_balance_title" msgid="8723492001092647562">"Audio balans"</string>
     <string name="accessibility_toggle_master_balance_left_label" msgid="8531986342666527970">"Lijevo"</string>
@@ -2940,7 +2940,7 @@
     <string name="user_guest" msgid="6226240869459683235">"Gost"</string>
     <string name="user_exit_guest_title" msgid="7279886200373071797">"Uklonite gosta"</string>
     <string name="user_exit_guest_confirm_title" msgid="4767911571671099844">"Ukloniti gosta?"</string>
-    <string name="user_exit_guest_confirm_message" msgid="6955182181145748919">"Sve aplikacije i podaci iz ove sesije će biti izbrisani."</string>
+    <string name="user_exit_guest_confirm_message" msgid="6955182181145748919">"Sve aplikacije i podaci iz ove sesije će se izbrisati."</string>
     <string name="user_exit_guest_dialog_remove" msgid="1878866060881115716">"Ukloniti"</string>
     <string name="user_enable_calling" msgid="864760054792249503">"Uključi telefonske pozive"</string>
     <string name="user_enable_calling_sms" msgid="3450252891736718793">"Uključi telefonske pozive i SMS-ove"</string>
@@ -3031,16 +3031,16 @@
     <string name="sim_cards_changed_message" msgid="1012486903583092731">"SIM kartice su promijenjene"</string>
     <string name="sim_cards_changed_message_summary" msgid="5753692480107865077">"Dodirnite za podešavanje aktivnosti"</string>
     <string name="sim_cellular_data_unavailable" msgid="1832472508352891641">"Prijenos podataka na mobilnoj mreži je nedostupan"</string>
-    <string name="sim_cellular_data_unavailable_summary" msgid="3093797406601964131">"Dodirnite za odabir SIM kartice za prijenos podataka"</string>
+    <string name="sim_cellular_data_unavailable_summary" msgid="3093797406601964131">"Dodirnite za odabir SIM-a za prijenos podataka"</string>
     <string name="sim_calls_always_use" msgid="5322696995795851734">"Uvijek koristi ovo za pozive"</string>
     <string name="select_sim_for_data" msgid="2099705792885526394">"Odaberite SIM za podatke"</string>
     <string name="select_sim_for_sms" msgid="2481682560233370731">"Odaberite SIM za SMS"</string>
-    <string name="data_switch_started" msgid="4517966162053949265">"Prebacuje se SIM kartica za prijenos podataka. Ovo može potrajati najviše jednu minutu..."</string>
+    <string name="data_switch_started" msgid="4517966162053949265">"Prebacuje se SIM za prijenos podataka. Ovo može potrajati najviše jednu minutu..."</string>
     <string name="select_sim_for_calls" msgid="131091573472832807">"Poziv putem"</string>
     <string name="sim_select_card" msgid="5558215843972182767">"Odaberite SIM karticu"</string>
     <string name="sim_card_number_title" msgid="8808663374497085634">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="2710430326225678239">"SIM kartica je prazna"</string>
-    <string name="sim_editor_name" msgid="3367549287943555967">"Ime SIM-a"</string>
+    <string name="sim_editor_name" msgid="3367549287943555967">"Naziv SIM-a"</string>
     <string name="sim_name_hint" msgid="4462143545744872744">"Unesite ime SIM-a"</string>
     <string name="sim_editor_title" msgid="2303147682835318920">"SIM slot %1$d"</string>
     <string name="sim_editor_carrier" msgid="8860370077829961512">"Operater"</string>
@@ -3165,9 +3165,9 @@
     <string name="keywords_default_payment_app" msgid="845369409578423996">"plaćanje, zadano"</string>
     <string name="keywords_ambient_display" msgid="8835182491798487184">"dolazno obavještenje"</string>
     <string name="keywords_hotspot_tethering" msgid="1723591462602613867">"povezivanje putem usb uređaja, povezivanje putem bluetooth uređaja, wifi pristupna tačka"</string>
-    <string name="keywords_touch_vibration" msgid="2081175517528255224">"haptika, vibriranje, ekran, osjetljivost"</string>
-    <string name="keywords_ring_vibration" msgid="4210509151866460210">"haptika, vibriranje, telefon, poziv, osjetljivost, zvono"</string>
-    <string name="keywords_notification_vibration" msgid="1077515502086745166">"haptika, vibriranje, osjetljivost"</string>
+    <string name="keywords_touch_vibration" msgid="2081175517528255224">"haptička tehnologija, vibriranje, ekran, osjetljivost"</string>
+    <string name="keywords_ring_vibration" msgid="4210509151866460210">"haptička tehnologija, vibriranje, telefon, poziv, osjetljivost, zvono"</string>
+    <string name="keywords_notification_vibration" msgid="1077515502086745166">"haptička tehnologija, vibriranje, osjetljivost"</string>
     <string name="keywords_battery_saver_sticky" msgid="8733804259716284872">"ušteda baterije, ljepljivo, istrajnost, ušteda energije, baterija"</string>
     <string name="default_sound" msgid="6675629744816442953">"Podrazumijevani zvuk"</string>
     <string name="sound_settings_summary" msgid="8467549670633195109">"Jačina zvuka zvona je na <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
@@ -3325,7 +3325,7 @@
     <string name="zen_onboarding_current_setting_summary" msgid="3569246708507270821">"(Trenutna postavka)"</string>
     <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="7584229011611927613">"Promijeniti postavke obavještenja načina rada Ne ometaj?"</string>
     <string name="sound_work_settings" msgid="4140215240360927923">"Zvukovi radnog profila"</string>
-    <string name="work_use_personal_sounds_title" msgid="531727195073003599">"Koristite zvukove ličnog profila"</string>
+    <string name="work_use_personal_sounds_title" msgid="531727195073003599">"Koristi zvukove ličnog profila"</string>
     <string name="work_use_personal_sounds_summary" msgid="2886871383995187441">"Zvukovi su isti za radni i lični profil"</string>
     <string name="work_ringtone_title" msgid="5499360583947410224">"Melodija zvona radnog telefona"</string>
     <string name="work_notification_ringtone_title" msgid="8059159087214025757">"Zadani zvuk radnih obavještenja"</string>
@@ -3471,7 +3471,7 @@
     <string name="notification_badge_title" msgid="8989086619255666442">"Dozvoli tačku za obavještenja"</string>
     <string name="notification_channel_badge_title" msgid="8228215248332054612">"Prikaži tačku za obavještenja"</string>
     <string name="app_notification_override_dnd_title" msgid="1757042206738172601">"Zanemari način rada Ne ometaj"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3152957611171210980">"Dozvoli da se obavještenja nastave pojavljivati kada je uključen način rada Ne ometaj"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3152957611171210980">"Omogućite da se obavještenja nastave pojavljivati kada je uključen način rada Ne ometaj"</string>
     <string name="app_notification_visibility_override_title" msgid="2349335170165637672">"Na zaključavanju ekrana"</string>
     <string name="app_notification_row_banned" msgid="2079325338122151677">"Blokirano"</string>
     <string name="app_notification_row_priority" msgid="432299064888787236">"Prioritetna"</string>
@@ -3954,7 +3954,7 @@
     <string name="condition_zen_title" msgid="2128184708916052585">"Uključen način rada Ne ometaj"</string>
     <string name="condition_zen_summary_phone_muted" msgid="4396050395522974654">"Zvuk na telefonu je isključen"</string>
     <string name="condition_zen_summary_with_exceptions" msgid="3435216391993785818">"S izuzecima"</string>
-    <string name="condition_battery_title" msgid="6704870010912986274">"Čuvar baterije je uključen"</string>
+    <string name="condition_battery_title" msgid="6704870010912986274">"Ušteda baterije je uključena"</string>
     <string name="condition_battery_summary" msgid="1236078243905690620">"Funkcije su ograničene"</string>
     <string name="condition_cellular_title" msgid="6605277435894307935">"Prijenos podataka na mobilnoj mreži je isključen"</string>
     <string name="condition_cellular_summary" msgid="3607459310548343777">"Internet je dostupan samo putem WiFi mreže"</string>
@@ -4140,7 +4140,7 @@
     <string name="bluetooth_disabled" msgid="6588102116819268238">"Isključeno"</string>
     <string name="bluetooth_connected_summary" msgid="439920840053965217">"Povezan s uređajem <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="596205630653123250">"Povezan s više uređaja"</string>
-    <string name="demo_mode" msgid="3831081808592541104">"Način demonstracije Sistemskog UI-a"</string>
+    <string name="demo_mode" msgid="3831081808592541104">"Način rada za demonstraciju Sistemskog UI-a"</string>
     <string name="dark_ui_mode" msgid="703844190192599217">"Tema"</string>
     <string name="dark_ui_mode_title" msgid="8774932716427742413">"Odabir teme"</string>
     <string name="dark_ui_settings_light_summary" msgid="5219102347744462812">"Ova postavka se odnosi i na aplikacije"</string>
@@ -4243,12 +4243,12 @@
     <string name="enterprise_privacy_exposure_changes_category" msgid="1877045221796512001">"Izmjene koje je izvršio adminstrator vaše organizacije"</string>
     <string name="enterprise_privacy_device_access_category" msgid="2967602674816237833">"Vaš pristup ovom uređaju"</string>
     <string name="enterprise_privacy_enterprise_data" msgid="6551504749971424942">"Podaci koji su povezani s vašim računom, kao što su e-pošta ili kalendar"</string>
-    <string name="enterprise_privacy_installed_packages" msgid="4376014821459811800">"Spisak aplikacija na vašem uređaju"</string>
+    <string name="enterprise_privacy_installed_packages" msgid="4376014821459811800">"Lista aplikacija na vašem uređaju"</string>
     <string name="enterprise_privacy_usage_stats" msgid="445762931318731975">"Utrošeno vrijeme i podaci za svaku aplikaciju"</string>
     <string name="enterprise_privacy_network_logs" msgid="5427398751599441159">"Najskoriji zapis mrežnog saobraćaja"</string>
     <string name="enterprise_privacy_bug_reports" msgid="283443567328836380">"Najnoviji izvještaj o greškama"</string>
     <string name="enterprise_privacy_security_logs" msgid="8936969480449604726">"Najnoviji zapisnik o aktivnostima"</string>
-    <string name="enterprise_privacy_none" msgid="5990646476868794882">"Nema"</string>
+    <string name="enterprise_privacy_none" msgid="5990646476868794882">"Ništa"</string>
     <string name="enterprise_privacy_enterprise_installed_packages" msgid="6575025134782391212">"Aplikacije su instalirane"</string>
     <string name="enterprise_privacy_apps_count_estimation_info" msgid="5020730108878608500">"Broj aplikacija je samo procjena. Možda nisu obuhvaćene aplikacije koje su instalirane izvan Play trgovine."</string>
     <plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="5161417161943060602">
@@ -4489,10 +4489,10 @@
     <string name="mobile_network_inactive_esim" msgid="6525747163540293028">"Neaktivno/preuzeti SIM-ovi"</string>
     <string name="mobile_network_sim_name" msgid="8228870017368926761">"Naziv SIM-a"</string>
     <string name="mobile_network_sim_name_rename" msgid="4810736493612513152">"Promijeni naziv"</string>
-    <string name="mobile_network_use_sim_on" msgid="1944823242539751387">"Koristite SIM"</string>
+    <string name="mobile_network_use_sim_on" msgid="1944823242539751387">"Koristi SIM"</string>
     <string name="mobile_network_use_sim_off" msgid="2077820358051946635">"Isključeno"</string>
     <string name="mobile_network_esim_swap_confirm_title" msgid="6077154427380613615">"Prebaciti na operatera <xliff:g id="CARRIER">%1$s</xliff:g>?"</string>
-    <string name="mobile_network_esim_swap_confirm_body" msgid="1192274915146275063">"Aktivan može biti samo po jedan SIM.\n\nPrebacivanjem na operatera <xliff:g id="CARRIER1">%1$s</xliff:g> neće se otkazati usluga operatera <xliff:g id="CARRIER2">%2$s</xliff:g>."</string>
+    <string name="mobile_network_esim_swap_confirm_body" msgid="1192274915146275063">"U datom trenutku može biti aktivna samo jedna preuzeta SIM kartica.\n\nPrebacivanjem na mobilnog operatera <xliff:g id="CARRIER1">%1$s</xliff:g> neće se otkazati usluga mobilnog operatera <xliff:g id="CARRIER2">%2$s</xliff:g>."</string>
     <string name="mobile_network_esim_swap_confirm_ok" msgid="4253442720111626242">"Prebaci na operatera <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="mobile_network_erase_sim" msgid="7813251003613841044">"Izbriši SIM"</string>
     <string name="mobile_network_erase_sim_dialog_title" msgid="3796268164204467499">"Izbrisati ovaj preuzeti SIM?"</string>
diff --git a/tests/CarDeveloperOptions/res/values-ca/arrays.xml b/tests/CarDeveloperOptions/res/values-ca/arrays.xml
index dc71c8e..0b545ab 100644
--- a/tests/CarDeveloperOptions/res/values-ca/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-ca/arrays.xml
@@ -257,7 +257,7 @@
     <item msgid="5420704980305018295">"volum de la veu"</item>
     <item msgid="5797363115508970204">"volum del to"</item>
     <item msgid="8233154098550715999">"volum de multimèdia"</item>
-    <item msgid="5196715605078153950">"volum de l\'alarma"</item>
+    <item msgid="5196715605078153950">"volum d\'alarma"</item>
     <item msgid="394030698764284577">"volum de notificació"</item>
     <item msgid="8952898972491680178">"volum del Bluetooth"</item>
     <item msgid="8506227454543690851">"mantén actiu"</item>
@@ -324,7 +324,7 @@
     <item msgid="1600379420669104929">"Volum de la veu"</item>
     <item msgid="6296768210470214866">"Volum del to"</item>
     <item msgid="510690696071629241">"Volum de multimèdia"</item>
-    <item msgid="406861638631430109">"Volum de l\'alarma"</item>
+    <item msgid="406861638631430109">"Volum d\'alarma"</item>
     <item msgid="4715864795872233884">"Volum de notificació"</item>
     <item msgid="2311478519251301183">"Volum del Bluetooth"</item>
     <item msgid="5133991377896747027">"Mantén actiu"</item>
@@ -399,7 +399,7 @@
     <item msgid="3673930830658169860">"Personalitzat"</item>
   </string-array>
   <string-array name="vpn_types_long">
-    <item msgid="6566768880689730097">"VPN de PPTP"</item>
+    <item msgid="6566768880689730097">"VPN PPTP"</item>
     <item msgid="1349760781118368659">"VPN L2TP/IPSec amb claus prèviament compartides"</item>
     <item msgid="6128519070545038358">"VPN L2TP/IPSec amb certificats"</item>
     <item msgid="312397853907741968">"VPN IPSec amb claus prèviament compartides i autenticació Xauth"</item>
diff --git a/tests/CarDeveloperOptions/res/values-ca/strings.xml b/tests/CarDeveloperOptions/res/values-ca/strings.xml
index 4694958..d482621 100644
--- a/tests/CarDeveloperOptions/res/values-ca/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ca/strings.xml
@@ -469,7 +469,7 @@
     <string name="security_settings_fingerprint_enroll_start_message" msgid="750040530347336376">"Col·loca el dit al sensor i aixeca\'l quan notis una vibració."</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="1764145704166303842">"Aixeca el dit i toca de nou"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4434560313661204448">"Continua aixecant el dit per afegir les diferents parts de l\'empremta digital"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="2987918958909117821">"Empremta digital afegida"</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="2987918958909117821">"S\'ha afegit l\'empremta digital"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="5862643337893923347">"Quan vegis aquesta icona, fes servir l\'empremta digital per identificar-te o aprovar compres."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="1473280156532146933">"Fes-ho més tard"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="2816424026528101690">"Sortir de configuració d\'empremta digital?"</string>
@@ -1554,7 +1554,7 @@
     <string name="carrier_enabled_summaryOff" msgid="4093019532796386622">"APN desactivat"</string>
     <string name="bearer" msgid="4378444317087536401">"Portador"</string>
     <string name="mvno_type" msgid="3150755279048149624">"Tipus d\'OMV"</string>
-    <string name="mvno_match_data" msgid="629287305803195245">"Valor de MVNO"</string>
+    <string name="mvno_match_data" msgid="629287305803195245">"Valor d\'OMV"</string>
     <string name="menu_delete" msgid="8646081395424055735">"Suprimeix l\'APN"</string>
     <string name="menu_new" msgid="7529219814721969024">"APN nou"</string>
     <string name="menu_save" msgid="7310230314430623215">"Desa"</string>
@@ -1584,7 +1584,7 @@
     <string name="reset_esim_error_title" msgid="4728931209471875632">"No es poden esborrar les targetes SIM"</string>
     <string name="reset_esim_error_msg" msgid="4716366079119742235">"No s\'han pogut esborrar les targetes SIM que has baixat a causa d\'un error.\n\nReinicia el dispositiu i torna-ho a provar."</string>
     <string name="master_clear_title" msgid="1560712943955904673">"Esborra totes les dades (restabliment de les dades de fàbrica)"</string>
-    <string name="master_clear_short_title" msgid="919098101581335101">"Esborra totes les dades"</string>
+    <string name="master_clear_short_title" msgid="919098101581335101">"Esborra totes les dades (restabliment dades fàbrica)"</string>
     <string name="master_clear_desc" product="tablet" msgid="3432373610755760899">"Aquesta acció esborrarà totes les dades de l\'"<b>"emmagatzematge intern"</b>" de la tauleta, com ara:\n\n"<li>"el teu Compte de Google"</li>\n<li>"les dades i la configuració del sistema i de les aplicacions"</li>\n<li>"les aplicacions baixades"</li></string>
     <string name="master_clear_desc" product="default" msgid="8765543541962866697">"S\'esborraran totes les dades de l\'"<b>"emmagatzematge intern"</b>" del telèfon, inclosos:\n\n"<li>"El teu Compte de Google"</li>\n<li>"Les dades i la configuració del sistema i de les aplicacions"</li>\n<li>"Les aplicacions baixades"</li></string>
     <string name="master_clear_accounts" product="default" msgid="3432884235445405376">\n\n"Tens la sessió iniciada als comptes següents:\n"</string>
@@ -1615,7 +1615,7 @@
     <string name="tether_settings_title_bluetooth" msgid="1999590158102569959">"Compartició de xarxa per Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="1159128764162788159">"Compartició de xarxa"</string>
     <string name="tether_settings_title_all" msgid="6935843543433954181">"Punt d\'accés Wi-Fi i compartició de xarxa"</string>
-    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="1289593649526514499">"Punt d\'accés Wi-Fi i compartició de xarxa activats"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="1289593649526514499">"Punt d\'accés Wi-Fi activat, compartició de xarxa"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="8010689354668285422">"Punt d\'accés Wi-Fi activat"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1349909238672649877">"Compartició de xarxa"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="3682544845899910726">"No es pot compartir la xarxa ni utilitzar punts d\'accés Wi-Fi mentre la funció Economitzador de dades està activada"</string>
@@ -1648,7 +1648,7 @@
     <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ó per al perfil de treball"</string>
-    <string name="location_app_level_permissions" msgid="1298041503927632960">"Permís d\'aplicacions"</string>
+    <string name="location_app_level_permissions" msgid="1298041503927632960">"Permisos de les 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">
       <item quantity="other">Aplicacions que tenen accés il·limitat: <xliff:g id="BACKGROUND_LOCATION_APP_COUNT_2">%1$d</xliff:g> de <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g></item>
@@ -2048,7 +2048,7 @@
     <string name="experimental_category_title" msgid="3797000069740110717">"Experimental"</string>
     <string name="feature_flags_dashboard_title" msgid="3153034144122754381">"Marques de funcions"</string>
     <string name="talkback_title" msgid="3717960404234260050">"Talkback"</string>
-    <string name="talkback_summary" msgid="6602857105831641574">"Lector de pantalla destinat principalment a persones invidents i amb problemes de visió"</string>
+    <string name="talkback_summary" msgid="6602857105831641574">"Lector de pantalla destinat principalment a persones invidents i amb poca visió"</string>
     <string name="select_to_speak_summary" msgid="7514180457557735421">"Toca els elements de la pantalla per sentir-los en veu alta"</string>
     <string name="accessibility_captioning_title" msgid="5878371993023439642">"Subtítols"</string>
     <string name="accessibility_screen_magnification_title" msgid="7250949681883917360">"Ampliació"</string>
@@ -2269,15 +2269,15 @@
     <string name="packages_subtitle" msgid="6506269487892204413">"Paquets inclosos"</string>
     <string name="battery_tip_summary_title" msgid="2750922152518825526">"Les aplicacions funcionen correctament"</string>
     <string name="battery_tip_summary_summary" product="default" msgid="6294900413896440006">"El telèfon té un ús normal de la bateria en segon pla"</string>
-    <string name="battery_tip_summary_summary" product="tablet" msgid="5280099016800644130">"La tauleta fa un ús normal de la bateria en segon pla"</string>
-    <string name="battery_tip_summary_summary" product="device" msgid="4459840492610842705">"El dispositiu fa un ús normal de la bateria en segon pla"</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="5280099016800644130">"La tauleta té un ús normal de la bateria en segon pla"</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="4459840492610842705">"El dispositiu té ús normal de la bateria en segon pla"</string>
     <string name="battery_tip_low_battery_title" msgid="6784043681672161175">"La bateria té poca capacitat"</string>
     <string name="battery_tip_low_battery_summary" msgid="9151355911381188604">"La durada de la bateria no és bona"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="5517122075918038665">"Millora la durada de la bateria del telèfon"</string>
     <string name="battery_tip_smart_battery_title" product="tablet" msgid="203494973250969040">"Millora la durada de la bateria de la tauleta"</string>
     <string name="battery_tip_smart_battery_title" product="device" msgid="7419448992583346364">"Millora la durada de la bateria del dispositiu"</string>
     <string name="battery_tip_smart_battery_summary" msgid="5344821856478265778">"Activa el gestor de bateria"</string>
-    <string name="battery_tip_early_heads_up_title" msgid="707163785378746813">"Activa l\'estalvi de bateria"</string>
+    <string name="battery_tip_early_heads_up_title" msgid="707163785378746813">"Activa la funció Estalvi de bateria"</string>
     <string name="battery_tip_early_heads_up_summary" msgid="4231489566422395156">"Pot ser que la bateria s\'esgoti massa ràpid"</string>
     <string name="battery_tip_early_heads_up_done_title" msgid="112550885882648429">"S\'ha activat l\'estalvi de bateria"</string>
     <string name="battery_tip_early_heads_up_done_summary" msgid="8692257022962771181">"És possible que algunes funcions estiguin limitades"</string>
@@ -2448,7 +2448,7 @@
     <string name="process_dex2oat_label" msgid="8249082119748556085">"Optimització de l\'aplicació"</string>
     <string name="battery_saver" msgid="3989710213758938398">"Estalvi de bateria"</string>
     <string name="battery_saver_auto_title" msgid="4158659069641849952">"Activa automàticament"</string>
-    <string name="battery_saver_auto_no_schedule" msgid="739814529432092706">"Sense programació"</string>
+    <string name="battery_saver_auto_no_schedule" msgid="739814529432092706">"Cap programació"</string>
     <string name="battery_saver_auto_routine" msgid="886514412067906980">"Segons la teva rutina"</string>
     <string name="battery_saver_auto_percentage" msgid="5791982309331921556">"Segons el percentatge"</string>
     <string name="battery_saver_auto_routine_summary" msgid="9182044424547482889">"L\'estalvi de bateria s\'activa si és probable que et quedis sense bateria abans de la càrrega habitual següent"</string>
@@ -2474,7 +2474,7 @@
     <string name="process_stats_total_duration_percentage" msgid="737215062610178960">"<xliff:g id="PERCENT">%1$s</xliff:g> de RAM utilitzada durant <xliff:g id="TIMEDURATION">%2$s</xliff:g>"</string>
     <string name="process_stats_type_background" msgid="7867552451658035199">"Fons"</string>
     <string name="process_stats_type_foreground" msgid="9185538008409818577">"Primer pla"</string>
-    <string name="process_stats_type_cached" msgid="6774816751826613732">"Memòria"</string>
+    <string name="process_stats_type_cached" msgid="6774816751826613732">"A la memòria cau"</string>
     <string name="process_stats_os_label" msgid="2866711070924260440">"SO Android"</string>
     <string name="process_stats_os_native" msgid="8971193568864959041">"Nadiu"</string>
     <string name="process_stats_os_kernel" msgid="496627624157605578">"Kernel"</string>
@@ -2498,7 +2498,7 @@
     <string name="menu_proc_stats_type" msgid="2680179749566186247">"Tipus d\'estadístiques"</string>
     <string name="menu_proc_stats_type_background" msgid="1898036847606845052">"Fons"</string>
     <string name="menu_proc_stats_type_foreground" msgid="8244384283966204023">"Primer pla"</string>
-    <string name="menu_proc_stats_type_cached" msgid="8238824117399683217">"Memòria"</string>
+    <string name="menu_proc_stats_type_cached" msgid="8238824117399683217">"A la memòria cau"</string>
     <string name="voice_input_output_settings" msgid="2180337183089517667">"Entrada i sortida de veu"</string>
     <string name="voice_input_output_settings_title" msgid="7080213653518526025">"Configuració d\'entrada i sortida de veu"</string>
     <string name="voice_search_settings_title" msgid="4999026024622014272">"Cerca per veu"</string>
@@ -2605,7 +2605,7 @@
     <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>
-    <string name="background_data_dialog_message" msgid="8126774244911656527">"Desactivar les dades en segon pla augmenta la durada de la bateria i disminueix l\'ús de dades. És possible que algunes aplicacions continuïn utilitzant la connexió de dades en segon pla."</string>
+    <string name="background_data_dialog_message" msgid="8126774244911656527">"Desactivar les dades en segon pla allarga la durada de la bateria i disminueix l\'ús de dades. És possible que algunes aplicacions continuïn utilitzant la connexió de dades en segon pla."</string>
     <string name="sync_automatically" msgid="5746117156896468099">"Sincronitza dades aplicacions autom."</string>
     <string name="sync_enabled" msgid="535172627223336983">"Sincronització activa"</string>
     <string name="sync_disabled" msgid="713721807204805062">"Sincronització desactivada"</string>
@@ -2871,7 +2871,7 @@
     <string name="user_add_profile_item_title" msgid="4932743891449790664">"Perfil restringit"</string>
     <string name="user_add_user_title" msgid="2320897397066676472">"Vols afegir un usuari nou?"</string>
     <string name="user_add_user_message_long" msgid="686637203224195465">"Pots compartir aquest dispositiu amb altres persones creant usuaris addicionals. Cada usuari té el seu propi espai, que pot personalitzar amb aplicacions i fons de pantalla, entre d\'altres. Els usuaris també poden ajustar opcions de configuració del dispositiu, com ara la Wi-Fi, que afecten els altres usuaris.\n\nQuan afegeixis un usuari nou, haurà de configurar el seu espai.\n\nTots els usuaris poden actualitzar les aplicacions de la resta. És possible que la configuració i els serveis d\'accessibilitat no es transfereixin a l\'usuari nou."</string>
-    <string name="user_add_user_message_short" msgid="1802594476285458254">"Quan s\'afegeix un usuari nou, aquest usuari ha de configurar el seu espai.\n\nQualsevol usuari pot actualitzar les aplicacions dels altres usuaris."</string>
+    <string name="user_add_user_message_short" msgid="1802594476285458254">"Quan s\'afegeix un usuari nou, aquesta persona ha de configurar el seu espai.\n\nQualsevol usuari pot actualitzar les aplicacions dels altres usuaris."</string>
     <string name="user_setup_dialog_title" msgid="6748950002206392396">"Vols configurar l\'usuari ara?"</string>
     <string name="user_setup_dialog_message" msgid="2988559933258353919">"Assegura\'t que la persona estigui disponible per accedir al dispositiu i configurar el seu espai."</string>
     <string name="user_setup_profile_dialog_message" msgid="7611900802824048526">"Vols configurar el perfil ara?"</string>
@@ -2902,12 +2902,12 @@
     <string name="user_exit_guest_confirm_title" msgid="4767911571671099844">"Vols suprimir el convidat?"</string>
     <string name="user_exit_guest_confirm_message" msgid="6955182181145748919">"Totes les aplicacions i les dades d\'aquesta sessió se suprimiran."</string>
     <string name="user_exit_guest_dialog_remove" msgid="1878866060881115716">"Suprimeix"</string>
-    <string name="user_enable_calling" msgid="864760054792249503">"Activa les trucades"</string>
-    <string name="user_enable_calling_sms" msgid="3450252891736718793">"Activa les trucades i els SMS"</string>
+    <string name="user_enable_calling" msgid="864760054792249503">"Activa les trucades telefòniques"</string>
+    <string name="user_enable_calling_sms" msgid="3450252891736718793">"Activa les trucades telefòniques i els SMS"</string>
     <string name="user_remove_user" msgid="3687544420125911166">"Suprimeix l\'usuari"</string>
-    <string name="user_enable_calling_confirm_title" msgid="1141612415529158542">"Vols activar les trucades?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="1141612415529158542">"Vols activar les trucades telefòniques?"</string>
     <string name="user_enable_calling_confirm_message" msgid="2490126715153125970">"L\'historial de trucades es compartirà amb aquest usuari."</string>
-    <string name="user_enable_calling_and_sms_confirm_title" msgid="4153856398523366976">"Vols activar les trucades i els SMS?"</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="4153856398523366976">"Vols activar les trucades telefòniques i els SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="3278802798876095734">"L\'historial de trucades i d\'SMS es compartirà amb aquest usuari."</string>
     <string name="emergency_info_title" msgid="1522609271881425375">"Informació d\'emergència"</string>
     <string name="emergency_info_summary" msgid="7280464759837387342">"Informació i contactes de: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -2922,10 +2922,10 @@
     <string name="nfc_payment_app_and_desc" msgid="102312684211458190">"<xliff:g id="APP">%1$s</xliff:g> - <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="nfc_payment_use_default" msgid="3098724195746409476">"Utilitza l\'aplicació predeterminada"</string>
     <string name="nfc_payment_favor_default" msgid="7555356982142464260">"Sempre"</string>
-    <string name="nfc_payment_favor_open" msgid="3739055715000436749">"Excepte quan hi hagi oberta una altra aplicació per pagar"</string>
+    <string name="nfc_payment_favor_open" msgid="3739055715000436749">"Excepte quan hi hagi oberta una altra aplicació de pagaments"</string>
     <string name="nfc_payment_pay_with" msgid="8412558374792061266">"En un terminal que tingui la funció Toca i paga, paga amb:"</string>
     <string name="nfc_how_it_works_title" msgid="6531433737926327904">"Pagar a la terminal"</string>
-    <string name="nfc_how_it_works_content" msgid="9174575836302449343">"Configura una aplicació per pagar. A continuació, apropa la part posterior del telèfon a un terminal amb el símbol de pagament sense contacte."</string>
+    <string name="nfc_how_it_works_content" msgid="9174575836302449343">"Configura una aplicació de pagaments. A continuació, apropa la part posterior del telèfon a un terminal amb el símbol de pagament sense contacte."</string>
     <string name="nfc_how_it_works_got_it" msgid="2432535672153247411">"Entesos"</string>
     <string name="nfc_more_title" msgid="2825856411836382264">"Més..."</string>
     <string name="nfc_payment_set_default_label" msgid="3997927342761454042">"Vols establir-ho com a preferència?"</string>
@@ -3115,7 +3115,7 @@
     <string name="keywords_display_adaptive_sleep" msgid="1695357782432822811">"pantalla atenuada, repòs, bateria, temps d\'espera, atenció, pantalla, inactivitat"</string>
     <string name="keywords_auto_rotate" msgid="4320791369951647513">"gir, canvi, rotació, retrat, paisatge, orientació, vertical, horitzontal"</string>
     <string name="keywords_system_update_settings" msgid="4419971277998986067">"actualitzar, android"</string>
-    <string name="keywords_zen_mode_settings" msgid="4103819458182535493">"no molestis, programar, notificacions, bloqueig, silenci, vibrar, mentre dormo, mentre treballo, concentració, so, silenciar, dia, dia laborable, cap de setmana, nit entre setmana, esdeveniment"</string>
+    <string name="keywords_zen_mode_settings" msgid="4103819458182535493">"no molestis, programar, notificacions, bloqueig, silenci, vibrar, mentre dormo, mentre treballo, concentració, so, silenciar, dia, dia laborable, dia entre setmana, cap de setmana, nit entre setmana, esdeveniment"</string>
     <string name="keywords_screen_timeout" msgid="4328381362313993666">"pantalla, temps de bloqueig, temps d\'espera, pantalla de bloqueig"</string>
     <string name="keywords_storage_settings" msgid="6422454520424236476">"memòria, memòria cau, dades, suprimir, esborrar, alliberar, espai"</string>
     <string name="keywords_bluetooth_settings" msgid="1152229891590622822">"connectat, dispositiu, auriculars, auriculars amb micro, altaveu, sense fil, vincular, música, multimèdia"</string>
@@ -3137,7 +3137,7 @@
     <string name="media_volume_option_title" msgid="3553411883305505682">"Volum de multimèdia"</string>
     <string name="remote_media_volume_option_title" msgid="6355710054191873836">"Volum emès"</string>
     <string name="call_volume_option_title" msgid="5028003296631037334">"Volum de trucada"</string>
-    <string name="alarm_volume_option_title" msgid="3184076022438477047">"Volum de l\'alarma"</string>
+    <string name="alarm_volume_option_title" msgid="3184076022438477047">"Volum d\'alarma"</string>
     <string name="ring_volume_option_title" msgid="2038924918468372264">"Volum del to"</string>
     <string name="notification_volume_option_title" msgid="1358512611511348260">"Volum de notificació"</string>
     <string name="ringtone_title" msgid="1409086028485922583">"So de trucada del telèfon"</string>
diff --git a/tests/CarDeveloperOptions/res/values-cs/strings.xml b/tests/CarDeveloperOptions/res/values-cs/strings.xml
index ad8cb3f..2f0f914 100644
--- a/tests/CarDeveloperOptions/res/values-cs/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-cs/strings.xml
@@ -1162,7 +1162,7 @@
     <string name="ring_volume_title" msgid="5874791723449821646">"Hlasitost vyzvánění"</string>
     <string name="vibrate_in_silent_title" msgid="2314667015729841220">"Vibrovat v tichém režimu"</string>
     <string name="notification_sound_title" msgid="6812164482799723931">"Výchozí zvuk oznámení"</string>
-    <string name="incoming_call_volume_title" msgid="4736570528754310450">"Vyzváněcí tón"</string>
+    <string name="incoming_call_volume_title" msgid="4736570528754310450">"Vyzvánění"</string>
     <string name="notification_volume_title" msgid="6022562909288085275">"Oznámení"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="7312942422655861175">"Použije hlasitost příchozích hovorů také pro oznámení"</string>
     <string name="home_work_profile_not_supported" msgid="6137073723297076818">"Nepodporuje pracovní profily"</string>
@@ -1677,7 +1677,7 @@
     <string name="sms_change_default_no_previous_dialog_text" msgid="4680224695080527907">"Chcete pro zprávy SMS používat aplikaci <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
     <string name="network_scorer_picker_title" msgid="1691073966560952916">"Poskytovatel hodnocení sítí"</string>
     <string name="network_scorer_picker_none_preference" msgid="6448280557733231737">"Žádné"</string>
-    <string name="network_scorer_change_active_dialog_title" msgid="4274159562371475090">"Změnit nastavení Google Wi-Fi Assistant?"</string>
+    <string name="network_scorer_change_active_dialog_title" msgid="4274159562371475090">"Změnit asistenta pro Wi-Fi?"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="4264089809189760730">"Chcete spravovat síťová připojení pomocí aplikace <xliff:g id="NEW_APP">%1$s</xliff:g> namísto aplikace <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="6394483538843474495">"Chcete spravovat síťová připojení pomocí aplikace <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
     <string name="mobile_unknown_sim_operator" msgid="872589370085135817">"Operátor SIM karty není znám"</string>
@@ -2033,7 +2033,7 @@
     <string name="user_dict_settings_add_menu_title" msgid="1553743292556229909">"Přidat"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="5447922936256448695">"Přidat do slovníku"</string>
     <string name="user_dict_settings_add_screen_title" msgid="8164998107273393830">"Fráze"</string>
-    <string name="user_dict_settings_add_dialog_more_options" msgid="577584009496650183">"Více možností"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="577584009496650183">"Další možnosti"</string>
     <string name="user_dict_settings_add_dialog_less_options" msgid="5678408488188525719">"Méně možností"</string>
     <string name="user_dict_settings_add_dialog_confirm" msgid="7279673661732968137">"OK"</string>
     <string name="user_dict_settings_add_word_option_name" msgid="5310204485783762787">"Slovo:"</string>
@@ -3222,7 +3222,7 @@
     <string name="alarm_volume_option_title" msgid="3184076022438477047">"Hlasitost budíku"</string>
     <string name="ring_volume_option_title" msgid="2038924918468372264">"Hlasitost vyzvánění"</string>
     <string name="notification_volume_option_title" msgid="1358512611511348260">"Hlasitost oznámení"</string>
-    <string name="ringtone_title" msgid="1409086028485922583">"Vyzváněcí tón telefonu"</string>
+    <string name="ringtone_title" msgid="1409086028485922583">"Vyzvánění telefonu"</string>
     <string name="notification_ringtone_title" msgid="2932960620843976285">"Výchozí zvuk oznámení"</string>
     <string name="notification_unknown_sound_title" msgid="8043718667804838398">"Zvuk z aplikace"</string>
     <string name="notification_sound_default" msgid="2664544380802426260">"Výchozí zvuk oznámení"</string>
@@ -3371,7 +3371,7 @@
     <string name="sound_work_settings" msgid="4140215240360927923">"Zvuky pracovního profilu"</string>
     <string name="work_use_personal_sounds_title" msgid="531727195073003599">"Použít zvuky osobního profilu"</string>
     <string name="work_use_personal_sounds_summary" msgid="2886871383995187441">"Zvuky pracovního a osobního profilu jsou stejné"</string>
-    <string name="work_ringtone_title" msgid="5499360583947410224">"Vyzváněcí tón prac. telefonu"</string>
+    <string name="work_ringtone_title" msgid="5499360583947410224">"Vyzvánění prac. telefonu"</string>
     <string name="work_notification_ringtone_title" msgid="8059159087214025757">"Výchozí zvuk pracovního oznámení"</string>
     <string name="work_alarm_ringtone_title" msgid="5328487181385375130">"Výchozí zvuk pracovního budíku"</string>
     <string name="work_sound_same_as_personal" msgid="7728560881697159758">"Stejné jako v osobním profilu"</string>
@@ -3380,7 +3380,7 @@
     <string name="work_sync_dialog_message" msgid="944233463059129156">"Pro pracovní profil budou použity zvuky z osobního profilu"</string>
     <string name="ringtones_install_custom_sound_title" msgid="210551218424553671">"Přidat vlastní zvuk?"</string>
     <string name="ringtones_install_custom_sound_content" msgid="6683649115132255452">"Soubor bude zkopírován do složky <xliff:g id="FOLDER_NAME">%s</xliff:g>"</string>
-    <string name="ringtones_category_preference_title" msgid="4491932700769815470">"Vyzváněcí tóny"</string>
+    <string name="ringtones_category_preference_title" msgid="4491932700769815470">"Vyzvánění"</string>
     <string name="other_sound_category_preference_title" msgid="2045757472469840859">"Další zvuky a vibrace"</string>
     <string name="configure_notification_settings" msgid="291914315140851270">"Oznámení"</string>
     <string name="recent_notifications" msgid="8125865995065032049">"Nedávno odeslané"</string>
@@ -4156,9 +4156,9 @@
     <string name="notification_log_details_importance" msgid="5002791265017246702">"důležitost"</string>
     <string name="notification_log_details_explanation" msgid="7957412639879215408">"vysvětlení"</string>
     <string name="notification_log_details_badge" msgid="7935214085444299041">"může zobrazovat odznak"</string>
-    <string name="notification_log_details_content_intent" msgid="7977718786166542328">"objekt Intent"</string>
-    <string name="notification_log_details_delete_intent" msgid="2648845671811460483">"smazání objektu Intent"</string>
-    <string name="notification_log_details_full_screen_intent" msgid="4790242436201154">"objekt Intent pro celou obrazovku"</string>
+    <string name="notification_log_details_content_intent" msgid="7977718786166542328">"intent"</string>
+    <string name="notification_log_details_delete_intent" msgid="2648845671811460483">"smazání intentu"</string>
+    <string name="notification_log_details_full_screen_intent" msgid="4790242436201154">"intent pro celou obrazovku"</string>
     <string name="notification_log_details_actions" msgid="4096917954653586430">"akce"</string>
     <string name="notification_log_details_title" msgid="1673066058045472579">"nadpis"</string>
     <string name="notification_log_details_remoteinput" msgid="739338559646354829">"vzdálené vstupy"</string>
@@ -4539,7 +4539,7 @@
     <string name="carrier_settings_title" msgid="7989949967020825268">"Nastavení operátora"</string>
     <string name="cdma_lte_data_service" msgid="8996857851150069339">"Nastavit datovou službu"</string>
     <string name="mobile_data_settings_title" msgid="3439626666647519547">"Mobilní data"</string>
-    <string name="mobile_data_settings_summary" msgid="6492798151325636912">"Přistupovat k datům přes mobilní síť"</string>
+    <string name="mobile_data_settings_summary" msgid="6492798151325636912">"Používat datové připojení přes mobilní síť"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="3665863214578471494">"Telefon se v dosahu automaticky přepne na tohoto operátora"</string>
     <string name="calls_preference" msgid="2076353032705811243">"Předvolby hovorů"</string>
     <string name="sms_preference" msgid="8449270011976880">"Předvolby SMS"</string>
@@ -4563,8 +4563,8 @@
     <string name="mobile_network_list_add_more" msgid="65420172175416318">"Přidat další"</string>
     <string name="mobile_network_active_sim" msgid="7660119090716084589">"Aktivní / SIM karta"</string>
     <string name="mobile_network_inactive_sim" msgid="8296195866147486039">"Neaktivní / SIM karta"</string>
-    <string name="mobile_network_active_esim" msgid="2919290915755581140">"Aktivní / stažená SIM karta"</string>
-    <string name="mobile_network_inactive_esim" msgid="6525747163540293028">"Neaktivní / stažená SIM karta"</string>
+    <string name="mobile_network_active_esim" msgid="2919290915755581140">"Aktivní stažená SIM karta"</string>
+    <string name="mobile_network_inactive_esim" msgid="6525747163540293028">"Neaktivní stažená SIM karta"</string>
     <string name="mobile_network_sim_name" msgid="8228870017368926761">"Název SIM karty"</string>
     <string name="mobile_network_sim_name_rename" msgid="4810736493612513152">"Přejmenovat"</string>
     <string name="mobile_network_use_sim_on" msgid="1944823242539751387">"Používat SIM kartu"</string>
diff --git a/tests/CarDeveloperOptions/res/values-da/strings.xml b/tests/CarDeveloperOptions/res/values-da/strings.xml
index fa6457c..636dee1 100644
--- a/tests/CarDeveloperOptions/res/values-da/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-da/strings.xml
@@ -1750,7 +1750,7 @@
     <string name="lock_settings_title" msgid="233657584969886812">"Enhedssikkerhed"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="333149762562581510">"Skift oplåsningsmønster"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="3435796032210265723">"Skift pinkode til oplåsning"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2262005028838969839">"Tegn et oplåsningsmønster"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2262005028838969839">"Tegn et mønster til at låse op"</string>
     <string name="lockpattern_recording_intro_footer" msgid="5426745740754065099">"Tryk på Menu for at få hjælp."</string>
     <string name="lockpattern_recording_inprogress" msgid="4060818382176523671">"Slip, når du er færdig"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="6374760294545431845">"Forbind mindst <xliff:g id="NUMBER">%d</xliff:g> punkter. Prøv igen."</string>
@@ -2176,7 +2176,7 @@
     <string name="color_blue" msgid="4055855996393833996">"Blå"</string>
     <string name="color_cyan" msgid="7669317410901991453">"Grønblå"</string>
     <string name="color_yellow" msgid="8847327436896180799">"Gul"</string>
-    <string name="color_magenta" msgid="721976999611563071">"Lyslilla"</string>
+    <string name="color_magenta" msgid="721976999611563071">"Magenta"</string>
     <string name="enable_service_title" msgid="2746143093464928251">"Vil du bruge <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="8177719542886123788">"<xliff:g id="SERVICE">%1$s</xliff:g> har brug for at:"</string>
     <string name="touch_filtered_warning" msgid="3072665526993043879">"Indstillinger kan ikke bekræfte dit svar, fordi en app tilslører tilladelsesanmodningen."</string>
@@ -2455,9 +2455,9 @@
     <string name="battery_saver_auto_percentage_summary" msgid="2036128588460338677">"Aktiveres ved <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_saver_schedule_settings_title" msgid="574233428557678128">"Angiv en tidsplan"</string>
     <string name="battery_saver_sticky_title_new" msgid="5328707297110866082">"Deaktiver, når enheden er opladet"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="3406582427270935879">"Batterisparefunktion slås fra, når din telefon er på <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="3284967694001857194">"Batterisparefunktion slås fra, når din tablet er på <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="5056520668081504111">"Batterisparefunktion slås fra, når din enhed er på <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="3406582427270935879">"Batterisparefunktionen slås fra, når din telefon er på <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="3284967694001857194">"Batterisparefunktionen slås fra, når din tablet er på <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="5056520668081504111">"Batterisparefunktionen slås fra, når din enhed er på <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (7607123201469333645) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="2321082163892561703">"Aktivér"</string>
@@ -2871,7 +2871,7 @@
     <string name="user_add_profile_item_title" msgid="4932743891449790664">"Begrænset profil"</string>
     <string name="user_add_user_title" msgid="2320897397066676472">"Vil du tilføje en ny bruger?"</string>
     <string name="user_add_user_message_long" msgid="686637203224195465">"Du kan dele denne enhed med andre ved at oprette ekstra brugere. Hver bruger har sit eget rum, som kan tilpasses med apps, baggrund osv. Brugerne kan også justere enhedsindstillinger, som for eksempel Wi-Fi, som påvirker alle.\n\nNår du tilføjer en ny bruger, skal vedkommende konfigurere sit rum.\n\nAlle brugere kan opdatere apps for alle andre brugere. Indstillinger og tjenester for hjælpefunktioner overføres muligvis ikke til den nye bruger."</string>
-    <string name="user_add_user_message_short" msgid="1802594476285458254">"Når du tilføjer en ny bruger, skal personen konfigurere sit rum.\n\nEnhver bruger kan opdatere apps for alle andre brugere."</string>
+    <string name="user_add_user_message_short" msgid="1802594476285458254">"Når du tilføjer en ny bruger, skal personen konfigurere sit rum.\n\nAlle brugere kan opdatere apps for alle de andre brugere."</string>
     <string name="user_setup_dialog_title" msgid="6748950002206392396">"Vil du konfigurere brugeren nu?"</string>
     <string name="user_setup_dialog_message" msgid="2988559933258353919">"Sørg for, at brugeren har mulighed for at tage enheden og konfigurere sit eget rum"</string>
     <string name="user_setup_profile_dialog_message" msgid="7611900802824048526">"Vil du oprette en profil nu?"</string>
@@ -3216,7 +3216,7 @@
     <string name="zen_mode_block_effect_light" msgid="8679333758037487644">"Undlad at bruge blinkende lys"</string>
     <string name="zen_mode_block_effect_peek" msgid="6075662813575910221">"Undlad at vise notifikationer på skærmen"</string>
     <string name="zen_mode_block_effect_status" msgid="6516614225115681068">"Skjul statusbjælkeikoner øverst på skærmen"</string>
-    <string name="zen_mode_block_effect_badge" msgid="3891743027347075136">"Skjul notifikationscirkler på appikoner"</string>
+    <string name="zen_mode_block_effect_badge" msgid="3891743027347075136">"Skjul notifikationsprikker på appikoner"</string>
     <string name="zen_mode_block_effect_ambient" msgid="6382013125863616197">"Væk ikke ved notifikationer"</string>
     <string name="zen_mode_block_effect_list" msgid="6081548478844912181">"Skjul på listen over notifikationer"</string>
     <string name="zen_mode_block_effect_summary_none" msgid="7166175186759564510">"Aldrig"</string>
@@ -3305,7 +3305,7 @@
     <string name="asst_capabilities_actions_replies_summary" msgid="5647029698181357902">"Vis automatisk indholdsbestemte handlinger og hurtige svar i notifikationer"</string>
     <string name="hide_silent_icons_title" msgid="1070905516921542662">"Skjul statusikoner for lydløse notifikationer"</string>
     <string name="hide_silent_icons_summary" msgid="2624346914488256888">"Skjul ikoner for lydløse notifikationer på statusbjælken"</string>
-    <string name="notification_badging_title" msgid="6311699476970264712">"Tillad notifikationscirkler"</string>
+    <string name="notification_badging_title" msgid="6311699476970264712">"Tillad notifikationsprikker"</string>
     <string name="notification_bubbles_title" msgid="9196562435741861317">"Bobler"</string>
     <string name="notification_bubbles_summary" msgid="4624512775901949578">"Få hurtigt adgang til appindhold fra hvor som helst ved hjælp af svævende genveje"</string>
     <string name="bubbles_feature_education" msgid="8979109826818881018">"Nogle notifikationer og andet indhold kan blive vist som bobler på skærmen. Tryk på en boble for at åbne den. Træk den ned ad skærmen for at lukke den."</string>
@@ -3420,8 +3420,8 @@
     <string name="app_notification_block_summary" msgid="4502146897785692336">"Vis aldrig disse notifikationer"</string>
     <string name="notification_content_block_title" msgid="2805138591864484587">"Vis notifikationer"</string>
     <string name="notification_content_block_summary" msgid="2743896875255591743">"Vis aldrig notifikationer i underretningspanelet eller på eksterne enheder"</string>
-    <string name="notification_badge_title" msgid="8989086619255666442">"Tillad notifikationscirkel"</string>
-    <string name="notification_channel_badge_title" msgid="8228215248332054612">"Vis notifikationscirkel"</string>
+    <string name="notification_badge_title" msgid="8989086619255666442">"Tillad notifikationsprik"</string>
+    <string name="notification_channel_badge_title" msgid="8228215248332054612">"Vis notifikationsprik"</string>
     <string name="app_notification_override_dnd_title" msgid="1757042206738172601">"Tilsidesæt Forstyr ikke"</string>
     <string name="app_notification_override_dnd_summary" msgid="3152957611171210980">"Bliv ved med at få disse notifikationer, når Forstyr ikke er aktiveret"</string>
     <string name="app_notification_visibility_override_title" msgid="2349335170165637672">"På låseskærmen"</string>
@@ -4483,7 +4483,7 @@
     <string name="copyable_slice_toast" msgid="1357518174923789947">"<xliff:g id="COPY_CONTENT">%1$s</xliff:g> blev kopieret til udklipsholderen."</string>
     <string name="search_bar_account_avatar_content_description" msgid="947628881535053409"></string>
     <string name="permission_bar_chart_empty_text" msgid="5893326513700540130">"0 apps har anvendt tilladelser"</string>
-    <string name="permission_bar_chart_title" msgid="874145405516650073">"Brug af tilladelse i de sidste 24 timer"</string>
+    <string name="permission_bar_chart_title" msgid="874145405516650073">"Anvendte tilladelser i de sidste 24 timer"</string>
     <string name="permission_bar_chart_details" msgid="942094334321073927">"Se alt i kontrolpanelet"</string>
     <plurals name="permission_bar_chart_label" formatted="false" msgid="2831305719356562097">
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> app</item>
diff --git a/tests/CarDeveloperOptions/res/values-de/arrays.xml b/tests/CarDeveloperOptions/res/values-de/arrays.xml
index 7b5df1a..58b1f78 100644
--- a/tests/CarDeveloperOptions/res/values-de/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-de/arrays.xml
@@ -474,7 +474,7 @@
   <string-array name="wifi_metered_entries">
     <item msgid="4329206416008519163">"Automatisch erkennen"</item>
     <item msgid="773943026484148895">"Wie \"kostenpflichtig\" behandeln"</item>
-    <item msgid="1008268820118852416">"Wie \"kostenlos\" behandeln"</item>
+    <item msgid="1008268820118852416">"Wie \"ohne Datenlimit\" behandeln"</item>
   </string-array>
   <string-array name="wifi_privacy_entries">
     <item msgid="6545683814310036454">"Zufällige MAC-Adresse verwenden (Standard)"</item>
diff --git a/tests/CarDeveloperOptions/res/values-de/strings.xml b/tests/CarDeveloperOptions/res/values-de/strings.xml
index 704cc29..4cdf49a 100644
--- a/tests/CarDeveloperOptions/res/values-de/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-de/strings.xml
@@ -460,7 +460,7 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="6706047245716780006">"Überspringen"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="2534925227627658819">"Abbrechen"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="8909829699273726469">"Sensor berühren"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="581120963079780740">"Er befindet sich auf der Rückseite deines Smartphones. Verwende am besten den Zeigefinger."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="581120963079780740">"Er befindet sich auf der Rückseite des Smartphones. Am besten den Zeigefinger verwenden."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="7835824123269738540">"Abbildung mit Gerät und Position des Fingerabdrucksensors"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="3519748398694308901">"Name"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="3428927518029038956">"Ok"</string>
@@ -548,7 +548,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="2429667472335773519">"Tablet schützen"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="4739290104106645233">"Gerät schützen"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="3911582328576859628">"Smartphone schützen"</string>
-    <string name="lock_settings_picker_biometrics_added_security_message" msgid="799453282539387294">"Richte für zusätzliche Sicherheit eine alternative Displaysperre ein"</string>
+    <string name="lock_settings_picker_biometrics_added_security_message" msgid="799453282539387294">"Alternative Displaysperre einrichten für zusätzliche Sicherheit"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="7230799135599877804">"Du kannst verhindern, dass andere Personen dieses Tablet ohne deine Erlaubnis verwenden, indem du die Schutzfunktionen für dein Mobilgerät aktivierst. Wähle eine Displaysperre aus."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="2098404520816295371">"Du kannst verhindern, dass andere Personen dieses Gerät ohne deine Erlaubnis verwenden, indem du die Schutzfunktionen für dein Mobilgerät aktivierst. Wähle eine Displaysperre aus."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="2003984443953672040">"Du kannst verhindern, dass andere Personen dieses Smartphone ohne deine Erlaubnis verwenden, indem du die Schutzfunktionen für dein Mobilgerät aktivierst. Wähle eine Displaysperre aus."</string>
@@ -1712,7 +1712,7 @@
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="4921343500484160894">"Für Fingerabdruck Passwort festlegen"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="314870151462139417">"Für Fingerabdruck Muster festlegen"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="8942598950627277885">"Richte zur Sicherheit eine PIN ein"</string>
-    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1102927520952116303">"Für Fingerabdruck PIN festlegen"</string>
+    <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1102927520952116303">"PIN für Fingerabdruck festlegen"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="1503075455752279687">"Richte zur Sicherheit ein Muster ein"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="9055242184126838887">"Passwort noch einmal eingeben"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7137526922696316545">"Muster bestätigen"</string>
@@ -3195,7 +3195,7 @@
     <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">"Visuelle Störungen blockieren"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6608239691864638854">"Visuelle Signale zulassen"</string>
-    <string name="zen_mode_settings_category" msgid="5601680733422424922">"Wenn \"Bitte nicht stören\" aktiviert ist"</string>
+    <string name="zen_mode_settings_category" msgid="5601680733422424922">"Wenn „Bitte nicht stören“ aktiviert ist"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="7486753018073540477">"Benachrichtigungen einschränken"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="2673665450311184875">"Kein akustisches Signal bei Benachrichtigungen"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="1696217042353376674">"Benachrichtigungen werden angezeigt"</string>
@@ -3233,11 +3233,11 @@
     <string name="zen_mode_enable_dialog_turn_on" msgid="6396050543542026184">"Aktivieren"</string>
     <string name="zen_mode_button_turn_on" msgid="1097964136225943415">"Jetzt aktivieren"</string>
     <string name="zen_mode_button_turn_off" msgid="3990967728457149454">"Jetzt deaktivieren"</string>
-    <string name="zen_mode_settings_dnd_manual_end_time" msgid="4307574188962071429">"\"Bitte nicht stören\" ist aktiviert bis <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_settings_dnd_manual_end_time" msgid="4307574188962071429">"„Bitte nicht stören“ ist aktiviert bis <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="3701005376825238752">"\"Bitte nicht stören\" bleibt aktiviert, bis du es deaktivierst."</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="2843297614114625408">"\"Bitte nicht stören\" wurde automatisch durch einen Zeitplan (<xliff:g id="RULE_NAME">%s</xliff:g>) aktiviert"</string>
     <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="5103454923160912313">"\"Bitte nicht stören\" wurde automatisch durch eine App (<xliff:g id="APP_NAME">%s</xliff:g>) aktiviert"</string>
-    <string name="zen_mode_settings_dnd_custom_settings_footer" msgid="6335108298640066560">"\"Bitte nicht stören\" ist mit benutzerdefinierten Einstellungen für \"<xliff:g id="RULE_NAMES">%s</xliff:g>\" aktiviert."</string>
+    <string name="zen_mode_settings_dnd_custom_settings_footer" msgid="6335108298640066560">"„Bitte nicht stören“ ist mit benutzerdefinierten Einstellungen für „<xliff:g id="RULE_NAMES">%s</xliff:g>“ aktiviert."</string>
     <string name="zen_mode_settings_dnd_custom_settings_footer_link" msgid="4007974052885089379"><annotation id="link">" Benutzerdefinierte Einstellungen ansehen"</annotation></string>
     <string name="zen_interruption_level_priority" msgid="9178419297408319234">"Nur wichtige Unterbrechungen"</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>
@@ -3260,7 +3260,7 @@
     <string name="zen_category_exceptions" msgid="2139670640033601899">"Ausnahmen"</string>
     <string name="zen_category_schedule" msgid="989629666210114164">"Zeitplan"</string>
     <string name="zen_sound_title" msgid="3429086967245473870">"Alle Ausnahmen anzeigen"</string>
-    <string name="zen_sound_footer" msgid="1778673975517424878">"Wenn \"Bitte nicht stören\" aktiviert ist, ist weder ein akustisches Signal zu hören noch eine Vibration zu spüren. Mit den Einstellungen oben kannst du festlegen, welche Ausnahmen gelten sollten."</string>
+    <string name="zen_sound_footer" msgid="1778673975517424878">"Wenn „Bitte nicht stören“ aktiviert ist, ist weder ein akustisches Signal zu hören noch eine Vibration zu spüren. Mit den Einstellungen oben kannst du festlegen, welche Ausnahmen gelten sollten."</string>
     <string name="zen_sound_category_title" msgid="2109447208414722786">"Alle stummschalten außer"</string>
     <string name="zen_sound_all_muted" msgid="4844094866910870591">"Stummgeschaltet"</string>
     <string name="zen_sound_none_muted" msgid="4869385974769188085">"Nicht stummgeschaltet"</string>
@@ -3273,7 +3273,7 @@
     <string name="zen_custom_settings_notifications_header" msgid="7469592764589354302">"Benachrichtigungen"</string>
     <string name="zen_custom_settings_duration_header" msgid="1806465684026300942">"Dauer"</string>
     <string name="zen_msg_event_reminder_title" msgid="8685224436389816905">"Nachrichten, Termine &amp; Erinnerungen"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="164400918479831580">"Wenn \"Bitte nicht stören\" aktiviert ist, werden alle Nachrichten, Erinnerungen und Termine stummgeschaltet. Mit den Einstellungen oben kannst du festlegen, welche Ausnahmen gelten sollen. Die Nachrichteneinstellungen lassen sich anpassen, damit dich Freunde, Familie oder andere Kontakte erreichen können."</string>
+    <string name="zen_msg_event_reminder_footer" msgid="164400918479831580">"Wenn „Bitte nicht stören“ aktiviert ist, werden alle Nachrichten, Erinnerungen und Termine stummgeschaltet. Mit den Einstellungen oben kannst du festlegen, welche Ausnahmen gelten sollen. Die Nachrichteneinstellungen lassen sich anpassen, damit dich Freunde, Familie oder andere Kontakte erreichen können."</string>
     <string name="zen_onboarding_ok" msgid="6403635918125323678">"Fertig"</string>
     <string name="zen_onboarding_settings" msgid="1416466597876383322">"Einstellungen"</string>
     <string name="zen_onboarding_new_setting_title" msgid="3622673375041304362">"Kein optisches oder akustisches Signal bei Benachrichtigungen"</string>
@@ -3424,7 +3424,7 @@
     <string name="notification_badge_title" msgid="8989086619255666442">"App-Benachrichtigungspunkt erlauben"</string>
     <string name="notification_channel_badge_title" msgid="8228215248332054612">"App-Benachrichtigungspunkt anzeigen"</string>
     <string name="app_notification_override_dnd_title" msgid="1757042206738172601">"\"Bitte nicht stören\" ignorieren"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3152957611171210980">"Diese Benachrichtigungen dürfen auch dann gemeldet werden, wenn \"Bitte nicht stören\" aktiviert ist"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3152957611171210980">"Diese Benachrichtigungen dürfen auch dann gemeldet werden, wenn „Bitte nicht stören“ aktiviert ist"</string>
     <string name="app_notification_visibility_override_title" msgid="2349335170165637672">"Auf dem Sperrbildschirm"</string>
     <string name="app_notification_row_banned" msgid="2079325338122151677">"Blockiert"</string>
     <string name="app_notification_row_priority" msgid="432299064888787236">"Wichtig"</string>
@@ -3891,7 +3891,7 @@
     <string name="condition_hotspot_title" msgid="4143299802283098506">"Hotspot ist aktiv"</string>
     <string name="condition_airplane_title" msgid="8484582712516148433">"Flugzeugmodus aktiviert"</string>
     <string name="condition_airplane_summary" msgid="3021193218494740742">"Netzwerke nicht verfügbar"</string>
-    <string name="condition_zen_title" msgid="2128184708916052585">"\"Bitte nicht stören\" aktiviert"</string>
+    <string name="condition_zen_title" msgid="2128184708916052585">"„Bitte nicht stören“ aktiviert"</string>
     <string name="condition_zen_summary_phone_muted" msgid="4396050395522974654">"Smartphone stummgeschaltet"</string>
     <string name="condition_zen_summary_with_exceptions" msgid="3435216391993785818">"Mit Ausnahmen"</string>
     <string name="condition_battery_title" msgid="6704870010912986274">"Energiesparmodus aktiviert"</string>
diff --git a/tests/CarDeveloperOptions/res/values-en-rAU/strings.xml b/tests/CarDeveloperOptions/res/values-en-rAU/strings.xml
index 269d56e..086eb80 100644
--- a/tests/CarDeveloperOptions/res/values-en-rAU/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-en-rAU/strings.xml
@@ -1313,7 +1313,7 @@
     <string name="security_patch" msgid="483709031051932208">"Android security patch level"</string>
     <string name="model_info" msgid="1729765474260797594">"Model"</string>
     <string name="model_summary" msgid="8781425868254352168">"Model: %1$s"</string>
-    <string name="hardware_info" msgid="174270144950621815">"Model &amp; hardware"</string>
+    <string name="hardware_info" msgid="174270144950621815">"Model and hardware"</string>
     <string name="hardware_revision" msgid="3315744162524354246">"Hardware version"</string>
     <string name="fcc_equipment_id" msgid="8681995718533066093">"Equipment ID"</string>
     <string name="baseband_version" msgid="9115560821840757786">"Baseband version"</string>
@@ -1326,7 +1326,7 @@
     <string name="device_status_summary" product="tablet" msgid="8975790197766171710">"Status of the battery, network and other information"</string>
     <string name="device_status_summary" product="default" msgid="8282235230720651642">"Phone number, signal, etc."</string>
     <string name="storage_settings" msgid="7009733301485139652">"Storage"</string>
-    <string name="storage_settings_for_app" msgid="3028887232073069965">"Storage &amp; cache"</string>
+    <string name="storage_settings_for_app" msgid="3028887232073069965">"Storage and cache"</string>
     <string name="storage_usb_settings" msgid="4470138799276333403">"Storage"</string>
     <string name="storage_settings_title" msgid="7348362600789024415">"Storage settings"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="600267641559698394">"Unmount USB storage, view available storage"</string>
@@ -2629,8 +2629,8 @@
     <string name="remove_account_label" msgid="5885425720323823387">"Remove account"</string>
     <string name="header_add_an_account" msgid="8482614556580804956">"Add an account"</string>
     <string name="really_remove_account_title" msgid="4166512362915154319">"Remove account?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Removing this account will delete all of its messages, contacts and other data from the tablet!"</string>
-    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Removing this account will delete all of its messages, contacts and other data from the phone!"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Removing this account will delete all of its messages, contacts and other data from the tablet."</string>
+    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Removing this account will delete all of its messages, contacts and other data from the phone."</string>
     <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Removing this account will delete all of its messages, contacts and other data from the device."</string>
     <string name="remove_account_failed" msgid="491458185327106966">"This change isn\'t allowed by your admin"</string>
     <string name="cant_sync_dialog_title" msgid="5483419398223189881">"Cannot sync manually"</string>
@@ -4100,7 +4100,7 @@
       <item quantity="one">1 second</item>
     </plurals>
     <string name="automatic_storage_manager_settings" msgid="2403621409625820182">"Manage storage"</string>
-    <string name="automatic_storage_manager_text" msgid="4270379105066667493">"To help free up storage space, storage manager removes backed up photos and videos from your device."</string>
+    <string name="automatic_storage_manager_text" msgid="4270379105066667493">"To help free up storage space, storage manager removes backed-up photos and videos from your device."</string>
     <string name="automatic_storage_manager_days_title" msgid="1783767804707813799">"Remove photos &amp; videos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="4668642150512639466">"Storage manager"</string>
     <string name="automatic_storage_manager_master_switch_title" msgid="1456978117739582562">"Use Storage Manager"</string>
diff --git a/tests/CarDeveloperOptions/res/values-en-rCA/strings.xml b/tests/CarDeveloperOptions/res/values-en-rCA/strings.xml
index d1009be..587287f 100644
--- a/tests/CarDeveloperOptions/res/values-en-rCA/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-en-rCA/strings.xml
@@ -302,7 +302,7 @@
     <string name="settings_shortcut" msgid="4503714880251502167">"Settings shortcut"</string>
     <string name="airplane_mode" msgid="4508870277398231073">"Airplane mode"</string>
     <string name="wireless_networks_settings_title" msgid="4298430520189173949">"Wireless &amp; networks"</string>
-    <string name="radio_controls_summary" msgid="4596981962167684814">"Manage Wi‑Fi, Bluetooth, airplane mode, mobile networks, &amp; VPNs"</string>
+    <string name="radio_controls_summary" msgid="4596981962167684814">"Manage Wi‑Fi, Bluetooth, Airplane mode, mobile networks and VPNs"</string>
     <string name="cellular_data_title" msgid="7909624119432695022">"Mobile data"</string>
     <string name="calls_title" msgid="875693497825736550">"Allow calls"</string>
     <string name="sms_messages_title" msgid="934188835214592753">"SMS messages"</string>
@@ -1313,7 +1313,7 @@
     <string name="security_patch" msgid="483709031051932208">"Android security patch level"</string>
     <string name="model_info" msgid="1729765474260797594">"Model"</string>
     <string name="model_summary" msgid="8781425868254352168">"Model: %1$s"</string>
-    <string name="hardware_info" msgid="174270144950621815">"Model &amp; hardware"</string>
+    <string name="hardware_info" msgid="174270144950621815">"Model and hardware"</string>
     <string name="hardware_revision" msgid="3315744162524354246">"Hardware version"</string>
     <string name="fcc_equipment_id" msgid="8681995718533066093">"Equipment ID"</string>
     <string name="baseband_version" msgid="9115560821840757786">"Baseband version"</string>
@@ -1326,7 +1326,7 @@
     <string name="device_status_summary" product="tablet" msgid="8975790197766171710">"Status of the battery, network and other information"</string>
     <string name="device_status_summary" product="default" msgid="8282235230720651642">"Phone number, signal, etc."</string>
     <string name="storage_settings" msgid="7009733301485139652">"Storage"</string>
-    <string name="storage_settings_for_app" msgid="3028887232073069965">"Storage &amp; cache"</string>
+    <string name="storage_settings_for_app" msgid="3028887232073069965">"Storage and cache"</string>
     <string name="storage_usb_settings" msgid="4470138799276333403">"Storage"</string>
     <string name="storage_settings_title" msgid="7348362600789024415">"Storage settings"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="600267641559698394">"Unmount USB storage, view available storage"</string>
@@ -1673,8 +1673,8 @@
     <string name="location_street_level" product="tablet" msgid="4459804798444296650">"Let apps use GPS on your tablet to pinpoint your location"</string>
     <string name="location_street_level" product="default" msgid="7407688345675450051">"Let apps use GPS on your phone to pinpoint your location"</string>
     <string name="assisted_gps" msgid="5411780261117055175">"Use assisted GPS"</string>
-    <string name="assisted_gps_enabled" msgid="2561022181775725369">"Use server to assist GPS (un-tick to reduce network usage)"</string>
-    <string name="assisted_gps_disabled" msgid="6448758788217415937">"Use server to assist GPS (un-tick to improve GPS performance)"</string>
+    <string name="assisted_gps_enabled" msgid="2561022181775725369">"Use server to assist GPS (uncheck to reduce network usage)"</string>
+    <string name="assisted_gps_disabled" msgid="6448758788217415937">"Use server to assist GPS (uncheck to improve GPS performance)"</string>
     <string name="use_location_title" msgid="7724788634359496634">"Location &amp; Google search"</string>
     <string name="use_location_summary" msgid="7396716606067400283">"Let Google use your location to improve search results and other services"</string>
     <string name="location_access_title" msgid="8587974819606800029">"Access to my location"</string>
@@ -2402,7 +2402,7 @@
     <string name="battery_desc_standby" product="tablet" msgid="2941777996429933419">"Battery used when tablet is idle"</string>
     <string name="battery_desc_standby" product="default" msgid="8889482616564520287">"Battery used when phone is idle"</string>
     <string name="battery_desc_radio" msgid="5119078473833865414">"Battery used by mobile radio"</string>
-    <string name="battery_sugg_radio" msgid="3616364509738133415">"Switch to airplane mode to save power in areas with no cell coverage"</string>
+    <string name="battery_sugg_radio" msgid="3616364509738133415">"Switch to Airplane mode to save power in areas with no cell coverage"</string>
     <string name="battery_desc_flashlight" msgid="4574819522143720917">"Battery used by the flashlight"</string>
     <string name="battery_desc_camera" msgid="517966830222999462">"Battery used by the camera"</string>
     <string name="battery_desc_display" msgid="6701005808894183097">"Battery used by the display and backlight"</string>
@@ -2629,8 +2629,8 @@
     <string name="remove_account_label" msgid="5885425720323823387">"Remove account"</string>
     <string name="header_add_an_account" msgid="8482614556580804956">"Add an account"</string>
     <string name="really_remove_account_title" msgid="4166512362915154319">"Remove account?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Removing this account will delete all of its messages, contacts and other data from the tablet!"</string>
-    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Removing this account will delete all of its messages, contacts and other data from the phone!"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Removing this account will delete all of its messages, contacts and other data from the tablet."</string>
+    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Removing this account will delete all of its messages, contacts and other data from the phone."</string>
     <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Removing this account will delete all of its messages, contacts and other data from the device."</string>
     <string name="remove_account_failed" msgid="491458185327106966">"This change isn\'t allowed by your admin"</string>
     <string name="cant_sync_dialog_title" msgid="5483419398223189881">"Cannot sync manually"</string>
@@ -4100,7 +4100,7 @@
       <item quantity="one">1 second</item>
     </plurals>
     <string name="automatic_storage_manager_settings" msgid="2403621409625820182">"Manage storage"</string>
-    <string name="automatic_storage_manager_text" msgid="4270379105066667493">"To help free up storage space, storage manager removes backed up photos and videos from your device."</string>
+    <string name="automatic_storage_manager_text" msgid="4270379105066667493">"To help free up storage space, storage manager removes backed-up photos and videos from your device."</string>
     <string name="automatic_storage_manager_days_title" msgid="1783767804707813799">"Remove photos &amp; videos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="4668642150512639466">"Storage manager"</string>
     <string name="automatic_storage_manager_master_switch_title" msgid="1456978117739582562">"Use Storage Manager"</string>
diff --git a/tests/CarDeveloperOptions/res/values-en-rGB/strings.xml b/tests/CarDeveloperOptions/res/values-en-rGB/strings.xml
index ff3da11..3924c9e 100644
--- a/tests/CarDeveloperOptions/res/values-en-rGB/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-en-rGB/strings.xml
@@ -1313,7 +1313,7 @@
     <string name="security_patch" msgid="483709031051932208">"Android security patch level"</string>
     <string name="model_info" msgid="1729765474260797594">"Model"</string>
     <string name="model_summary" msgid="8781425868254352168">"Model: %1$s"</string>
-    <string name="hardware_info" msgid="174270144950621815">"Model &amp; hardware"</string>
+    <string name="hardware_info" msgid="174270144950621815">"Model and hardware"</string>
     <string name="hardware_revision" msgid="3315744162524354246">"Hardware version"</string>
     <string name="fcc_equipment_id" msgid="8681995718533066093">"Equipment ID"</string>
     <string name="baseband_version" msgid="9115560821840757786">"Baseband version"</string>
@@ -1326,7 +1326,7 @@
     <string name="device_status_summary" product="tablet" msgid="8975790197766171710">"Status of the battery, network and other information"</string>
     <string name="device_status_summary" product="default" msgid="8282235230720651642">"Phone number, signal, etc."</string>
     <string name="storage_settings" msgid="7009733301485139652">"Storage"</string>
-    <string name="storage_settings_for_app" msgid="3028887232073069965">"Storage &amp; cache"</string>
+    <string name="storage_settings_for_app" msgid="3028887232073069965">"Storage and cache"</string>
     <string name="storage_usb_settings" msgid="4470138799276333403">"Storage"</string>
     <string name="storage_settings_title" msgid="7348362600789024415">"Storage settings"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="600267641559698394">"Unmount USB storage, view available storage"</string>
@@ -2629,8 +2629,8 @@
     <string name="remove_account_label" msgid="5885425720323823387">"Remove account"</string>
     <string name="header_add_an_account" msgid="8482614556580804956">"Add an account"</string>
     <string name="really_remove_account_title" msgid="4166512362915154319">"Remove account?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Removing this account will delete all of its messages, contacts and other data from the tablet!"</string>
-    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Removing this account will delete all of its messages, contacts and other data from the phone!"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Removing this account will delete all of its messages, contacts and other data from the tablet."</string>
+    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Removing this account will delete all of its messages, contacts and other data from the phone."</string>
     <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Removing this account will delete all of its messages, contacts and other data from the device."</string>
     <string name="remove_account_failed" msgid="491458185327106966">"This change isn\'t allowed by your admin"</string>
     <string name="cant_sync_dialog_title" msgid="5483419398223189881">"Cannot sync manually"</string>
@@ -4100,7 +4100,7 @@
       <item quantity="one">1 second</item>
     </plurals>
     <string name="automatic_storage_manager_settings" msgid="2403621409625820182">"Manage storage"</string>
-    <string name="automatic_storage_manager_text" msgid="4270379105066667493">"To help free up storage space, storage manager removes backed up photos and videos from your device."</string>
+    <string name="automatic_storage_manager_text" msgid="4270379105066667493">"To help free up storage space, storage manager removes backed-up photos and videos from your device."</string>
     <string name="automatic_storage_manager_days_title" msgid="1783767804707813799">"Remove photos &amp; videos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="4668642150512639466">"Storage manager"</string>
     <string name="automatic_storage_manager_master_switch_title" msgid="1456978117739582562">"Use Storage Manager"</string>
diff --git a/tests/CarDeveloperOptions/res/values-en-rIN/strings.xml b/tests/CarDeveloperOptions/res/values-en-rIN/strings.xml
index b65891c..a0a6339 100644
--- a/tests/CarDeveloperOptions/res/values-en-rIN/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-en-rIN/strings.xml
@@ -1313,7 +1313,7 @@
     <string name="security_patch" msgid="483709031051932208">"Android security patch level"</string>
     <string name="model_info" msgid="1729765474260797594">"Model"</string>
     <string name="model_summary" msgid="8781425868254352168">"Model: %1$s"</string>
-    <string name="hardware_info" msgid="174270144950621815">"Model &amp; hardware"</string>
+    <string name="hardware_info" msgid="174270144950621815">"Model and hardware"</string>
     <string name="hardware_revision" msgid="3315744162524354246">"Hardware version"</string>
     <string name="fcc_equipment_id" msgid="8681995718533066093">"Equipment ID"</string>
     <string name="baseband_version" msgid="9115560821840757786">"Baseband version"</string>
@@ -1326,7 +1326,7 @@
     <string name="device_status_summary" product="tablet" msgid="8975790197766171710">"Status of the battery, network and other information"</string>
     <string name="device_status_summary" product="default" msgid="8282235230720651642">"Phone number, signal, etc."</string>
     <string name="storage_settings" msgid="7009733301485139652">"Storage"</string>
-    <string name="storage_settings_for_app" msgid="3028887232073069965">"Storage &amp; cache"</string>
+    <string name="storage_settings_for_app" msgid="3028887232073069965">"Storage and cache"</string>
     <string name="storage_usb_settings" msgid="4470138799276333403">"Storage"</string>
     <string name="storage_settings_title" msgid="7348362600789024415">"Storage settings"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="600267641559698394">"Unmount USB storage, view available storage"</string>
@@ -2629,8 +2629,8 @@
     <string name="remove_account_label" msgid="5885425720323823387">"Remove account"</string>
     <string name="header_add_an_account" msgid="8482614556580804956">"Add an account"</string>
     <string name="really_remove_account_title" msgid="4166512362915154319">"Remove account?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Removing this account will delete all of its messages, contacts and other data from the tablet!"</string>
-    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Removing this account will delete all of its messages, contacts and other data from the phone!"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Removing this account will delete all of its messages, contacts and other data from the tablet."</string>
+    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Removing this account will delete all of its messages, contacts and other data from the phone."</string>
     <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Removing this account will delete all of its messages, contacts and other data from the device."</string>
     <string name="remove_account_failed" msgid="491458185327106966">"This change isn\'t allowed by your admin"</string>
     <string name="cant_sync_dialog_title" msgid="5483419398223189881">"Cannot sync manually"</string>
@@ -4100,7 +4100,7 @@
       <item quantity="one">1 second</item>
     </plurals>
     <string name="automatic_storage_manager_settings" msgid="2403621409625820182">"Manage storage"</string>
-    <string name="automatic_storage_manager_text" msgid="4270379105066667493">"To help free up storage space, storage manager removes backed up photos and videos from your device."</string>
+    <string name="automatic_storage_manager_text" msgid="4270379105066667493">"To help free up storage space, storage manager removes backed-up photos and videos from your device."</string>
     <string name="automatic_storage_manager_days_title" msgid="1783767804707813799">"Remove photos &amp; videos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="4668642150512639466">"Storage manager"</string>
     <string name="automatic_storage_manager_master_switch_title" msgid="1456978117739582562">"Use Storage Manager"</string>
diff --git a/tests/CarDeveloperOptions/res/values-es-rUS/arrays.xml b/tests/CarDeveloperOptions/res/values-es-rUS/arrays.xml
index 490207d..1ce2273 100644
--- a/tests/CarDeveloperOptions/res/values-es-rUS/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-es-rUS/arrays.xml
@@ -275,7 +275,7 @@
     <item msgid="6329507266039719587">"agregar buzón de voz"</item>
     <item msgid="7692440726415391408">"usar SIP"</item>
     <item msgid="8572453398128326267">"procesar llamada saliente"</item>
-    <item msgid="7775674394089376306">"huella digital"</item>
+    <item msgid="7775674394089376306">"huella dactilar"</item>
     <item msgid="3182815133441738779">"sensores corporales"</item>
     <item msgid="2793100005496829513">"leer emisiones móviles"</item>
     <item msgid="2633626056029384366">"ubicación ficticia"</item>
@@ -342,7 +342,7 @@
     <item msgid="9215610846802973353">"Agregar buzón de voz"</item>
     <item msgid="9186411956086478261">"Usar SIP"</item>
     <item msgid="6884763100104539558">"Procesar llamada saliente"</item>
-    <item msgid="125513972170580692">"Huella digital"</item>
+    <item msgid="125513972170580692">"Huella dactilar"</item>
     <item msgid="2556071024281275619">"Sensores corporales"</item>
     <item msgid="617168514928339387">"Leer emisiones móviles"</item>
     <item msgid="7134693570516523585">"Ubicación ficticia"</item>
diff --git a/tests/CarDeveloperOptions/res/values-es-rUS/strings.xml b/tests/CarDeveloperOptions/res/values-es-rUS/strings.xml
index 54d857e..5e8ef56 100644
--- a/tests/CarDeveloperOptions/res/values-es-rUS/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-es-rUS/strings.xml
@@ -95,7 +95,7 @@
     <string name="bluetooth_is_discoverable" msgid="6748888489356326898">"Visible para todos los dispositivos Bluetooth cercanos (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="6835934878803488274">"Visible para todos los dispositivos Bluetooth cercanos"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9134284066024557293">"No visible para otros dispositivos Bluetooth"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="3830247336229883519">"Solo visible para los dispositivos sincronizados"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="3830247336229883519">"Solo visible para los dispositivos vinculados"</string>
     <string name="bluetooth_visibility_timeout" msgid="4804679276398564496">"Definir visibilidad"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="1600385868298081015">"Bloquear marcación por voz"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="5005776616112427980">"Impedir el uso de Bluetooth del dispositivo cuando la pantalla esté bloqueada."</string>
@@ -113,7 +113,7 @@
     <string name="bluetooth_disconnect_all_profiles" product="device" msgid="4707569949253450208">"Tu dispositivo se desconectará de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_disconnect_dialog_ok" msgid="4183522987246110145">"Desconectar"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="3616298363281495777">"No tienes permiso para cambiar la configuración de Bluetooth."</string>
-    <string name="bluetooth_pairing_pref_title" msgid="2904954138013884029">"Sincronizar dispositivo nuevo"</string>
+    <string name="bluetooth_pairing_pref_title" msgid="2904954138013884029">"Vincular dispositivo nuevo"</string>
     <string name="bluetooth_is_visible_message" msgid="6341088682252805612">"Los dispositivos cercanos podrán ver tu <xliff:g id="DEVICE_NAME">%1$s</xliff:g> si está abierta la configuración de Bluetooth."</string>
     <string name="bluetooth_footer_mac_message" product="default" msgid="335341476746836260">"Dirección Bluetooth del teléfono: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_footer_mac_message" product="tablet" msgid="6033609611245782463">"Dirección Bluetooth de la tablet: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
@@ -124,8 +124,8 @@
     <string name="progress_scanning" msgid="633923400401041181">"Buscando"</string>
     <string name="bluetooth_no_devices_found" msgid="4396050022213494322">"No se encontraron dispositivos Bluetooth cercanos."</string>
     <string name="bluetooth_notif_ticker" msgid="8398481099943141819">"Solicitud de vinculación de Bluetooth"</string>
-    <string name="bluetooth_notif_title" msgid="5090288898529286011">"Vinculando solicitud"</string>
-    <string name="bluetooth_notif_message" msgid="6612367890895077938">"Presiona para realizar una sincronización con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_notif_title" msgid="5090288898529286011">"Solicitud de vinculación"</string>
+    <string name="bluetooth_notif_message" msgid="6612367890895077938">"Presiona para vincular con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5060846395852236652">"Archivos recibidos"</string>
     <string name="bluetooth_show_files_received_via_bluetooth" msgid="1699095577431389560">"Archivos recibidos (Bluetooth)"</string>
     <string name="device_picker" msgid="8345264486071697705">"Elegir dispositivo"</string>
@@ -165,7 +165,7 @@
     <string name="bluetooth_device_name_summary" msgid="8661066392056595005">"Visible como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para otros dispositivos"</string>
     <string name="bluetooth_off_footer" msgid="7658444560543730571">"Activa el Bluetooth para establecer conexión con otros dispositivos."</string>
     <string name="bluetooth_paired_device_title" msgid="8361860197780425286">"Tus dispositivos"</string>
-    <string name="bluetooth_pairing_page_title" msgid="9053463656712597709">"Sincronizar dispositivo nuevo"</string>
+    <string name="bluetooth_pairing_page_title" msgid="9053463656712597709">"Vincular dispositivo nuevo"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3601662966604648212">"Permite que la tablet se comunique con dispositivos Bluetooth cercanos"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2286727776570956969">"Permite que el dispositivo se comunique con dispositivos Bluetooth cercanos"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="863659221858781186">"Permite que el teléfono se comunique con dispositivos Bluetooth cercanos"</string>
@@ -178,7 +178,7 @@
     <string name="connected_device_available_call_title" msgid="6774859446815858428">"Dispositivos de llamada disponibles"</string>
     <string name="connected_device_connected_title" msgid="6255107326608785482">"Conectados actualmente"</string>
     <string name="connected_device_saved_title" msgid="8270136893488475163">"Dispositivos guardados"</string>
-    <string name="connected_device_add_device_summary" msgid="7960491471270158891">"Se activará el Bluetooth para sincronizar"</string>
+    <string name="connected_device_add_device_summary" msgid="7960491471270158891">"Se activará el Bluetooth para vincular"</string>
     <string name="connected_device_connections_title" msgid="9205000271382018428">"Preferencias de conexión"</string>
     <string name="connected_device_previously_connected_title" msgid="225918223397410428">"Dispositivos conectados previamente"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="2018789662358162716">"Conectados anteriormente"</string>
@@ -355,7 +355,7 @@
     <string name="security_enable_widgets_title" msgid="1701510007926738088">"Habilitar widgets"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="4408176087132339331">"El administrador inhabilitó la opción"</string>
     <string name="lockdown_settings_title" msgid="4534779922580115990">"Mostrar opción de bloqueo"</string>
-    <string name="lockdown_settings_summary" msgid="7270756909878256174">"Mostrar la opción del botón de encendido que desactiva Smart Lock, el desbloqueo con huella digital y las notificaciones en la pantalla bloqueada"</string>
+    <string name="lockdown_settings_summary" msgid="7270756909878256174">"Mostrar la opción del botón de encendido que desactiva Smart Lock, el desbloqueo con huella dactilar y las notificaciones en la pantalla bloqueada"</string>
     <string name="trust_agents_extend_unlock_title" msgid="3582017561316089951">"Los agentes de confianza solo extienden el desbloqueo"</string>
     <string name="trust_agents_extend_unlock_summary" msgid="3543997596586078084">"Si habilitas la opción, los agentes de confianza mantendrán el dispositivo desbloqueado durante más tiempo, pero ya no podrán desbloquear un dispositivo bloqueado."</string>
     <string name="trust_lost_locks_screen_title" msgid="3094736590690459372">"Bloquear pantalla al perder confianza"</string>
@@ -390,7 +390,7 @@
     <string name="disabled_by_administrator_summary" msgid="6099821045360491127">"El administrador inhabilitó esta opción"</string>
     <string name="security_status_title" msgid="1261960357751754428">"Estado de seguridad"</string>
     <string name="security_dashboard_summary_face" msgid="2536136110153593745">"Bloqueo de pantalla, desbloqueo facial"</string>
-    <string name="security_dashboard_summary" msgid="4048877125766167227">"Bloqueo de pantalla, huella digital"</string>
+    <string name="security_dashboard_summary" msgid="4048877125766167227">"Bloqueo de pantalla, huella dactilar"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="8861903321053490658">"Bloqueo de pantalla"</string>
     <string name="security_settings_face_preference_summary" msgid="4437701024542221434">"Se agregó el rostro"</string>
     <string name="security_settings_face_preference_summary_none" msgid="8427755590493904386">"Toca para configurar la autentic. facial"</string>
@@ -427,27 +427,27 @@
     <string name="security_settings_face_settings_footer" msgid="4627175759990550715">"Usa el reconocimiento facial para desbloquear el dispositivo y acceder a las apps. "<annotation id="url">"Más información"</annotation></string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="5675319895815271094">"¿Quieres borrar los datos faciales?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3754494807169276107">"Se borrarán de forma permanente y segura los datos que registró el desbloqueo facial. Luego de la eliminación, deberás ingresar tu PIN, patrón o contraseña para desbloquear el teléfono, acceder a las apps y confirmar pagos."</string>
-    <string name="security_settings_fingerprint_preference_title" msgid="4177132225930582928">"Huella digital"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="4177132225930582928">"Huella dactilar"</string>
     <string name="fingerprint_manage_category_title" msgid="1463406696801542090">"Adm. huellas digitales"</string>
-    <string name="fingerprint_usage_category_title" msgid="7298369141954599706">"Usar huella dig. para"</string>
-    <string name="fingerprint_add_title" msgid="6840343900784463856">"Agregar una huella digital"</string>
+    <string name="fingerprint_usage_category_title" msgid="7298369141954599706">"Usar huella dac. para"</string>
+    <string name="fingerprint_add_title" msgid="6840343900784463856">"Agregar una huella dactilar"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="8847663949921113437">"bloqueo de pantalla"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="2033416761172877041">
-      <item quantity="other">Se configuraron <xliff:g id="COUNT_1">%1$d</xliff:g> huellas digitales</item>
-      <item quantity="one">Se configuró <xliff:g id="COUNT_0">%1$d</xliff:g> huella digital</item>
+      <item quantity="other">Se configuraron <xliff:g id="COUNT_1">%1$d</xliff:g> huellas dactilares</item>
+      <item quantity="one">Se configuró <xliff:g id="COUNT_0">%1$d</xliff:g> huella dactilar</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="3613424536269750172"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="889558002683900544">"Desbloquea con tu huella digital"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7915504118657864429">"Usa tus huellas digitales"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="5586198131986682472">"Solo toca el sensor de huellas digitales para desbloquear tu teléfono, autorizar compras o acceder a las apps. Ten cuidado con las personas que agregas, ya que todas las huellas digitales que agregues podrán realizar estas acciones.\n\nNota: Tu huella digital puede ser menos segura que un PIN o un patrón eficaz."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1640839304679275468">"Usa tu huella digital para desbloquear el teléfono o aprobar compras.\n\nNota: No puedes usar tu huella digital para desbloquear este dispositivo. Para obtener más información, comunícate con el administrador de la organización."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6734490666593320711">"Usa tu huella digital para desbloquear el teléfono o aprobar compras.\n\nNota: Es posible que la huella digital no sea tan segura como un PIN o un patrón eficaz."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="889558002683900544">"Desbloquea con tu huella dactilar"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7915504118657864429">"Usa tus huellas dactilares"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="5586198131986682472">"Solo toca el sensor de huellas dactilares para desbloquear tu teléfono, autorizar compras o acceder a las apps. Ten cuidado con las personas que agregas, ya que todas las huellas dactilares que agregues podrán realizar estas acciones.\n\nNota: Tu huella dactilar puede ser menos segura que un PIN o un patrón eficaz."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1640839304679275468">"Usa tu huella dactilar para desbloquear el teléfono o aprobar compras.\n\nNota: No puedes usar tu huella dactilar para desbloquear este dispositivo. Para obtener más información, comunícate con el administrador de la organización."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6734490666593320711">"Usa tu huella dactilar para desbloquear el teléfono o aprobar compras.\n\nNota: Es posible que la huella dactilar no sea tan segura como un PIN o un patrón eficaz."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="9168637333731599827">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="271662150372486535">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="756928427429893070">"Omitir"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="4125977169169671144">"Siguiente"</string>
-    <string name="setup_fingerprint_enroll_skip_title" msgid="763018850721691594">"¿Omitir huella digital?"</string>
-    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="8849928362049018680">"La configuración de la huella digital solo toma unos minutos. Si omites este paso, puedes agregarla más tarde en la configuración."</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="763018850721691594">"¿Omitir huella dactilar?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="8849928362049018680">"La configuración de la huella dactilar solo toma unos minutos. Si omites este paso, puedes agregarla más tarde en la configuración."</string>
     <string name="lock_screen_intro_skip_title" msgid="5307431665496346914">"¿Omitir bloqueo de la pantalla?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7553945981266845264">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otras personas usen esta tablet si la pierdes, te la roban o se restablece."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="1378243257238015603">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otras personas lo usen si lo pierdes, te lo roban o se restablece."</string>
@@ -461,22 +461,22 @@
     <string name="cancel_lock_screen_dialog_button_label" msgid="2534925227627658819">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="8909829699273726469">"Toca el sensor"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="581120963079780740">"Se encuentra en la parte posterior del teléfono. Usa el dedo índice."</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="7835824123269738540">"Ilustración del dispositivo y la ubicación del sensor de huellas digitales"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="7835824123269738540">"Ilustración del dispositivo y la ubicación del sensor de huellas dactilares"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="3519748398694308901">"Nombre"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="3428927518029038956">"Aceptar"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4312297515772004580">"Borrar"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="1346287821809975177">"Toca el sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="750040530347336376">"Coloca el dedo en el sensor y levántalo cuando sientas una vibración."</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="1764145704166303842">"Levanta el dedo y vuelve a tocar"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4434560313661204448">"Sigue levantando el dedo para agregar diferentes partes de la huella digital."</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="2987918958909117821">"Se agregó la huella digital"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="5862643337893923347">"Cuando veas este ícono, usa tu huella digital para identificarte o aprobar compras."</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4434560313661204448">"Sigue levantando el dedo para agregar diferentes partes de la huella dactilar."</string>
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="2987918958909117821">"Se agregó la huella dactilar"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="5862643337893923347">"Cuando veas este ícono, usa tu huella dactilar para identificarte o aprobar compras."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="1473280156532146933">"Más tarde"</string>
-    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="2816424026528101690">"¿Omitir configuración de huella digital?"</string>
-    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="8139299964344809780">"Decidiste usar la huella digital como una de las formas para desbloquear el teléfono. Si omites este paso, tendrás que configurarla más tarde. La configuración tarda un minuto aproximadamente."</string>
-    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="tablet" msgid="1384438077720821127">"Protege la tablet con una opción de bloqueo de pantalla para que nadie pueda usarla si la pierdes o te la roban. Además, tienes que establecer una opción de bloqueo de pantalla para configurar la huella digital. Presiona Cancelar y, luego, establece un PIN o elige otra opción de bloqueo de pantalla."</string>
-    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="device" msgid="7207112623501771824">"Protege el dispositivo con una opción de bloqueo de pantalla para que nadie pueda usarlo si lo pierdes o te lo roban. Además, tienes que establecer una opción de bloqueo de pantalla para configurar la huella digital. Presiona Cancelar y, luego, establece un PIN o elige otra opción de bloqueo de pantalla."</string>
-    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="default" msgid="7623975730623531606">"Protege el teléfono con una opción de bloqueo de pantalla para que nadie pueda usarlo si lo pierdes o te lo roban. Además, tienes que establecer una opción de bloqueo de pantalla para configurar la huella digital. Presiona Cancelar y, luego, establece un PIN o elige otra opción de bloqueo de pantalla."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="2816424026528101690">"¿Omitir configuración de huella dactilar?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="8139299964344809780">"Decidiste usar la huella dactilar como una de las formas para desbloquear el teléfono. Si omites este paso, tendrás que configurarla más tarde. La configuración tarda un minuto aproximadamente."</string>
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="tablet" msgid="1384438077720821127">"Protege la tablet con una opción de bloqueo de pantalla para que nadie pueda usarla si la pierdes o te la roban. Además, tienes que establecer una opción de bloqueo de pantalla para configurar la huella dactilar. Presiona Cancelar y, luego, establece un PIN o elige otra opción de bloqueo de pantalla."</string>
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="device" msgid="7207112623501771824">"Protege el dispositivo con una opción de bloqueo de pantalla para que nadie pueda usarlo si lo pierdes o te lo roban. Además, tienes que establecer una opción de bloqueo de pantalla para configurar la huella dactilar. Presiona Cancelar y, luego, establece un PIN o elige otra opción de bloqueo de pantalla."</string>
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="default" msgid="7623975730623531606">"Protege el teléfono con una opción de bloqueo de pantalla para que nadie pueda usarlo si lo pierdes o te lo roban. Además, tienes que establecer una opción de bloqueo de pantalla para configurar la huella dactilar. Presiona Cancelar y, luego, establece un PIN o elige otra opción de bloqueo de pantalla."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Protege la tablet con una opción de bloqueo de pantalla para que nadie pueda usarla si la pierdes o te la roban. Además, tienes que establecer una opción de bloqueo de pantalla para configurar la autenticación facial. Presiona Cancelar y, luego, establece un PIN o elige otra opción de bloqueo de pantalla."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Protege el dispositivo con una opción de bloqueo de pantalla para que nadie pueda usarlo si lo pierdes o te lo roban. Además, tienes que establecer una opción de bloqueo de pantalla para configurar la autenticación facial. Presiona Cancelar y, luego, establece un PIN o elige otra opción de bloqueo de pantalla."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Protege el teléfono con una opción de bloqueo de pantalla para que nadie pueda usarlo si lo pierdes o te lo roban. Además, tienes que establecer una opción de bloqueo de pantalla para configurar la autenticación facial. Presiona Cancelar y, luego, establece un PIN o elige otra opción de bloqueo de pantalla."</string>
@@ -488,19 +488,19 @@
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="7410398793283818609">"Ese no es el sensor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="7192100314788868883">"Toca el sensor en la parte posterior del teléfono con el dedo índice."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="1415709674142168770">"No se completó la inscripción"</string>
-    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="498951203761192366">"Se alcanzó el límite de tiempo para la inscripción de huellas digitales. Vuelve a intentarlo."</string>
-    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="7896295829530444810">"El registro de huellas digitales no funcionó. Vuelve a intentarlo o usa otro dedo."</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="498951203761192366">"Se alcanzó el límite de tiempo para la inscripción de huellas dactilares. Vuelve a intentarlo."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="7896295829530444810">"El registro de huellas dactilares no funcionó. Vuelve a intentarlo o usa otro dedo."</string>
     <string name="fingerprint_enroll_button_add" msgid="6335782936874996629">"Agregar otra huella digital"</string>
     <string name="fingerprint_enroll_button_next" msgid="6419214079104413695">"Siguiente"</string>
-    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="5831834311961551423">"Además de desbloquear el teléfono, también puedes utilizar tu huella digital para autorizar compras y el acceso a aplicaciones. "<annotation id="url">"Más información"</annotation></string>
-    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7954742554236652690">" Esta opción de bloqueo de pantalla está inhabilitada. Para obtener más información, comunícate con el administrador de tu organización. "<annotation id="admin_details">"Más información"</annotation>\n\n"Aún puedes usar tu huella digital para autorizar compras y el acceso a apps."<annotation id="url">"Más información"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="5831834311961551423">"Además de desbloquear el teléfono, también puedes utilizar tu huella dactilar para autorizar compras y el acceso a aplicaciones. "<annotation id="url">"Más información"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7954742554236652690">" Esta opción de bloqueo de pantalla está inhabilitada. Para obtener más información, comunícate con el administrador de tu organización. "<annotation id="admin_details">"Más información"</annotation>\n\n"Aún puedes usar tu huella dactilar para autorizar compras y el acceso a apps."<annotation id="url">"Más información"</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1670703069782212223">"Levanta el dedo y vuelve a tocar el sensor"</string>
     <string name="fingerprint_add_max" msgid="2939393314646115661">"Puedes agregar hasta <xliff:g id="COUNT">%d</xliff:g> huellas digitales"</string>
     <string name="fingerprint_intro_error_max" msgid="3247720976621039437">"Agregaste la cantidad máxima permitida de huellas digitales"</string>
     <string name="fingerprint_intro_error_unknown" msgid="3975674268256524015">"No se pueden agregar más huellas digitales"</string>
     <string name="fingerprint_last_delete_title" msgid="3104596858161269635">"¿Quitar las huellas digitales?"</string>
     <string name="fingerprint_delete_title" msgid="3120894112324235536">"Quitar \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\""</string>
-    <string name="fingerprint_delete_message" msgid="5895802741486967970">"¿Quieres borrar esta huella digital?"</string>
+    <string name="fingerprint_delete_message" msgid="5895802741486967970">"¿Quieres borrar esta huella dactilar?"</string>
     <string name="fingerprint_last_delete_message" msgid="3346252479778971442">"No podrás usar tus huellas digitales para desbloquear el teléfono, autorizar compras ni acceder a las apps"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="5385095150532247025">"No podrás usar tus huellas digitales para desbloquear tu perfil de trabajo, autorizar compras ni acceder a apps de trabajo"</string>
     <string name="fingerprint_last_delete_confirm" msgid="7984595457589664004">"Sí, deseo quitarlas"</string>
@@ -539,7 +539,7 @@
     <string name="suggested_lock_settings_summary" product="tablet" msgid="1861066918594412519">"Agrega un bloqueo de pantalla para proteger la tablet"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="7127114417250029182">"Agrega bloqueo de pantalla para proteger el dispositivo"</string>
     <string name="suggested_lock_settings_summary" product="default" msgid="1090621950888321990">"Agrega un bloqueo de pantalla para proteger el teléfono"</string>
-    <string name="suggested_fingerprint_lock_settings_title" msgid="2860380076519822398">"Agrega una huella digital como desbloqueo"</string>
+    <string name="suggested_fingerprint_lock_settings_title" msgid="2860380076519822398">"Agrega una huella dactilar como desbloqueo"</string>
     <string name="suggested_fingerprint_lock_settings_summary" product="tablet" msgid="8114514312665251311"></string>
     <string name="suggested_fingerprint_lock_settings_summary" product="device" msgid="8114514312665251311"></string>
     <string name="suggested_fingerprint_lock_settings_summary" product="default" msgid="8114514312665251311"></string>
@@ -575,11 +575,11 @@
     <string name="unlock_set_unlock_password_summary" msgid="7042787631866059147">"Nivel de seguridad alto"</string>
     <string name="unlock_set_do_later_title" msgid="2939110070503695956">"Ahora no"</string>
     <string name="current_screen_lock" msgid="398328543694154510">"Bloqueo de pantalla actual"</string>
-    <string name="fingerprint_unlock_set_unlock_pattern" msgid="132337696546315927">"Huella digital y patrón"</string>
-    <string name="fingerprint_unlock_set_unlock_pin" msgid="886426673328906002">"Huella digital y PIN"</string>
-    <string name="fingerprint_unlock_set_unlock_password" msgid="3325527833422156515">"Huella digital y contraseña"</string>
-    <string name="fingerprint_unlock_skip_fingerprint" msgid="2063700014903801639">"Continuar sin huellas digitales"</string>
-    <string name="fingerprint_unlock_title" msgid="8009992449332532869">"Puedes desbloquear tu teléfono con tus huellas digitales. Para mayor seguridad, esta opción requiere un método secundario de bloqueo de pantalla."</string>
+    <string name="fingerprint_unlock_set_unlock_pattern" msgid="132337696546315927">"Huella dactilar y patrón"</string>
+    <string name="fingerprint_unlock_set_unlock_pin" msgid="886426673328906002">"Huella dactilar y PIN"</string>
+    <string name="fingerprint_unlock_set_unlock_password" msgid="3325527833422156515">"Huella dactilar y contraseña"</string>
+    <string name="fingerprint_unlock_skip_fingerprint" msgid="2063700014903801639">"Continuar sin huellas dactilares"</string>
+    <string name="fingerprint_unlock_title" msgid="8009992449332532869">"Puedes desbloquear tu teléfono con tus huellas dactilares. Para mayor seguridad, esta opción requiere un método secundario de bloqueo de pantalla."</string>
     <string name="face_unlock_set_unlock_pattern" msgid="3748596996869406905">"Autenticación facial y patrón"</string>
     <string name="face_unlock_set_unlock_pin" msgid="3320824093518497476">"Autenticación facial y PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8962344604388383659">"Autenticación facial y contraseña"</string>
@@ -591,7 +591,7 @@
     <string name="unlock_set_unlock_mode_pattern" msgid="8564909572968419459">"Patrón"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="7828354651668392875">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="397703731925549447">"Contraseña"</string>
-    <string name="unlock_setup_wizard_fingerprint_details" msgid="6515136915205473675">"Después de configurar el bloqueo de pantalla, también puedes establecer la huella digital en Configuración &gt; Seguridad."</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="6515136915205473675">"Después de configurar el bloqueo de pantalla, también puedes establecer la huella dactilar en Configuración &gt; Seguridad."</string>
     <string name="unlock_disable_lock_title" msgid="3508492427073600294">"Desactivar el bloqueo de pantalla"</string>
     <string name="unlock_disable_frp_warning_title" msgid="5858589970505254193">"¿Deseas quitar la protección del dispositivo?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="3814123014295965266">"¿Quieres quitar la protección del perfil?"</string>
@@ -731,15 +731,15 @@
     <string name="bluetooth_settings_summary" msgid="1221689092429277887">"Administrar conexiones, establecer nombre y detección del dispositivo"</string>
     <string name="bluetooth_pairing_request" msgid="7221745525632573125">"¿Vincular con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_pairing_key_msg" msgid="1139230917419961975">"Código de vinculación Bluetooth"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="6205151011298670207">"Ingresa el código de sincronización y luego presiona Intro."</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="6205151011298670207">"Ingresa el código de vinculación y luego presiona Intro."</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="9138308197078115672">"El PIN contiene letras o símbolos."</string>
     <string name="bluetooth_pin_values_hint" msgid="8044671726261326240">"Por lo general, 0000 o 1234"</string>
     <string name="bluetooth_pin_values_hint_16_digits" msgid="2665983525706661525">"Debe contener 16 dígitos"</string>
     <string name="bluetooth_enter_pin_other_device" msgid="1727015949040507621">"Puede que también tengas que escribir este PIN en el otro dispositivo."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="1709886959534143500">"Puede que también tengas que escribir esta clave de acceso en otro dispositivo."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="7094455604290076371">"Para sincronizar con&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;asegúrate de que se muestre esta clave de acceso:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;."</string>
-    <string name="bluetooth_incoming_pairing_msg" msgid="940451919337185024">"¿Desde: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;sincronizas con este dispositivo?"</string>
-    <string name="bluetooth_display_passkey_pin_msg" msgid="5909423849232791647">"Para sincronizar con:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Escribe allí:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> y luego presiona Volver o Enter."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="7094455604290076371">"Para vincular con&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;asegúrate de que se muestre esta clave de acceso:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;."</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="940451919337185024">"Desde: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;¿Vincular con este dispositivo?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="5909423849232791647">"Para vincular con:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Escribe allí:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> y luego presiona Volver o Intro."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="7474404818877079813">"Permitir el acceso a tus contactos y al historial de llamadas"</string>
     <string name="bluetooth_error_title" msgid="5718761586633101960"></string>
     <string name="bluetooth_connecting_error_message" msgid="8473359363469518478">"No se pudo establecer conexión con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
@@ -747,14 +747,14 @@
     <string name="bluetooth_search_for_devices" msgid="6796307228261078451">"Actualizar"</string>
     <string name="bluetooth_searching_for_devices" msgid="7820814625522702494">"Buscando..."</string>
     <string name="bluetooth_preference_device_settings" msgid="4247085616427015908">"Configuración de dispositivos"</string>
-    <string name="bluetooth_preference_paired_dialog_title" msgid="3567187438908143693">"Dispositivo sincronizado"</string>
+    <string name="bluetooth_preference_paired_dialog_title" msgid="3567187438908143693">"Dispositivo vinculado"</string>
     <string name="bluetooth_preference_paired_dialog_internet_option" msgid="3693599743477470469">"Conexión a Internet"</string>
     <string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="4627309436489645755">"Teclado"</string>
     <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="5290994459307558039">"Contactos e historial de llamadas"</string>
-    <string name="bluetooth_pairing_dialog_title" msgid="7900515495932064945">"¿Sincronizar con este dispositivo?"</string>
+    <string name="bluetooth_pairing_dialog_title" msgid="7900515495932064945">"¿Vincular con este dispositivo?"</string>
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7395493311980018460">"¿Compartir libreta telefónica?"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="2103132762434487717">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> quiere acceder a tus contactos y al historial de llamadas."</string>
-    <string name="bluetooth_pairing_dialog_paring_request" msgid="5513953935086446387">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> quiere sincronizarse con Bluetooth. Al conectarse, podrá acceder a contactos e hist. de llamadas."</string>
+    <string name="bluetooth_pairing_dialog_paring_request" msgid="5513953935086446387">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> quiere vincularse con Bluetooth. Al conectarse, podrá acceder a tus contactos y llamadas."</string>
     <string name="bluetooth_preference_found_media_devices" msgid="5748539613567836379">"Dispositivos disponibles"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="4190090666412408576">"No hay dispositivos disponibles."</string>
     <string name="bluetooth_device_context_connect" msgid="1812090541371432890">"Conectar"</string>
@@ -772,9 +772,9 @@
     <string name="device_details_title" msgid="726517818032923222">"Detalles del dispositivo"</string>
     <string name="bluetooth_device_mac_address" msgid="5328203122581150405">"Dirección Bluetooth del dispositivo: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="3669848977755142047">"¿Olvidar este dispositivo?"</string>
-    <string name="bluetooth_unpair_dialog_body" product="default" msgid="5998071227980078077">"El teléfono ya no estará sincronizado con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="4696157463230518866">"La tablet ya no estará sincronizada con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <string name="bluetooth_unpair_dialog_body" product="device" msgid="6385091489719875730">"El dispositivo ya no estará sincronizado con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="default" msgid="5998071227980078077">"El teléfono ya no estará vinculado con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="4696157463230518866">"La tablet ya no estará vinculada con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_unpair_dialog_body" product="device" msgid="6385091489719875730">"El dispositivo ya no estará vinculado con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="8485211340349958886">"Olvidar este dispositivo"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="2381509181266180406">"Conectar a..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="8072503764470451567">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del audio multimedia."</string>
@@ -783,7 +783,7 @@
     <string name="bluetooth_disconnect_pan_user_profile" msgid="5523689915196343097">"Se desconectará el acceso a Internet a través de <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> dejará de compartir la conexión a Internet desde esta tablet."</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="6040826983120279685">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> dejará de compartir la conexión a Internet desde este teléfono."</string>
-    <string name="bluetooth_device_advanced_title" msgid="5752155558126694036">"Dispositivo Bluetooth sincronizado"</string>
+    <string name="bluetooth_device_advanced_title" msgid="5752155558126694036">"Dispositivo Bluetooth vinculado"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="7665622268007450665">"Conectar"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="4180673788239241086">"Conectar al dispositivo Bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="1414487572426490659">"Utilizar para"</string>
@@ -2102,8 +2102,8 @@
     <string name="accessibility_hearingaid_title" msgid="3700978781235124891">"Audífonos"</string>
     <string name="accessibility_hearingaid_not_connected_summary" msgid="634573930469952213">"No hay audífonos conectados"</string>
     <string name="accessibility_hearingaid_adding_summary" msgid="4139031880828714300">"Agregar audífonos"</string>
-    <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="2671518890909750740">"Para sincronizar tus audífonos, busca y presiona tu dispositivo en la pantalla siguiente."</string>
-    <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="1584538735488464991">"Asegúrate de que tus audífonos estén en modo de sincronización."</string>
+    <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="2671518890909750740">"Para vincular audífonos, busca y presiona tu dispositivo en la pantalla siguiente."</string>
+    <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="1584538735488464991">"Asegúrate de que tus audífonos estén en modo de vinculación."</string>
     <string name="accessibility_hearingaid_active_device_summary" msgid="6081382497207168885">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> activo"</string>
     <plurals name="show_number_hearingaid_count" formatted="false" msgid="7906547154695855096">
       <item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> audífonos guardados</item>
@@ -2917,7 +2917,7 @@
     <string name="nfc_payment_settings_title" msgid="5070077706735415291">"Toca y paga"</string>
     <string name="nfc_payment_how_it_works" msgid="7607901964687787177">"Cómo funciona"</string>
     <string name="nfc_payment_no_apps" msgid="8844440783395420860">"Paga en las tiendas con tu teléfono"</string>
-    <string name="nfc_payment_default" msgid="7869273092463612271">"App de pago predeterminada"</string>
+    <string name="nfc_payment_default" msgid="7869273092463612271">"App de pagos predeterminada"</string>
     <string name="nfc_payment_default_not_set" msgid="955804193510335338">"Sin establecer"</string>
     <string name="nfc_payment_app_and_desc" msgid="102312684211458190">"<xliff:g id="APP">%1$s</xliff:g>: <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="nfc_payment_use_default" msgid="3098724195746409476">"Utilizar la aplicación predeterminada"</string>
@@ -2971,7 +2971,7 @@
     <string name="restriction_wifi_config_title" msgid="1689176998451296068">"Wi‑Fi y red de celulares"</string>
     <string name="restriction_wifi_config_summary" msgid="2450206736438594690">"Permitir modificar la configuración de la red Wi‑Fi y de la red de celulares"</string>
     <string name="restriction_bluetooth_config_title" msgid="34551118506640221">"Bluetooth"</string>
-    <string name="restriction_bluetooth_config_summary" msgid="5304900222614952895">"Permitir modificar la sincronización y configuración de Bluetooth"</string>
+    <string name="restriction_bluetooth_config_summary" msgid="5304900222614952895">"Permitir modificar la vinculación y configuración de Bluetooth"</string>
     <string name="restriction_nfc_enable_title" msgid="5146674482590550598">"NFC"</string>
     <string name="restriction_nfc_enable_summary_config" msgid="405349698260328073">"Permitir intercambio de datos cuando el dispositivo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> toque otro dispositivo con NFC"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3292205836938064931">"Permitir el intercambio de datos cuando la tablet toque otro dispositivo"</string>
@@ -3110,7 +3110,7 @@
     <string name="keywords_ambient_display_screen" msgid="5873935693887583428">"Pantalla Ambiente, pantalla bloqueada"</string>
     <string name="keywords_lock_screen_notif" msgid="4914337222856805463">"notificación en pantalla bloqueada, notificaciones"</string>
     <string name="keywords_face_settings" msgid="4117345666006836599">"rostro"</string>
-    <string name="keywords_fingerprint_settings" msgid="902902368701134163">"huella digital, agregar huella digital"</string>
+    <string name="keywords_fingerprint_settings" msgid="902902368701134163">"huella dactilar, agregar huella dactilar"</string>
     <string name="keywords_display_auto_brightness" msgid="1810596220466483996">"atenuar pantalla, pantalla táctil, batería, brillo inteligente, brillo dinámico"</string>
     <string name="keywords_display_adaptive_sleep" msgid="1695357782432822811">"atenuar pantalla, suspender, batería, tiempo de espera, atención, pantalla, inactividad"</string>
     <string name="keywords_auto_rotate" msgid="4320791369951647513">"rotar, girar, rotación, retrato, paisaje, orientación, vertical, horizontal"</string>
@@ -3118,7 +3118,7 @@
     <string name="keywords_zen_mode_settings" msgid="4103819458182535493">"no interrumpir, programar, notificaciones, bloquear, silenciar, vibrar, suspender, trabajar, enfocar, sonido, silencio, día, día de la semana, fin de semana, noche de la semana, evento"</string>
     <string name="keywords_screen_timeout" msgid="4328381362313993666">"pantalla, tiempo de bloqueo, tiempo de espera, bloqueo de pantalla"</string>
     <string name="keywords_storage_settings" msgid="6422454520424236476">"memoria, caché, datos, eliminar, borrar, liberar, espacio"</string>
-    <string name="keywords_bluetooth_settings" msgid="1152229891590622822">"conectado, dispositivo, audífonos, auriculares, bocina, inalámbrico, sincronizar, auricular, música, multimedia"</string>
+    <string name="keywords_bluetooth_settings" msgid="1152229891590622822">"conectado, dispositivo, audífonos, auriculares, bocina, inalámbrico, vincular, auricular, música, multimedia"</string>
     <string name="keywords_wallpaper" msgid="7665778626293643625">"fondo, pantalla, pantalla bloqueada, tema"</string>
     <string name="keywords_assist_input" msgid="8392362788794886564">"predeterminado, asistente"</string>
     <string name="keywords_default_payment_app" msgid="845369409578423996">"pago, predeterminado"</string>
@@ -3363,8 +3363,10 @@
     <string name="manage_notification_access_title" msgid="5348743662189787547">"Acceso a notificaciones"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8148871282484870576">"El acceso a las notificaciones del perfil de trabajo está bloqueado"</string>
     <string name="manage_notification_access_summary_zero" msgid="236809421271593016">"Las aplicaciones no pueden leer las notificaciones."</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for manage_notification_access_summary_nonzero (8496218948429646792) -->
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="8496218948429646792">
+      <item quantity="other">%d aplicaciones pueden leer notificaciones.</item>
+      <item quantity="one">%d aplicación puede leer notificaciones.</item>
+    </plurals>
     <string name="notification_assistant_title" msgid="8216604031352764011">"Asistente de notificaciones"</string>
     <string name="no_notification_assistant" msgid="9140123568386413264">"Sin asistente"</string>
     <string name="no_notification_listeners" msgid="1366386609506834717">"Ninguna aplicación instalada solicitó acceso a las notificaciones."</string>
@@ -3566,9 +3568,9 @@
     <string name="encryption_interstitial_message_pin" msgid="6592265582286340307">"Puedes solicitar el PIN del dispositivo antes de iniciarlo para aumentar la protección. Mientras el dispositivo se inicia, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas. \n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados. ¿Deseas solicitar el PIN para iniciar el dispositivo?"</string>
     <string name="encryption_interstitial_message_pattern" msgid="5620724295995735120">"Puedes solicitar el patrón del dispositivo antes de iniciarlo para aumentar la protección. Mientras el dispositivo se inicia, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas. \n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados. ¿Deseas solicitar el patrón para iniciar el dispositivo?"</string>
     <string name="encryption_interstitial_message_password" msgid="7236688467386126401">"Puedes solicitar la contraseña del dispositivo antes de iniciarlo para aumentar la protección. Mientras el dispositivo se inicia, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas. \n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados. ¿Deseas solicitar contraseña para iniciar el dispositivo?"</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3706009740537484517">"Además de usar tu huella digital para desbloquear el dispositivo, puedes solicitar el PIN antes de iniciarlo para aumentar la protección. Mientras el dispositivo se inicia, no puede recibir llamadas, mensajes, ni notificaciones, incluidas las alarmas. \n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados. ¿Deseas solicitar el PIN para iniciar el dispositivo?"</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="5230877866699023998">"Además de usar tu huella digital para desbloquear el dispositivo, puedes solicitar el patrón antes de iniciarlo para aumentar la protección. Mientras el dispositivo se inicia, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas. \n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados. ¿Deseas solicitar el patrón para iniciar el dispositivo?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="8451977276748128814">"Además de usar tu huella digital para desbloquear el dispositivo, puedes solicitar una contraseña antes de iniciarlo para aumentar la protección. Mientras el dispositivo se inicia, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas.\n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados. ¿Deseas solicitar la contraseña para iniciar el dispositivo?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3706009740537484517">"Además de usar tu huella dactilar para desbloquear el dispositivo, puedes solicitar el PIN antes de iniciarlo para aumentar la protección. Mientras el dispositivo se inicia, no puede recibir llamadas, mensajes, ni notificaciones, incluidas las alarmas. \n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados. ¿Deseas solicitar el PIN para iniciar el dispositivo?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="5230877866699023998">"Además de usar tu huella dactilar para desbloquear el dispositivo, puedes solicitar el patrón antes de iniciarlo para aumentar la protección. Mientras el dispositivo se inicia, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas. \n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados. ¿Deseas solicitar el patrón para iniciar el dispositivo?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="8451977276748128814">"Además de usar tu huella dactilar para desbloquear el dispositivo, puedes solicitar una contraseña antes de iniciarlo para aumentar la protección. Mientras el dispositivo se inicia, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas.\n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados. ¿Deseas solicitar la contraseña para iniciar el dispositivo?"</string>
     <string name="encryption_interstitial_message_pin_for_face" msgid="7469243836881325172">"Además de usar el reconocimiento facial para desbloquear el dispositivo, puedes solicitar un PIN antes de iniciarlo para mayor protección. Mientras se enciende el dispositivo, no puede recibir llamadas, mensajes, ni notificaciones, incluidas las alarmas.\n\nEsta opción protege los datos en dispositivos perdidos o robados. ¿Quieres solicitar un PIN para iniciar el dispositivo?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="9221235885895441797">"Además de usar el reconocimiento facial para desbloquear el dispositivo, puedes solicitar un patrón antes de iniciarlo para mayor protección. Mientras se enciende el dispositivo, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas.\n\nEsta opción protege los datos en dispositivos perdidos o robados. ¿Quieres solicitar un patrón para iniciar el dispositivo?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="5559223480280120457">"Además de usar el reconocimiento facial para desbloquear el dispositivo, puedes solicitar una contraseña antes de iniciarlo para mayor protección. Mientras se enciende el dispositivo, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas.\n\nEsta opción protege los datos en dispositivos perdidos o robados. ¿Quieres solicitar una contraseña para iniciar el dispositivo?"</string>
@@ -3997,7 +3999,7 @@
     <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="2330543541999937953">"Solicitar patrón para iniciar tu dispositivo. Mientras esté apagado, no podrá recibir llamadas, mensajes, notificaciones ni alarmas."</string>
     <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="1058173991832208485">"Solicitar PIN para iniciar el dispositivo. Mientras está apagado, no podrá recibir llamadas, mensajes, notificaciones ni alarmas."</string>
     <string name="lockpattern_settings_require_password_before_startup_summary" msgid="1266300087760553585">"Solicitar contraseña para iniciar tu dispositivo. Mientras esté apagado, no podrá recibir llamadas, mensajes, notificaciones ni alarmas."</string>
-    <string name="suggestion_additional_fingerprints" msgid="3434467207282466411">"Agregar otra huella digital"</string>
+    <string name="suggestion_additional_fingerprints" msgid="3434467207282466411">"Agregar otra huella dactilar"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="1916547587832484196">"Desbloquea con otro dedo"</string>
     <string name="battery_saver_on_summary" msgid="6841062406467435672">"Activado"</string>
     <string name="battery_saver_off_scheduled_summary" msgid="3740414764069188669">"Se activará cuando quede <xliff:g id="BATTERY_PERCENTAGE">%1$s</xliff:g>"</string>
@@ -4134,10 +4136,10 @@
     <string name="ambient_display_tap_screen_title" product="device" msgid="4396793721852647356">"Presiona para revisar el dispositivo"</string>
     <string name="ambient_display_tap_screen_summary" msgid="7869039870571925213">"Para consultar la hora, las notificaciones y otra información, presiona la pantalla."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="3676002930672489760">"Deslizar tu huella para ver notificaciones"</string>
-    <string name="fingerprint_gesture_screen_title" msgid="8638932855807473479">"Deslizar huella digital"</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="4347999905190477310">"Para ver las notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales ubicado en la parte posterior del teléfono."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="3480057984564476283">"Para ver las notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales ubicado en la parte posterior de la tablet."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="7950264130913070035">"Para ver las notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales ubicado en la parte posterior del dispositivo."</string>
+    <string name="fingerprint_gesture_screen_title" msgid="8638932855807473479">"Deslizar huella dactilar"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="4347999905190477310">"Para ver las notificaciones, desliza el dedo hacia abajo en el sensor de huellas dactilares ubicado en la parte posterior del teléfono."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="3480057984564476283">"Para ver las notificaciones, desliza el dedo hacia abajo en el sensor de huellas dactilares ubicado en la parte posterior de la tablet."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="7950264130913070035">"Para ver las notificaciones, desliza el dedo hacia abajo en el sensor de huellas dactilares ubicado en la parte posterior del dispositivo."</string>
     <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>
diff --git a/tests/CarDeveloperOptions/res/values-es/strings.xml b/tests/CarDeveloperOptions/res/values-es/strings.xml
index 8ffe730..bbc23dd 100644
--- a/tests/CarDeveloperOptions/res/values-es/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-es/strings.xml
@@ -322,7 +322,7 @@
     <string name="date_and_time_settings_title" msgid="7827088656940910631">"Fecha y hora"</string>
     <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="date_time_auto" msgid="2679132152303750218">"Usar la hora 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>
@@ -916,7 +916,7 @@
     <string name="passpoint_content" msgid="340527524510304327">"Credenciales de <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifi_eap_method" msgid="3752116941487485859">"Método EAP"</string>
     <string name="please_select_phase2" msgid="5848080896810435677">"Autenticación de fase 2"</string>
-    <string name="wifi_eap_ca_cert" msgid="1496395241849383785">"Certificado de CA"</string>
+    <string name="wifi_eap_ca_cert" msgid="1496395241849383785">"Certificado AC"</string>
     <string name="wifi_eap_domain" msgid="3298302320003640130">"Dominio"</string>
     <string name="wifi_eap_user_cert" msgid="6786839531765719173">"Certificado de usuario"</string>
     <string name="wifi_eap_identity" msgid="5280457017705738773">"Identidad"</string>
@@ -1057,7 +1057,7 @@
     <string name="wifi_p2p_cancel_connect_message" msgid="3752679335020392154">"¿Quieres cancelar la invitación para conectar con <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="3206660449067701089">"¿Olvidar este grupo?"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="12062341344410520">"Punto de acceso Wi-Fi"</string>
-    <string name="wifi_hotspot_off_subtext" msgid="6177054857136221058">"No se está compartiendo Internet ni el contenido con otros dispositivos"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="6177054857136221058">"No se está compartiendo Internet ni contenido con otros dispositivos"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="71421730039785897">"Se está compartiendo la conexión a Internet de este tablet mediante un punto de acceso"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="8914285514605049879">"Se está compartiendo la conexión a Internet de este teléfono mediante un punto de acceso"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="7415381343846704553">"La aplicación está compartiendo contenido. Para compartir la conexión a Internet, desactiva el punto de acceso y vuelve a activarlo"</string>
@@ -1298,7 +1298,7 @@
     <string name="sim_multi_sims_summary" msgid="8237021982527032257">"Selecciona la SIM que prefieras para usar datos móviles."</string>
     <string name="sim_change_data_title" msgid="2512227368681250054">"¿Usar <xliff:g id="CARRIER">%1$s</xliff:g> para los datos móviles?"</string>
     <string name="sim_change_data_message" msgid="51004703157782900">"Estás utilizando <xliff:g id="CARRIER2_0">%2$s</xliff:g> para los datos móviles. Si cambias a <xliff:g id="CARRIER1">%1$s</xliff:g>, no se utilizará más a <xliff:g id="CARRIER2_1">%2$s</xliff:g> para los datos móviles."</string>
-    <string name="sim_change_data_ok" msgid="7491552537317573235">"Utilizar <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+    <string name="sim_change_data_ok" msgid="7491552537317573235">"Usar <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="sim_preferred_title" msgid="3389680276182899407">"¿Actualizar tarjeta SIM preferida?"</string>
     <string name="sim_preferred_message" msgid="3751011329746359050">"<xliff:g id="NEW_SIM">%1$s</xliff:g> es la única SIM del dispositivo. ¿Quieres usarla para los datos móviles, las llamadas y los mensajes SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="3214670264775760428">"Código PIN de la tarjeta SIM incorrecto. Debes ponerte en contacto con tu operador para desbloquear el dispositivo."</string>
@@ -1798,7 +1798,7 @@
     <string name="install_all_warning" product="device" msgid="9141585291103603515">"Tu dispositivo y tus datos personales son más vulnerables a los ataques de aplicaciones desconocidas. Al instalar aplicaciones de esta fuente, aceptas ser responsable de cualquier daño que sufra tu dispositivo o de la pérdida de datos que se pueda derivar de su uso."</string>
     <string name="advanced_settings" msgid="6282069364060968122">"Ajustes avanzados"</string>
     <string name="advanced_settings_summary" msgid="5912237062506771716">"Habilitar más opciones de configuración"</string>
-    <string name="application_info_label" msgid="3886253474964599105">"Información de aplicaciones"</string>
+    <string name="application_info_label" msgid="3886253474964599105">"Información de la aplicación"</string>
     <string name="storage_label" msgid="1109537840103290384">"Almacenamiento"</string>
     <string name="auto_launch_label" msgid="47089737922907379">"Abrir de forma predeterminada"</string>
     <string name="auto_launch_label_generic" msgid="7865828543459493308">"Valores predeterminados"</string>
@@ -2268,9 +2268,9 @@
     <string name="controls_subtitle" msgid="6920199888882834620">"Cómo reducir el uso de la batería"</string>
     <string name="packages_subtitle" msgid="6506269487892204413">"Paquetes incluidos"</string>
     <string name="battery_tip_summary_title" msgid="2750922152518825526">"Las aplicaciones funcionan con normalidad"</string>
-    <string name="battery_tip_summary_summary" product="default" msgid="6294900413896440006">"El teléfono tiene un consumo normal de batería en segundo plano"</string>
-    <string name="battery_tip_summary_summary" product="tablet" msgid="5280099016800644130">"El tablet tiene un consumo normal de batería en segundo plano"</string>
-    <string name="battery_tip_summary_summary" product="device" msgid="4459840492610842705">"El dispositivo tiene un consumo normal de batería en segundo plano"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="6294900413896440006">"El teléfono tiene un consumo de batería normal en segundo plano"</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="5280099016800644130">"El tablet tiene un consumo de batería normal en segundo plano"</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="4459840492610842705">"El dispositivo tiene un consumo de batería normal en segundo plano"</string>
     <string name="battery_tip_low_battery_title" msgid="6784043681672161175">"La capacidad de la batería es baja"</string>
     <string name="battery_tip_low_battery_summary" msgid="9151355911381188604">"Queda poca batería"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="5517122075918038665">"Mejorar la duración de la batería del teléfono"</string>
@@ -2549,7 +2549,7 @@
     <string name="privacy_settings_title" msgid="3573891462732375772">"Copia de seguridad"</string>
     <string name="backup_summary_state_on" msgid="1725597360282574647">"Activada"</string>
     <string name="backup_summary_state_off" msgid="7138020503288730492">"Desactivada"</string>
-    <string name="backup_section_title" msgid="8177209731777904656">"Copia de seguridad"</string>
+    <string name="backup_section_title" msgid="8177209731777904656">"Copia de seguridad y restauración"</string>
     <string name="personal_data_section_title" msgid="9161854418510071558">"Datos personales"</string>
     <string name="backup_data_title" msgid="4461508563849583624">"Copia de seguridad de mis datos"</string>
     <string name="backup_data_summary" msgid="555459891017933746">"Crear copia de seguridad de los datos de las aplicaciones, las contraseñas de redes Wi-Fi y otros ajustes en los servidores de Google"</string>
@@ -2747,7 +2747,7 @@
     <string name="vpn_ipsec_identifier" msgid="1230238784830362888">"Identificador de IPSec"</string>
     <string name="vpn_ipsec_secret" msgid="1531503910441962752">"Clave precompartida de IPSec"</string>
     <string name="vpn_ipsec_user_cert" msgid="2762078384595366852">"Certificado de usuario de IPSec"</string>
-    <string name="vpn_ipsec_ca_cert" msgid="5537567128766402789">"Certificado de CA de IPSec"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="5537567128766402789">"Certificado AC de IPSec"</string>
     <string name="vpn_ipsec_server_cert" msgid="3066696943831527934">"Certificado del servidor IPSec"</string>
     <string name="vpn_show_options" msgid="7672984921872882859">"Mostrar opciones avanzadas"</string>
     <string name="vpn_search_domains" msgid="8469394307693909080">"Dominios de búsqueda de DNS"</string>
@@ -2809,13 +2809,13 @@
     <string name="trusted_credentials_enable_label" msgid="8991649977058280799">"Habilitar"</string>
     <string name="trusted_credentials_remove_label" msgid="530728557358501000">"Quitar"</string>
     <string name="trusted_credentials_trust_label" msgid="1580022708780121664">"Confiar"</string>
-    <string name="trusted_credentials_enable_confirmation" msgid="936560980286792656">"¿Quieres habilitar el certificado de CA del sistema?"</string>
-    <string name="trusted_credentials_disable_confirmation" msgid="643386483024801539">"¿Quieres inhabilitar el certificado de CA del sistema?"</string>
-    <string name="trusted_credentials_remove_confirmation" msgid="3731678919848637342">"¿Eliminar el certificado de CA de usuario de forma permanente?"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="936560980286792656">"¿Quieres habilitar el certificado AC del sistema?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="643386483024801539">"¿Quieres inhabilitar el certificado AC del sistema?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="3731678919848637342">"¿Eliminar el certificado AC de usuario de forma permanente?"</string>
     <string name="credential_contains" msgid="483346955378412119">"Esta entrada incluye:"</string>
     <string name="one_userkey" msgid="5349738921509013845">"una clave de usuario"</string>
     <string name="one_usercrt" msgid="856282310586987313">"un certificado de usuario"</string>
-    <string name="one_cacrt" msgid="4757720453112732485">"un certificado de CA"</string>
+    <string name="one_cacrt" msgid="4757720453112732485">"un certificado AC"</string>
     <string name="n_cacrts" msgid="7539893176217891549">"%d certificados de CA"</string>
     <string name="user_credential_title" msgid="6237611303219831419">"Detalles de credenciales"</string>
     <string name="user_credential_removed" msgid="6243576567538844852">"Quitar credencial: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
@@ -2935,7 +2935,7 @@
     <string name="restriction_menu_reset" msgid="3642252461410370554">"Quitar restricciones"</string>
     <string name="restriction_menu_change_pin" msgid="592512748243421101">"Cambiar PIN"</string>
     <string name="app_notifications_switch_label" msgid="670683308275498821">"Mostrar notificaciones"</string>
-    <string name="help_label" msgid="1296484776243905646">"Ayuda y sugerencias"</string>
+    <string name="help_label" msgid="1296484776243905646">"Ayuda y comentarios"</string>
     <string name="support_summary" msgid="3278943815956130740">"Artículos de ayuda, teléfono y chat, cómo empezar"</string>
     <string name="user_account_title" msgid="2108666882630552859">"Cuenta para contenido"</string>
     <string name="user_picture_title" msgid="6664602422948159123">"ID de foto"</string>
@@ -3746,7 +3746,7 @@
     <string name="usb_control_device" msgid="9154790265254725254">"Este dispositivo"</string>
     <string name="usb_switching" msgid="1230386065163529904">"Cambiando..."</string>
     <string name="usb_switching_failed" msgid="6857722544186145439">"No se ha podido hacer el cambio"</string>
-    <string name="usb_summary_charging_only" msgid="4118449308708872339">"Cargando el dispositivo"</string>
+    <string name="usb_summary_charging_only" msgid="4118449308708872339">"Cargando este dispositivo"</string>
     <string name="usb_summary_power_only" msgid="3552240122641051107">"Cargando dispositivo conectado"</string>
     <string name="usb_summary_file_transfers" msgid="7805342797099821502">"Transferencia de archivos"</string>
     <string name="usb_summary_tether" msgid="778845069037366883">"Compartir conexión por USB"</string>
@@ -3981,7 +3981,7 @@
     <string name="billing_cycle_less_than_one_day_left" msgid="855800570587142182">"Queda menos de 1 día"</string>
     <string name="carrier_and_update_text" msgid="4100603877929297103">"Actualizado por <xliff:g id="ID_1">^1</xliff:g> hace <xliff:g id="ID_2">^2</xliff:g>"</string>
     <string name="no_carrier_update_text" msgid="8797522203060970532">"Actualizado hace <xliff:g id="ID_1">^2</xliff:g>"</string>
-    <string name="carrier_and_update_now_text" msgid="7619705504438908034">"Actualizado por <xliff:g id="ID_1">^1</xliff:g> ahora mismo"</string>
+    <string name="carrier_and_update_now_text" msgid="7619705504438908034">"Actualizado por <xliff:g id="ID_1">^1</xliff:g> justo ahora"</string>
     <string name="no_carrier_update_now_text" msgid="4405472895804759042">"Actualizado ahora"</string>
     <string name="launch_mdp_app_text" msgid="9186559496664208252">"Ver el plan"</string>
     <string name="launch_wifi_text" msgid="317820210431682605">"Ver detalles"</string>
diff --git a/tests/CarDeveloperOptions/res/values-et/strings.xml b/tests/CarDeveloperOptions/res/values-et/strings.xml
index c94af1e..7766242 100644
--- a/tests/CarDeveloperOptions/res/values-et/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-et/strings.xml
@@ -1570,10 +1570,10 @@
     <string name="restore_default_apn_completed" msgid="5671734152740058937">"APN-i vaikeseadete lähtestamine on lõpule viidud."</string>
     <string name="reset_dashboard_title" msgid="7084966342252178530">"Lähtestamise valikud"</string>
     <string name="reset_dashboard_summary" msgid="8778383341461126642">"Võrgu, rakendused või seadme saab lähtestada"</string>
-    <string name="reset_network_title" msgid="8944059136930806211">"Lähtesta WiFi, mobiilne andmeside ja Bluetooth"</string>
+    <string name="reset_network_title" msgid="8944059136930806211">"WiFi, mobiilse andmeside ja Bluetoothi lähtestamine"</string>
     <string name="reset_network_desc" msgid="4982633363916261109">"See lähtestab kõik võrguseaded, sh:\n\n"<li>"WiFi"</li>\n<li>"Mobiilne andmeside"</li>\n<li>"Bluetooth"</li></string>
-    <string name="reset_esim_title" msgid="7630781767040831893">"Kustuta allalaaditud SIM-id"</string>
-    <string name="reset_esim_desc" msgid="433226911566802">"Asendus-SIM-kaartide allalaadimiseks võtke ühendust operaatoriga. See ei tühista mobiilsideteenuse pakette."</string>
+    <string name="reset_esim_title" msgid="7630781767040831893">"Allalaaditud SIM-ide kustutamine"</string>
+    <string name="reset_esim_desc" msgid="433226911566802">"Asendus-SIM-ide allalaadimiseks võtke ühendust operaatoriga. See ei tühista mobiilsideteenuse pakette."</string>
     <string name="reset_network_button_text" msgid="4293271046867912819">"Lähtesta seaded"</string>
     <string name="reset_network_final_desc" msgid="2463817067048751373">"Kas soovite kõik võrguseaded lähtestada? Seda toimingut ei saa tagasi võtta."</string>
     <string name="reset_network_final_desc_esim" msgid="4676436976372555750">"Kas soovite kõik võrguseaded lähtestada ja allalaaditud SIM-id kustutada? Seda toimingut ei saa tagasi võtta."</string>
@@ -1584,7 +1584,7 @@
     <string name="reset_esim_error_title" msgid="4728931209471875632">"SIM-kaarte ei saa kustutada"</string>
     <string name="reset_esim_error_msg" msgid="4716366079119742235">"Allalaaditud SIM-kaarte ei saa vea tõttu kustutada.\n\nTaaskäivitage seade ja proovige uuesti."</string>
     <string name="master_clear_title" msgid="1560712943955904673">"Kõigi andmete kustutamine (tehaseseadetele lähtestamine)"</string>
-    <string name="master_clear_short_title" msgid="919098101581335101">"Kust. andmed (tehases. läht.)"</string>
+    <string name="master_clear_short_title" msgid="919098101581335101">"Kõigi andmete kustutamine (tehaseseaded)"</string>
     <string name="master_clear_desc" product="tablet" msgid="3432373610755760899">"See kustutab teie tahvelarvuti "<b>"sisemälust"</b>" kõik andmed, sh:\n\n"<li>"teie Google\'i konto;"</li>\n<li>"süsteemi ja rakenduste andmed ning seaded;"</li>\n<li>"allalaaditud rakendused."</li></string>
     <string name="master_clear_desc" product="default" msgid="8765543541962866697">"See kustutab teie telefoni "<b>"sisemälust"</b>" kõik andmed, sh järgmised.\n\n"<li>"Teie Google\'i konto"</li>\n<li>"Süsteemi- ja rakenduste andmed ning seaded"</li>\n<li>"Allalaaditud rakendused"</li></string>
     <string name="master_clear_accounts" product="default" msgid="3432884235445405376">\n\n"Olete praegu sisse logitud järgmistele kontodele:\n"</string>
@@ -1842,7 +1842,7 @@
     <string name="show_running_services" msgid="1895994322704667543">"Kuva töötavad teenused"</string>
     <string name="show_background_processes" msgid="88012264528093617">"Kuva vahemällu salvestatud protsessid"</string>
     <string name="default_emergency_app" msgid="286530070173495823">"Hädaabirakendus"</string>
-    <string name="reset_app_preferences" msgid="1426500030595212077">"Lähtesta rakenduste eelistused"</string>
+    <string name="reset_app_preferences" msgid="1426500030595212077">"Rakenduste eelistuste lähtestamine"</string>
     <string name="reset_app_preferences_title" msgid="792909865493673598">"Lähtestada rakenduste eelistused?"</string>
     <string name="reset_app_preferences_desc" msgid="7935273005301096031">"See lähtestab kõik järgmised eelistused:\n\n "<li>"Keelatud rakendused"</li>\n" "<li>"Keelatud rakenduste märguanded"</li>\n" "<li>"Toimingute vaikerakendused"</li>\n" "<li>"Rakenduste taustaandmete piirangud"</li>\n" "<li>"Igasugused lubade piirangud"</li>\n\n" Rakenduste andmed säilivad."</string>
     <string name="reset_app_preferences_button" msgid="2041894727477934656">"Lähtesta rakendused"</string>
@@ -1884,7 +1884,7 @@
     <string name="system_package" msgid="1824541892695233351">"Süsteemivärskendusi ei saa installida välisele kandjale."</string>
     <string name="move_error_device_admin" msgid="6640501923867066901">"Seadme administraatori rakendust ei saa installida välisele andmekandjale"</string>
     <string name="force_stop_dlg_title" msgid="8822779487097246675">"Kas peatada sunniviisiliselt?"</string>
-    <string name="force_stop_dlg_text" msgid="7435245769456493398">"Kui sunnite rakenduse peatuma, võib see valesti käituda."</string>
+    <string name="force_stop_dlg_text" msgid="7435245769456493398">"Kui sunnite rakenduse peatuma, võib see toimida valesti."</string>
     <string name="app_install_location_title" msgid="5121617802063021720">"Eelistatud installiasukoht"</string>
     <string name="app_install_location_summary" msgid="109719780117187797">"Muutke uute rakenduste eelistatud installiasukohta"</string>
     <string name="app_disable_dlg_positive" msgid="5508828271100168073">"Keela rakendus"</string>
@@ -2238,7 +2238,7 @@
     <string name="background_activity_summary_disabled" msgid="457944930942085876">"Rakendusel ei ole lubatud taustal töötada"</string>
     <string name="background_activity_summary_whitelisted" msgid="4713321059375873828">"Taustal kasutamist ei saa piirata"</string>
     <string name="background_activity_warning_dialog_title" msgid="2170790412855899678">"Kas piirata taustal tegevust?"</string>
-    <string name="background_activity_warning_dialog_text" msgid="8242749826732375096">"Kui piirate rakenduse tegevust taustal, võib rakendus valesti käituda."</string>
+    <string name="background_activity_warning_dialog_text" msgid="8242749826732375096">"Kui piirate rakenduse tegevust taustal, võib rakendus toimida valesti."</string>
     <string name="background_activity_disabled_dialog_text" msgid="4234598000779459640">"Kuna rak. pole aku optimeerimine seadistatud, ei saa te seda piirata.\n\nRak. piiramiseks lülit. esmalt sisse aku optimeerimine."</string>
     <string name="device_screen_usage" msgid="4470485475363132750">"Ekraani kasutus alates täislaadimisest"</string>
     <string name="power_usage_list_summary" msgid="4314438658308211057">"Akukasutus alates täislaadimisest"</string>
@@ -3031,7 +3031,7 @@
       <item quantity="other">Kuva %d peidetud üksust</item>
       <item quantity="one">Kuva %d peidetud üksus</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="8288134139584687806">"Võrk ja Internet"</string>
+    <string name="network_dashboard_title" msgid="8288134139584687806">"Võrk ja internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="5560545061217580626">"mobiilivõrk"</string>
     <string name="network_dashboard_summary_data_usage" msgid="4695629715072542102">"andmeside kasutus"</string>
     <string name="network_dashboard_summary_hotspot" msgid="3928610802321995214">"kuumkoht"</string>
@@ -3052,7 +3052,7 @@
     <string name="keywords_wifi_notify_open_networks" msgid="1031260564121854773">"WiFi märguanne, wifi märguanne"</string>
     <string name="keywords_auto_brightness" msgid="5007188989783072428">"Automaatne heledus"</string>
     <string name="keywords_vibrate_on_touch" msgid="3615173661462446877">"Vibreerimise peatamine, puudutus, klaviatuur"</string>
-    <string name="keywords_time_format" msgid="8265826377023617424">"Kasuta 24-tunnist vormingut"</string>
+    <string name="keywords_time_format" msgid="8265826377023617424">"Kasuta 24-tunni vormingut"</string>
     <string name="keywords_storage_files" msgid="1995055540202216399">"Allalaadimine"</string>
     <string name="keywords_app_default" msgid="1265502485415708667">"Ava rakendusega"</string>
     <string name="keywords_applications_settings" msgid="2078776051110952597">"Rakendused"</string>
diff --git a/tests/CarDeveloperOptions/res/values-eu/strings.xml b/tests/CarDeveloperOptions/res/values-eu/strings.xml
index 4d2cd99..b340321 100644
--- a/tests/CarDeveloperOptions/res/values-eu/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-eu/strings.xml
@@ -730,7 +730,7 @@
     <string name="bluetooth_settings_title" msgid="7261244857456521825">"Bluetooth-a"</string>
     <string name="bluetooth_settings_summary" msgid="1221689092429277887">"Kudeatu konexioak, ezarri gailuaren izena eta ikusgaitasuna"</string>
     <string name="bluetooth_pairing_request" msgid="7221745525632573125">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuarekin parekatu nahi duzu?"</string>
-    <string name="bluetooth_pairing_key_msg" msgid="1139230917419961975">"Bluetooth parekatze-kodea"</string>
+    <string name="bluetooth_pairing_key_msg" msgid="1139230917419961975">"Bluetooth bidez parekatzeko kodea"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="6205151011298670207">"Idatzi parekatze-kodea eta sakatu Sartu edo Itzuli"</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="9138308197078115672">"PINak hizkiak edo ikurrak ditu"</string>
     <string name="bluetooth_pin_values_hint" msgid="8044671726261326240">"Normalean 0000 edo 1234"</string>
@@ -832,7 +832,7 @@
     <string name="android_beam_off_summary" msgid="7365818039159364600">"Desaktibatuta"</string>
     <string name="nfc_disabled_summary" msgid="2181777971122724361">"Ez dago erabilgarri NFC desaktibatuta dagoelako"</string>
     <string name="android_beam_label" msgid="5340299879556025708">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="4501176353247859329">"Eginbide hau aktibatzen baduzu, NFC bidez parteka dezakezu aplikazioen edukia NFC gaitasuna duten beste gailu batzuekin, gailuak bata bestearengana hurbilduta. Besteak beste, web-orriak, YouTube bideoak, kontaktuak eta beste hainbat gauza parteka ditzakezu.\n\nHori egiteko, hurbildu gailuak bata bestearengana (atzealdeak elkartu behar izan ohi dira), eta sakatu zure pantaila. Aplikazioak zehaztuko du partekatu beharrekoa zer den."</string>
+    <string name="android_beam_explained" msgid="4501176353247859329">"Eginbide hau aktibatzen baduzu, NFC bidez parteka dezakezu aplikazioen edukia NFC gaitasuna duten beste gailu batzuekin, gailuak bata bestearengana hurbilduta. Besteak beste, web-orriak, YouTube-ko bideoak, kontaktuak eta beste hainbat gauza parteka ditzakezu.\n\nHori egiteko, hurbildu gailuak bata bestearengana (atzealdeak elkartu behar izan ohi dira), eta sakatu zure pantaila. Aplikazioak zehaztuko du partekatu beharrekoa zer den."</string>
     <string name="wifi_quick_toggle_title" msgid="7935778388625246184">"Wifia"</string>
     <string name="wifi_quick_toggle_summary" msgid="2879870570547594266">"Aktibatu Wi-Fia"</string>
     <string name="wifi_settings" msgid="7486492317310514109">"Wifia"</string>
@@ -844,7 +844,7 @@
     <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>
-    <string name="wifi_sap_no_channel_error" msgid="6881796988574851628">"5 GHz-ko banda ez dago erabilgarri herrialde honetan"</string>
+    <string name="wifi_sap_no_channel_error" msgid="6881796988574851628">"5 GHz-eko banda ez dago erabilgarri herrialde honetan"</string>
     <string name="wifi_in_airplane_mode" msgid="4729571191578262246">"Hegaldi moduan"</string>
     <string name="wifi_notify_open_networks" msgid="4782239203624619655">"Sare irekien jakinarazpenak"</string>
     <string name="wifi_notify_open_networks_summary" msgid="1383681260705466715">"Jakinarazi kalitate handiko sare publikoak erabilgarri daudenean"</string>
@@ -925,9 +925,9 @@
     <string name="wifi_show_password" msgid="7878398590772942202">"Erakutsi pasahitza"</string>
     <string name="wifi_ap_band_config" msgid="6565016368079288433">"Hautatu AP banda"</string>
     <string name="wifi_ap_choose_auto" msgid="7927637960569365785">"Automatikoa"</string>
-    <string name="wifi_ap_choose_2G" msgid="43198403259714736">"2,4 GHz-ko banda"</string>
-    <string name="wifi_ap_choose_5G" msgid="2624859713183683146">"5,0 GHz-ko banda"</string>
-    <string name="wifi_ap_prefer_5G" msgid="8339172330471170142">"5,0 GHz-ko banda hobetsia"</string>
+    <string name="wifi_ap_choose_2G" msgid="43198403259714736">"2,4 GHz-eko banda"</string>
+    <string name="wifi_ap_choose_5G" msgid="2624859713183683146">"5,0 GHz-eko banda"</string>
+    <string name="wifi_ap_prefer_5G" msgid="8339172330471170142">"5,0 GHz-eko 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 wifi-gunerako:"</string>
@@ -961,7 +961,7 @@
     <string name="wifi_dpp_connecting" msgid="4229290407210299897">"Konektatzen…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="847987212473038179">"Partekatu wifi-gunea"</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_wifi_password" msgid="8007558344032612455">"Wifi-sareko pasahitza: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="6172326289042241924">"Wifi-gunearen pasahitza: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_add_device" msgid="1347056725253936358">"Gehitu gailu bat"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="115993715600532357">"Konektatu sare honetara QR kode baten bidez"</string>
@@ -972,13 +972,13 @@
     <string name="wifi_multiple_cert_added" msgid="7986200585749147204">"(Ziurtagiri batzuk gehitu dira)"</string>
     <string name="wifi_use_system_certs" msgid="4794489370929885022">"Erabili sistemaren ziurtagiriak"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="4044301449482425250">"Ez zehaztu"</string>
-    <string name="wifi_do_not_validate_eap_server" msgid="1892537559682474878">"Ez balidatu"</string>
+    <string name="wifi_do_not_validate_eap_server" msgid="1892537559682474878">"Ez baliozkotu"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="3895397996759837323">"Ez da zehaztu ziurtagiririk. Konexioa ez da izango pribatua."</string>
     <string name="wifi_ssid_too_long" msgid="34911971389775920">"Sarearen izena luzeegia da."</string>
     <string name="wifi_no_domain_warning" msgid="735859919311067606">"Domeinua zehaztu behar da."</string>
     <string name="wifi_wps_available_first_item" msgid="3221671453930485243">"WPSa erabilgarri"</string>
     <string name="wifi_wps_available_second_item" msgid="5703265526619705185">" (WPSa erabilgarri)"</string>
-    <string name="wifi_carrier_connect" msgid="7202618367339982884">"Operadorearen Wi‑Fi sarea"</string>
+    <string name="wifi_carrier_connect" msgid="7202618367339982884">"Operadorearen wifi-sarea"</string>
     <string name="wifi_carrier_content" msgid="3467402515071949783">"Konektatu <xliff:g id="NAME">%1$s</xliff:g> bidez"</string>
     <string name="wifi_scan_always_turnon_message" msgid="7811846312032594248">"Kokapenaren zehaztasuna hobetzeko eta beste helburu batzuetarako, <xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak sare-bilaketa aktibatu nahi du, Wi-Fia desaktibatuta egonda ere.\n\nBilaketa egin nahi duten beste aplikazio guztiei ere baimendu nahi diezu?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="556993843641750002">"Desaktibatzeko, joan menuko \"Ezarpen aurreratuak\" aukerara."</string>
@@ -1021,7 +1021,7 @@
     <string name="wifi_advanced_mac_address_title" msgid="1162782083754021737">"MAC helbidea"</string>
     <string name="wifi_advanced_ip_address_title" msgid="2708185994512829071">"IP helbidea"</string>
     <string name="wifi_details_title" msgid="2164042631550920157">"Sarearen xehetasunak"</string>
-    <string name="wifi_details_subnet_mask" msgid="53396707004763012">"Azpisarearen maskara"</string>
+    <string name="wifi_details_subnet_mask" msgid="53396707004763012">"Azpisare-maskara"</string>
     <string name="wifi_details_dns" msgid="1118251455740116559">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="1642310137145363299">"IPv6 helbideak"</string>
     <string name="wifi_saved_access_points_label" msgid="3790693285928292563">"Gordetako sareak"</string>
@@ -1067,7 +1067,7 @@
     <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">"Wifi-gunearen 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 wifi-gunea beste gailuentzako wifi-sare bat sortzeko. Wifi-guneen 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 wifi-gunea beste gailuentzako wifi-sare bat sortzeko. Wifi-guneen bidez, Interneteko konexioa ematen da datu-konexioa erabilita. Baliteke zerbait ordaindu behar izatea datuak erabiltzeagatik."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="3339582350894639261">"Aplikazioek wifi-guneak sor ditzakete edukia inguruko gailuekin partekatzeko."</string>
     <string name="wifi_hotspot_auto_off_title" msgid="7416022590415189590">"Desaktibatu automatikoki wifi-gunea"</string>
     <string name="wifi_hotspot_auto_off_summary" msgid="3866769400624802105">"Wifi-gunea desaktibatu egingo da ez badago gailurik konektatuta"</string>
@@ -1079,9 +1079,9 @@
     <string name="wifi_hotspot_configure_ap_text" msgid="1000003286253019522">"Wifi-gunearen konfigurazioa"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="2303120188509955656">"AndroidAP WPA2 PSK wifi-gunea"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="1722238925876152663">"AndroidSarePublikoa"</string>
-    <string name="wifi_calling_settings_title" msgid="626821542308601806">"Wi-Fi bidezko deiak"</string>
+    <string name="wifi_calling_settings_title" msgid="626821542308601806">"Wifi bidezko deiak"</string>
     <string name="wifi_calling_suggestion_title" msgid="1402265373543523970">"Zabaldu deiak egiteko aukera Wi‑Fi konexioarekin"</string>
-    <string name="wifi_calling_suggestion_summary" msgid="198402175473169630">"Aktibatu Wi‑Fi bidezko deiak estaldura zabaltzeko"</string>
+    <string name="wifi_calling_suggestion_summary" msgid="198402175473169630">"Aktibatu Wifi bidezko deiak estaldura zabaltzeko"</string>
     <string name="wifi_calling_mode_title" msgid="3350624859819920176">"Deitzeko aukera lehenetsiak"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="652534533091724333">"Deitzeko aukera hobetsia"</string>
     <string name="wifi_calling_roaming_mode_title" msgid="2059151080231602753">"Ibiltaritzako hobespena"</string>
@@ -1115,9 +1115,9 @@
     <string name="emergency_address_summary" msgid="478668478569851714">"Kokapen gisa erabiliko da larrialdi-zerbitzuetara Wi-Fi bidez deituz gero"</string>
     <string name="private_dns_help_message" msgid="7633526525131196650"><annotation id="url">"Lortu informazio gehiago"</annotation>" DNS pribatuaren eginbideei buruz"</string>
     <string name="wifi_calling_pref_managed_by_carrier" msgid="5458050015417972072">"Operadoreak kudeatzen du ezarpen hau"</string>
-    <string name="wifi_calling_settings_activation_instructions" msgid="2863642668648110908">"Aktibatu Wi-Fi bidezko deiak"</string>
-    <string name="wifi_calling_turn_on" msgid="1212277809455062043">"Aktibatu Wi-Fi bidezko deiak"</string>
-    <string name="wifi_calling_not_supported" msgid="216781767605669775">"%1$s operadoreak ez ditu onartzen Wi‑Fi bidezko deiak"</string>
+    <string name="wifi_calling_settings_activation_instructions" msgid="2863642668648110908">"Aktibatu Wifi bidezko deiak"</string>
+    <string name="wifi_calling_turn_on" msgid="1212277809455062043">"Aktibatu Wifi bidezko deiak"</string>
+    <string name="wifi_calling_not_supported" msgid="216781767605669775">"%1$s operadoreak ez ditu onartzen wifi bidezko deiak"</string>
     <string name="carrier" msgid="3413463182542176886">"Operadorea"</string>
     <string name="display_settings_title" msgid="1243571562133261601">"Bistaratzea"</string>
     <string name="sound_settings" msgid="3306063041029638807">"Soinua"</string>
@@ -1466,7 +1466,7 @@
     <string name="storage_wizard_init_internal_title" msgid="8750856962785644870">"Erabili barneko memoria gisa"</string>
     <string name="storage_wizard_init_internal_summary" msgid="4510546464921608029">"Edozein gauza gailu honetan soilik gordetzeko, aplikazioak eta argazkiak barne. Erabilera hau emateko, beste gailu batzuetan funtzionatzea galarazten duen formateatze bat egin behar da memorian."</string>
     <string name="storage_wizard_format_confirm_title" msgid="7785358616068633439">"Formateatu barneko memoria gisa"</string>
-    <string name="storage_wizard_format_confirm_body" msgid="4107762933332992624">"<xliff:g id="NAME_0">^1</xliff:g> formateatu egin behar da segurua izan dadin. \n\nFormateatu ostean, <xliff:g id="NAME_1">^1</xliff:g> memoriak gailu honetan bakarrik funtzionatuko du. \n\n"<b>"Formateatzean, unean <xliff:g id="NAME_2">^1</xliff:g> memorian gordetako datu guztiak ezabatzen dira."</b>" Daturik ez galtzeko, babeskopia bat egitea gomendatzen dizugu."</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4107762933332992624">"<xliff:g id="NAME_0">^1</xliff:g> formateatu egin behar da segurua izan dadin. \n\nFormateatu ostean, <xliff:g id="NAME_1">^1</xliff:g> memoriak gailu honetan bakarrik funtzionatuko du. \n\n"<b>"Formateatzean, unean-unean <xliff:g id="NAME_2">^1</xliff:g> memorian gordetako datu guztiak ezabatzen dira."</b>" Daturik ez galtzeko, babeskopia bat egitea gomendatzen dizugu."</string>
     <string name="storage_wizard_format_confirm_public_title" msgid="5866830103788091426">"Formateatu memoria eramangarri gisa"</string>
     <string name="storage_wizard_format_confirm_public_body" msgid="1451308701654703353">"Hori egiteko, <xliff:g id="NAME_0">^1</xliff:g> formateatu egin behar da. \n\n"<b>"Formateatuz gero, <xliff:g id="NAME_1">^1</xliff:g> gailuko datu guztiak ezabatuko dira."</b>" Datuak ez galtzeko, babeskopiak egitea gomendatzen dugu."</string>
     <string name="storage_wizard_format_confirm_next" msgid="236947984802247625">"Ezabatu eta formateatu"</string>
@@ -1570,10 +1570,10 @@
     <string name="restore_default_apn_completed" msgid="5671734152740058937">"APNaren ezarpen lehenetsiak berrezarri dira."</string>
     <string name="reset_dashboard_title" msgid="7084966342252178530">"Berrezartzeko aukerak"</string>
     <string name="reset_dashboard_summary" msgid="8778383341461126642">"Sarea, aplikazioak edota gailua berrezar daitezke"</string>
-    <string name="reset_network_title" msgid="8944059136930806211">"Berrezarri wifi, Bluetooth eta sare mugikorrak"</string>
+    <string name="reset_network_title" msgid="8944059136930806211">"Berrezarri wifia, Bluetooth-a eta sare mugikorrak"</string>
     <string name="reset_network_desc" msgid="4982633363916261109">"Hori eginez gero, sare guztien ezarpenak berrezarriko dira, besteak beste: \n\n"<li>"Wifia"</li>\n<li>"Datu-konexioa"</li>\n<li>"Bluetooth-a"</li></string>
-    <string name="reset_esim_title" msgid="7630781767040831893">"Ezabatu deskargatutako SIMen edukia"</string>
-    <string name="reset_esim_desc" msgid="433226911566802">"Ordezko SIM txartelak deskargatzeko, jarri operadorearekin harremanetan. Ez da utziko bertan behera mugikorraren zerbitzu-planik."</string>
+    <string name="reset_esim_title" msgid="7630781767040831893">"Ezabatu deskargatutako SIMetako edukia"</string>
+    <string name="reset_esim_desc" msgid="433226911566802">"Ordezko SIM txartelak deskargatzeko, jarri operadorearekin harremanetan. Ez da utziko bertan behera mugikorreko zerbitzu-planik."</string>
     <string name="reset_network_button_text" msgid="4293271046867912819">"Berrezarri ezarpenak"</string>
     <string name="reset_network_final_desc" msgid="2463817067048751373">"Sareko ezarpen guztiak berrezarri nahi dituzu? Ezin da desegin ekintza hori."</string>
     <string name="reset_network_final_desc_esim" msgid="4676436976372555750">"Sareko ezarpen guztiak berrezarri eta deskargatutako SIM txartelen datu guztiak ezabatu nahi dituzu? Ezin da desegin ekintza hori."</string>
@@ -1591,7 +1591,7 @@
     <string name="master_clear_other_users_present" product="default" msgid="5993259656117566767">\n\n"Badaude erabiltzaile gehiago gailu honetan.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="3947303501615091903"><li>"Musika"</li>\n<li>"Argazkiak"</li>\n<li>"Bestelako erabiltzaile-datuak"</li></string>
     <string name="master_clear_desc_also_erases_esim" msgid="4497260499055258773"><li>"eSIM txartelak"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="6072668588881679461">\n\n"Horrek ez du utziko bertan behera operadorearekin kontratatuta duzun zerbitzu-plana."</string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="6072668588881679461">\n\n"Horrek ez du utziko bertan behera mugikorreko zerbitzu-plana."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="2723272952715259307">\n\n"Musika, irudiak eta bestelako erabiltzaile-datuak garbitzeko, "<b>"USB bidezko memoria"</b>" ezabatu behar da."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="9003555775524798797">\n\n"Musika, irudiak eta bestelako erabiltzaile-datuak garbitzeko, "<b>"SD txartela"</b>" ezabatu behar da."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="8989746770347525207">"Ezabatu USB bidezko memoria"</string>
@@ -1750,7 +1750,7 @@
     <string name="lock_settings_title" msgid="233657584969886812">"Gailuaren segurtasuna"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="333149762562581510">"Aldatu desblokeatzeko eredua"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="3435796032210265723">"Aldatu desblokeatzeko PINa"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2262005028838969839">"Marraztu desblokeatzeko eredua"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2262005028838969839">"Marraztu desblokeatzeko eredu bat"</string>
     <string name="lockpattern_recording_intro_footer" msgid="5426745740754065099">"Laguntza lortzeko, sakatu Menua."</string>
     <string name="lockpattern_recording_inprogress" msgid="4060818382176523671">"Bukatutakoan, jaso hatza"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="6374760294545431845">"Konektatu <xliff:g id="NUMBER">%d</xliff:g> puntu gutxienez. Saiatu berriro."</string>
@@ -1771,7 +1771,7 @@
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="1279989004145567840">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> fidagarritasun-agenteak desblokeatuta mantentzen duenean izan ezik"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="9042142745571386381">"Ezarri desblokeatzeko eredua"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1456643060737114885">"Aldatu desblokeatzeko eredua"</string>
-    <string name="lockpattern_settings_help_how_to_record" msgid="6037403647312543908">"Desblokeatzeko eredua nola marraztu"</string>
+    <string name="lockpattern_settings_help_how_to_record" msgid="6037403647312543908">"Desblokeatzeko eredu bat nola marraztu"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="3043127997770535921">"Saiakera oker gehiegi egin dituzu. Saiatu berriro <xliff:g id="NUMBER">%d</xliff:g> segundo barru."</string>
     <string name="activity_not_found" msgid="3492413375341165453">"Ez duzu aplikazioa telefonoan instalatu."</string>
     <string name="lock_settings_profile_title" msgid="3928992050074556160">"Laneko profilaren segurtasuna"</string>
@@ -1844,7 +1844,7 @@
     <string name="default_emergency_app" msgid="286530070173495823">"Larrialdietarako aplikazioa"</string>
     <string name="reset_app_preferences" msgid="1426500030595212077">"Berrezarri aplikazioen hobespenak"</string>
     <string name="reset_app_preferences_title" msgid="792909865493673598">"Aplikazioen hobespenak berrezarri nahi dituzu?"</string>
-    <string name="reset_app_preferences_desc" msgid="7935273005301096031">"Hauen hobespen guztiak berrezarriko dira:\n\n"<li>"desgaitutako aplikazioak,"</li>\n<li>"desgaitutako aplikazio-jakinarazpenak,"</li>\n<li>"ekintza jakinetarako aplikazio lehenetsiak,"</li>\n<li>"aplikazioen atzeko planoko datuen murriztapenak eta"</li>\n<li>"baimen-murriztapenak."</li>\n\n"Ez dituzu galduko aplikazioetako datuak."</string>
+    <string name="reset_app_preferences_desc" msgid="7935273005301096031">"Hauen hobespen guztiak berrezarriko dira:\n\n"<li>"desgaitutako aplikazioak,"</li>\n<li>"desgaitutako aplikazio-jakinarazpenak,"</li>\n<li>"ekintza jakinetarako aplikazio lehenetsiak,"</li>\n<li>"aplikazioen atzeko planoko datuen murriztapenak,"</li>\n<li>"baimen-murriztapenak."</li>\n\n"Ez dituzu galduko aplikazioetako datuak."</string>
     <string name="reset_app_preferences_button" msgid="2041894727477934656">"Berrezarri aplikazioak"</string>
     <string name="manage_space_text" msgid="6166469422303124302">"Kudeatu tokia"</string>
     <string name="filter" msgid="2426943916212457962">"Iragazi"</string>
@@ -2027,7 +2027,7 @@
     <string name="widget_picker_title" msgid="5424689728810684439">"Aukeratu widgeta"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="8168110035319637326">"Widgeta sortu eta sartzeko baimena eman?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="2782554863244412872">"Widgeta sortu ondoren, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ostalariak bistaratzen dituen datu guztiak atzitu ahal izango ditu."</string>
-    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="1185486443615658430">"Eman baimena beti widgetak sortzeko eta haietako datuak atzitzeko <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ostalariari"</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="1185486443615658430">"Eman widgetak sortzeko eta haietako datuak atzitzeko baimena beti <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ostalariari"</string>
     <string name="usage_stats_label" msgid="3128999956478977035">"Erabilera-estatistikak"</string>
     <string name="testing_usage_stats" msgid="704965692323956976">"Erabilera-estatistikak"</string>
     <string name="display_order_text" msgid="2973620313510295873">"Ordenatzeko irizpidea:"</string>
@@ -2453,7 +2453,7 @@
     <string name="battery_saver_auto_percentage" msgid="5791982309331921556">"Bateria-mailaren ehunekoan oinarrituta"</string>
     <string name="battery_saver_auto_routine_summary" msgid="9182044424547482889">"Bateria kargatzeko ohiko ordua iritsi aurretik bateria agortzeko arriskua badago aktibatzen da bateria-aurrezlea"</string>
     <string name="battery_saver_auto_percentage_summary" msgid="2036128588460338677">"Bateria-maila <xliff:g id="PERCENT">%1$s</xliff:g> denean aktibatuko da"</string>
-    <string name="battery_saver_schedule_settings_title" msgid="574233428557678128">"Ezarri programazioa"</string>
+    <string name="battery_saver_schedule_settings_title" msgid="574233428557678128">"Ezarri programazio bat"</string>
     <string name="battery_saver_sticky_title_new" msgid="5328707297110866082">"Desaktibatu guztiz kargatu ondoren"</string>
     <string name="battery_saver_sticky_description_new" product="default" msgid="3406582427270935879">"Telefonoaren bateria <xliff:g id="PERCENT">%1$s</xliff:g> denean, desaktibatu egiten da bateria-aurrezlea"</string>
     <string name="battery_saver_sticky_description_new" product="tablet" msgid="3284967694001857194">"Tabletaren bateria <xliff:g id="PERCENT">%1$s</xliff:g> denean, desaktibatu egiten da bateria-aurrezlea"</string>
@@ -2552,7 +2552,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, wifi-sareen pasahitzen eta beste ezarpenen babeskopia Google-ren zerbitzarietan."</string>
+    <string name="backup_data_summary" msgid="555459891017933746">"Egin datuen, wifi-sareetako 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>
@@ -2561,7 +2561,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">"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="backup_erase_dialog_message" msgid="8767843355330070902">"Wifi-sareetako 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 (garatzaileen 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>
@@ -2634,7 +2634,7 @@
     <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Kontua kentzen baduzu, bertako mezu, kontaktu eta bestelako datu guztiak ezabatuko dira gailutik!"</string>
     <string name="remove_account_failed" msgid="491458185327106966">"Administratzaileak ez du eman aldaketa egiteko baimena"</string>
     <string name="cant_sync_dialog_title" msgid="5483419398223189881">"Ezin da eskuz sinkronizatu"</string>
-    <string name="cant_sync_dialog_message" msgid="3467126947262857534">"Elementua ezin da unean desgaitu. Ezarpena aldatzeko, aktibatu atzeko planoko datuak eta sinkronizazio automatikoa aldi baterako."</string>
+    <string name="cant_sync_dialog_message" msgid="3467126947262857534">"Elementua ezin da une honetan desgaitu. Ezarpena aldatzeko, aktibatu atzeko planoko datuak eta sinkronizazio automatikoa aldi baterako."</string>
     <string name="enter_password" msgid="2963496904625715235">"Android-eko gailua abiarazteko, idatzi pasahitza"</string>
     <string name="enter_pin" msgid="7140938268709546890">"Android-eko gailua abiarazteko, idatzi PIN kodea"</string>
     <string name="enter_pattern" msgid="1653841963422825336">"Android-eko gailua abiarazteko, marraztu eredua"</string>
@@ -3312,7 +3312,7 @@
     <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>
     <string name="bubbles_feature_disabled_dialog_title" msgid="3375452386012079293">"Aktibatu burbuilak"</string>
-    <string name="bubbles_feature_disabled_dialog_text" msgid="326945485806386477">"Aplikazio honetan burbuilak aktibatu ahal izateko, gailuan aktibatu behar dituzu lehendabizi. Ekintza horrek eragina izango du burbuilak lehendik ere aktibatuta dituzten aplikazioetan."</string>
+    <string name="bubbles_feature_disabled_dialog_text" msgid="326945485806386477">"Aplikazio honetan burbuilak aktibatu ahal izateko, gailuan aktibatu behar dituzu lehendabizi. Ekintza horrek eragina izango du burbuilak lehendik ere aktibatuta dauzkaten aplikazioetan."</string>
     <string name="bubbles_feature_disabled_button_approve" msgid="6661464849674493351">"Gailua pizteko"</string>
     <string name="bubbles_feature_disabled_button_cancel" msgid="4807286844588486198">"Utzi"</string>
     <string name="swipe_direction_title" msgid="7535031630668873009">"Hatza pasatuta gauzatzen diren ekintzak"</string>
@@ -4164,7 +4164,7 @@
     <string name="account_sync_title" msgid="1570164819114297154">"Kontuaren sinkronizazioa"</string>
     <string name="account_sync_summary_some_on" msgid="1934556869158274053">"<xliff:g id="ID_1">%1$d</xliff:g>/<xliff:g id="ID_2">%2$d</xliff:g> elementuk aktibatuta daukate sinkronizazioa"</string>
     <string name="account_sync_summary_all_on" msgid="3634161204232431700">"Elementu guztiek aktibatuta daukate sinkronizazioa"</string>
-    <string name="account_sync_summary_all_off" msgid="1971584632343645602">"Elementu guztiek desaktibatuta dute sinkronizazioa"</string>
+    <string name="account_sync_summary_all_off" msgid="1971584632343645602">"Elementu guztiek desaktibatuta daukate sinkronizazioa"</string>
     <string name="enterprise_privacy_settings" msgid="2777101678653072889">"Gailu kudeatuaren informazioa"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5557859169062703683">"Erakundeak kudeatzen dituen aldaketak eta ezarpenak"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4884479123751308407">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> erakundeak kudeatzen dituen aldaketak eta ezarpenak"</string>
diff --git a/tests/CarDeveloperOptions/res/values-fa/arrays.xml b/tests/CarDeveloperOptions/res/values-fa/arrays.xml
index 2fcb737..ed6cce4 100644
--- a/tests/CarDeveloperOptions/res/values-fa/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-fa/arrays.xml
@@ -402,9 +402,9 @@
     <item msgid="6566768880689730097">"PPTP VPN"</item>
     <item msgid="1349760781118368659">"L2TP/IPSec VPN با کلیدهای از قبل به اشتراک گذاشته شده"</item>
     <item msgid="6128519070545038358">"L2TP/IPSec VPN با گواهی"</item>
-    <item msgid="312397853907741968">"IPSec VPN با کلیدهای از قبل به اشتراک گذاشته شده و احراز هویت Xauth"</item>
-    <item msgid="3319427315593649917">"IPSec VPN با گواهی و احراز هویت Xauth"</item>
-    <item msgid="8258927774145391041">"IPSec VPN دارای گواهی و احراز هویت دوگانه"</item>
+    <item msgid="312397853907741968">"IPSec VPN با کلیدهای از قبل به اشتراک گذاشته شده و اصالت‌سنجی Xauth"</item>
+    <item msgid="3319427315593649917">"IPSec VPN با گواهی و اصالت‌سنجی Xauth"</item>
+    <item msgid="8258927774145391041">"IPSec VPN دارای گواهی و اصالت‌سنجی دوگانه"</item>
   </string-array>
   <string-array name="vpn_proxy_settings">
     <item msgid="2958623927055120839">"هیچ‌کدام"</item>
diff --git a/tests/CarDeveloperOptions/res/values-fa/strings.xml b/tests/CarDeveloperOptions/res/values-fa/strings.xml
index f08ac41..8bfc29c 100644
--- a/tests/CarDeveloperOptions/res/values-fa/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-fa/strings.xml
@@ -386,7 +386,7 @@
     <string name="lockscreen_settings_what_to_show_category" msgid="3133378945821488654">"چه چیزی نشان داده شود"</string>
     <string name="security_settings_summary" msgid="5210109100643223686">"تنظیم مکان من، قفل صفحه، قفل سیم کارت، قفل حافظه اطلاعات کاربری"</string>
     <string name="cdma_security_settings_summary" msgid="1783066617800041869">"تنظیم مکان من، بازگشایی قفل صفحه، قفل حافظه اطلاعات کاربری"</string>
-    <string name="security_passwords_title" msgid="6853942836045862315">"حریم خصوصی"</string>
+    <string name="security_passwords_title" msgid="6853942836045862315">"حریم‌خصوصی"</string>
     <string name="disabled_by_administrator_summary" msgid="6099821045360491127">"توسط سرپرست غیرفعال شده"</string>
     <string name="security_status_title" msgid="1261960357751754428">"وضعیت امنیتی"</string>
     <string name="security_dashboard_summary_face" msgid="2536136110153593745">"قفل صفحه، بازگشایی با چهره"</string>
@@ -394,13 +394,13 @@
     <string name="security_dashboard_summary_no_fingerprint" msgid="8861903321053490658">"قفل صفحه"</string>
     <string name="security_settings_face_preference_summary" msgid="4437701024542221434">"چهره افزوده شد"</string>
     <string name="security_settings_face_preference_summary_none" msgid="8427755590493904386">"برای تنظیم تشخیص چهره ضربه بزنید"</string>
-    <string name="security_settings_face_preference_title" msgid="2630071872604654381">"احراز هویت با چهره"</string>
+    <string name="security_settings_face_preference_title" msgid="2630071872604654381">"اصالت‌سنجی با چهره"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="1563255314851533140">"استفاده از تنظیمات دسترس‌پذیری"</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">"لغو"</string>
     <string name="security_settings_face_enroll_introduction_title" msgid="6073249653318265486">"با چهره‌تان قفل را باز کنید"</string>
-    <string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="9223270521083202896">"از چهره‌تان برای احراز هویت استفاده کنید"</string>
+    <string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="9223270521083202896">"از چهره‌تان برای اصالت‌سنجی استفاده کنید"</string>
     <string name="security_settings_face_enroll_introduction_message" msgid="484806903869220184">"برای باز کردن قفل تلفنتان، مجاز کردن خریدها یا ورود به سیستم برنامه‌ها، از چهر‌ه‌تان استفاده کنید."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="2850101281254663082">"از چهره‌تان برای باز کردن قفل تلفن یا تأیید خریدها استفاده کنید.\n\nتوجه: نمی‌توانید از چهره‌تان برای باز کردن قفل این دستگاه استفاده کنید. برای اطلاعات بیشتر، با سرپرست سیستم سازمانتان تماس بگیرید."</string>
     <string name="security_settings_face_enroll_introduction_message_setup" msgid="4533297059466270074">"برای باز کردن قفل تلفنتان، مجاز کردن خریدها یا ورود به سیستم برنامه‌ها، از چهر‌ه‌تان استفاده کنید"</string>
@@ -420,9 +420,9 @@
     <string name="security_settings_face_settings_use_face_unlock_phone" msgid="318274519126401671">"باز کردن قفل دستگاه"</string>
     <string name="security_settings_face_settings_use_face_for_apps" msgid="5479369083370664351">"ورودبه‌سیستم برنامه و پرداخت‌ها"</string>
     <string name="security_settings_face_settings_require_attention" msgid="2755140150841557225">"برای باز کردن قفل، چشم‌هایتان را باز کنید"</string>
-    <string name="security_settings_face_settings_require_attention_details" msgid="2557060433599942587">"هنگام استفاده از احراز هویت چهره، چشم‌هایتان باید باز باشد"</string>
+    <string name="security_settings_face_settings_require_attention_details" msgid="2557060433599942587">"هنگام استفاده از اصالت‌سنجی چهره، چشم‌هایتان باید باز باشد"</string>
     <string name="security_settings_face_settings_require_confirmation" msgid="7312024271060416438">"همیشه به تأیید نیاز است"</string>
-    <string name="security_settings_face_settings_require_confirmation_details" msgid="8740564864091803429">"هنگام احراز هویت در برنامه‌ها، همیشه به تأیید نیاز است"</string>
+    <string name="security_settings_face_settings_require_confirmation_details" msgid="8740564864091803429">"هنگام اصالت‌سنجی در برنامه‌ها، همیشه به تأیید نیاز است"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="2821359954483136239">"حذف داده‌های چهره"</string>
     <string name="security_settings_face_settings_footer" msgid="4627175759990550715">"می‌توانید از چهره‌تان برای باز کردن قفل دستگاه و دسترسی به برنامه‌ها استفاده کنید. "<annotation id="url">"بیشتر بدانید"</annotation></string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="5675319895815271094">"داده‌های چهره حذف شود؟"</string>
@@ -477,9 +477,9 @@
     <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="tablet" msgid="1384438077720821127">"از رایانه لوحی‌تان با گزینه قفل صفحه محافظت کنید تا درصورت گم شدن یا به سرقت رفتن هیچ فردی نتواند از آن استفاده کند. همچنین به گزینه قفل صفحه نیاز دارید تا اثرانگشت را راه‌اندازی کنید. روی «لغو» ضربه بزنید و سپس پین تنظیم کنید یا گزینه قفل صفحه دیگری را انتخاب کنید."</string>
     <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="device" msgid="7207112623501771824">"از دستگاهتان با گزینه قفل صفحه محافظت کنید تا درصورت گم شدن یا به سرقت رفتن هیچ فردی نتواند از آن استفاده کند. همچنین به گزینه قفل صفحه نیاز دارید تا اثرانگشت را راه‌اندازی کنید. روی «لغو» ضربه بزنید و سپس پین تنظیم کنید یا گزینه قفل صفحه دیگری را انتخاب کنید."</string>
     <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="default" msgid="7623975730623531606">"از تلفنتان با گزینه قفل صفحه محافظت کنید تا درصورت گم شدن یا به سرقت رفتن هیچ فردی نتواند از آن استفاده کند. همچنین به گزینه قفل صفحه نیاز دارید تا اثرانگشت را راه‌اندازی کنید. روی «لغو» ضربه بزنید و سپس پین تنظیم کنید یا گزینه قفل صفحه دیگری را انتخاب کنید."</string>
-    <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"از رایانه لوحی‌تان با گزینه قفل صفحه محافظت کنید تا درصورت گم شدن یا به سرقت رفتن هیچ فردی نتواند از آن استفاده کند. همچنین به گزینه قفل صفحه نیاز دارید تا احراز هویت ازطرق چهره را راه‌اندازی کنید. روی «لغو» ضربه بزنید و سپس پین تنظیم کنید یا گزینه قفل صفحه دیگری را انتخاب کنید."</string>
-    <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"از دستگاهتان با گزینه قفل صفحه محافظت کنید تا درصورت گم شدن یا به سرقت رفتن هیچ فردی نتواند از آن استفاده کند. همچنین به گزینه قفل صفحه نیاز دارید تا احراز هویت ازطرق چهره را راه‌اندازی کنید. روی «لغو» ضربه بزنید و سپس پین تنظیم کنید یا گزینه قفل صفحه دیگری را انتخاب کنید."</string>
-    <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"از تلفنتان با گزینه قفل صفحه محافظت کنید تا درصورت گم شدن یا به سرقت رفتن هیچ فردی نتواند از آن استفاده کند. همچنین به گزینه قفل صفحه نیاز دارید تا احراز هویت ازطرق چهره را راه‌اندازی کنید. روی «لغو» ضربه بزنید و سپس پین تنظیم کنید یا گزینه قفل صفحه دیگری را انتخاب کنید."</string>
+    <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"از رایانه لوحی‌تان با گزینه قفل صفحه محافظت کنید تا درصورت گم شدن یا به سرقت رفتن هیچ فردی نتواند از آن استفاده کند. همچنین به گزینه قفل صفحه نیاز دارید تا اصالت‌سنجی ازطرق چهره را راه‌اندازی کنید. روی «لغو» ضربه بزنید و سپس پین تنظیم کنید یا گزینه قفل صفحه دیگری را انتخاب کنید."</string>
+    <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"از دستگاهتان با گزینه قفل صفحه محافظت کنید تا درصورت گم شدن یا به سرقت رفتن هیچ فردی نتواند از آن استفاده کند. همچنین به گزینه قفل صفحه نیاز دارید تا اصالت‌سنجی ازطرق چهره را راه‌اندازی کنید. روی «لغو» ضربه بزنید و سپس پین تنظیم کنید یا گزینه قفل صفحه دیگری را انتخاب کنید."</string>
+    <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"از تلفنتان با گزینه قفل صفحه محافظت کنید تا درصورت گم شدن یا به سرقت رفتن هیچ فردی نتواند از آن استفاده کند. همچنین به گزینه قفل صفحه نیاز دارید تا اصالت‌سنجی ازطرق چهره را راه‌اندازی کنید. روی «لغو» ضربه بزنید و سپس پین تنظیم کنید یا گزینه قفل صفحه دیگری را انتخاب کنید."</string>
     <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"راه‌اندازی پین رد شود؟"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"راه‌اندازی گذرواژه رد شود؟"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"راه‌اندازی الگو رد شود؟"</string>
@@ -580,10 +580,10 @@
     <string name="fingerprint_unlock_set_unlock_password" msgid="3325527833422156515">"اثر انگشت + گذرواژه"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="2063700014903801639">"ادامه بدون اثر انگشت"</string>
     <string name="fingerprint_unlock_title" msgid="8009992449332532869">"می‌توانید با استفاده از اثر انگشتتان قفل تلفنتان را باز کنید. بنا به دلایل ایمنی این گزینه مستلزم قفل صفحه پشتیبان است."</string>
-    <string name="face_unlock_set_unlock_pattern" msgid="3748596996869406905">"احراز هویت با چهره + الگو"</string>
-    <string name="face_unlock_set_unlock_pin" msgid="3320824093518497476">"احراز هویت با چهره + پین"</string>
-    <string name="face_unlock_set_unlock_password" msgid="8962344604388383659">"احراز هویت با چهره + گذرواژه"</string>
-    <string name="face_unlock_skip_face" msgid="7173197040501143880">"ادامه بدون احراز هویت با چهره"</string>
+    <string name="face_unlock_set_unlock_pattern" msgid="3748596996869406905">"اصالت‌سنجی با چهره + الگو"</string>
+    <string name="face_unlock_set_unlock_pin" msgid="3320824093518497476">"اصالت‌سنجی با چهره + پین"</string>
+    <string name="face_unlock_set_unlock_password" msgid="8962344604388383659">"اصالت‌سنجی با چهره + گذرواژه"</string>
+    <string name="face_unlock_skip_face" msgid="7173197040501143880">"ادامه بدون اصالت‌سنجی با چهره"</string>
     <string name="face_unlock_title" msgid="1298031162909236127">"می‌توانید با استفاده از چهره‌تان قفل تلفنتان را باز کنید. بنا به دلایل ایمنی این گزینه مستلزم قفل صفحه پشتیبان است."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="1713159782896140817">"توسط سرپرست غیرفعال شده، طبق خط‌مشی رمزگذاری یا حافظه اطلاعات کاربردی"</string>
     <string name="unlock_set_unlock_mode_off" msgid="2950701212659081973">"هیچ‌کدام"</string>
@@ -754,7 +754,7 @@
     <string name="bluetooth_pairing_dialog_title" msgid="7900515495932064945">"با این دستگاه مرتبط‌سازی شود؟"</string>
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7395493311980018460">"دفترچه تلفن به اشتراک گذاشته شود؟"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="2103132762434487717">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> می‌خواهد به مخاطبین و سابقه تماس شما دسترسی داشته باشد."</string>
-    <string name="bluetooth_pairing_dialog_paring_request" msgid="5513953935086446387">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> می‌خواهد با بلوتوث مرتبط‌سازی کند. وقتی وصل شود، به مخاطبین و سابقه تماستان دسترسی دارد."</string>
+    <string name="bluetooth_pairing_dialog_paring_request" msgid="5513953935086446387">"‏<xliff:g id="DEVICE_NAME">%1$s</xliff:g> می‌خواهد با بلوتوث مرتبط‌سازی کند. وقتی وصل شود، به مخاطبین و سابقه تماستان دسترسی دارد."</string>
     <string name="bluetooth_preference_found_media_devices" msgid="5748539613567836379">"دستگاه‌های در دسترس"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="4190090666412408576">"دستگاهی موجود نیست"</string>
     <string name="bluetooth_device_context_connect" msgid="1812090541371432890">"اتصال"</string>
@@ -852,14 +852,14 @@
     <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_wakeup_summary_scoring_disabled" msgid="7067018832237903151">"برای استفاده، یک ارائه‌دهنده رده‌بندی شبکه انتخاب کنید"</string>
     <string name="wifi_poor_network_detection" msgid="7193423327400703073">"اجتناب از اتصالات ضعیف"</string>
     <string name="wifi_poor_network_detection_summary" msgid="5539951465985614590">"از شبکه Wi-Fi استفاده نکنید مگر اینکه اتصال اینترنتی مناسب داشته باشد"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="1976503191780928104">"فقط از شبکه‌هایی استفاده می‌شود که اتصال اینترنتی خوبی دارند"</string>
     <string name="use_open_wifi_automatically_title" msgid="3084513215481454350">"اتصال به شبکه‌های باز"</string>
     <string name="use_open_wifi_automatically_summary" msgid="8338020172673161754">"اتصال خودکار به شبکه‌های عمومی با کیفیت بالا"</string>
-    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="1559329344492373028">"برای استفاده، یک ارائه‌دهنده رتبه‌بندی شبکه انتخاب کنید"</string>
-    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="1123080670578756834">"برای استفاده، یک ارائه‌دهنده رتبه‌بندی شبکه سازگار انتخاب کنید"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="1559329344492373028">"برای استفاده، یک ارائه‌دهنده رده‌بندی شبکه انتخاب کنید"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="1123080670578756834">"برای استفاده، یک ارائه‌دهنده رده‌بندی شبکه سازگار انتخاب کنید"</string>
     <string name="wifi_install_credentials" msgid="5650088113710858289">"نصب مجوزها"</string>
     <string name="wifi_scan_notify_text" msgid="7614101215028336927">"برای بهبود دقت مکان، برنامه‌ها و سرویس‌ها همچنان می‌توانند در هرزمانی شبکه‌های Wi-Fi را اسکن کنند (حتی وقتی 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_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>
@@ -915,7 +915,7 @@
     <string name="passpoint_label" msgid="7429247462404128615">"ذخیره از طریق"</string>
     <string name="passpoint_content" msgid="340527524510304327">"اطلاعات کاربری <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifi_eap_method" msgid="3752116941487485859">"روش EAP"</string>
-    <string name="please_select_phase2" msgid="5848080896810435677">"مرحله دوم احراز هویت"</string>
+    <string name="please_select_phase2" msgid="5848080896810435677">"مرحله دوم اصالت‌سنجی"</string>
     <string name="wifi_eap_ca_cert" msgid="1496395241849383785">"گواهی CA"</string>
     <string name="wifi_eap_domain" msgid="3298302320003640130">"دامنه"</string>
     <string name="wifi_eap_user_cert" msgid="6786839531765719173">"گواهی کاربر"</string>
@@ -932,17 +932,17 @@
     <string name="wifi_ap_5G" msgid="4584892544393675403">"۵٫۰ گیگاهرتز"</string>
     <string name="wifi_ap_band_select_one" msgid="4409754936554360355">"حداقل یک باند برای نقطه اتصال Wi‑Fi انتخاب کنید:"</string>
     <string name="wifi_ip_settings" msgid="4636102290236116946">"تنظیمات IP"</string>
-    <string name="wifi_privacy_settings" msgid="4462092795794247809">"حریم خصوصی"</string>
+    <string name="wifi_privacy_settings" msgid="4462092795794247809">"حریم‌خصوصی"</string>
     <string name="wifi_privacy_settings_ephemeral_summary" msgid="2411375348287064283">"MAC تصادفی"</string>
     <string name="wifi_dpp_add_device_to_network" msgid="8871041525483253430">"افزودن دستگاه"</string>
-    <string name="wifi_dpp_center_qr_code" msgid="3826108361797476758">"برای افزودن دستگاه به «<xliff:g id="SSID">%1$s</xliff:g>»،‌ کد QR را در مرکز پنجره زیر قرار دهید"</string>
-    <string name="wifi_dpp_scan_qr_code" msgid="6021600592661235546">"اسکن کد QR"</string>
-    <string name="wifi_dpp_scan_qr_code_join_network" msgid="3085162928804379545">"برای اتصال به «<xliff:g id="SSID">%1$s</xliff:g>»،‌ کد QR را در مرکز پنجره زیر قرار دهید"</string>
-    <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="5682308317067290738">"با اسکن کردن کد QR، به Wi‑Fi بپیوندید"</string>
+    <string name="wifi_dpp_center_qr_code" msgid="3826108361797476758">"برای افزودن دستگاه به «<xliff:g id="SSID">%1$s</xliff:g>»،‌ رمزینه پاسخ‌سریع را در مرکز پنجره زیر قرار دهید"</string>
+    <string name="wifi_dpp_scan_qr_code" msgid="6021600592661235546">"اسکن رمزینه پاسخ‌سریع"</string>
+    <string name="wifi_dpp_scan_qr_code_join_network" msgid="3085162928804379545">"برای اتصال به «<xliff:g id="SSID">%1$s</xliff:g>»،‌ رمزینه پاسخ‌سریع را در مرکز پنجره زیر قرار دهید"</string>
+    <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="5682308317067290738">"با اسکن کردن رمزینه پاسخ‌سریع، به Wi‑Fi بپیوندید"</string>
     <string name="wifi_dpp_share_wifi" msgid="1724161216219646284">"استفاده مشترک از Wi‑Fi"</string>
-    <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_scan_qr_code_with_another_device" msgid="4357387474444884759">"برای اتصال به «<xliff:g id="SSID">%1$s</xliff:g>»، این رمزینه پاسخ‌سریع را اسکن کنید و گذرواژه مربوطه را هم‌رسانی کنید"</string>
+    <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="572011882416511818">"برای اتصال به «<xliff:g id="SSID">%1$s</xliff:g>»، این رمزینه پاسخ‌سریع را اسکن کنید"</string>
+    <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="27667719861826438">"رمزینه پاسخ‌سریع خوانده نشد. کد را در مرکز قرار دهید و دوباره امتحان کنید"</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>
@@ -964,7 +964,7 @@
     <string name="wifi_dpp_wifi_password" msgid="8007558344032612455">"گذرواژه Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="6172326289042241924">"گذرواژه نقطه اتصال: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_add_device" msgid="1347056725253936358">"افزودن دستگاه"</string>
-    <string name="wifi_dpp_connect_network_using_qr_code" msgid="115993715600532357">"بااستفاده از کد QR، به این شبکه متصل شوید"</string>
+    <string name="wifi_dpp_connect_network_using_qr_code" msgid="115993715600532357">"بااستفاده از رمزینه پاسخ‌سریع، به این شبکه متصل شوید"</string>
     <string name="retry" msgid="8500839563577344702">"امتحان مجدد"</string>
     <string name="wifi_shared" msgid="5054256778276524960">"اشتراک‌گذاری با دیگر استفاده‌کنندگان از دستگاه"</string>
     <string name="wifi_unchanged" msgid="6804964646942333992">"(بدون تغییر)"</string>
@@ -1175,7 +1175,7 @@
     <string name="color_mode_option_natural" msgid="1292837781836645320">"طبیعی"</string>
     <string name="color_mode_option_boosted" msgid="453557938434778933">"تقویت‌شده"</string>
     <string name="color_mode_option_saturated" msgid="7758384943407859851">"اشباع‌شده"</string>
-    <string name="color_mode_option_automatic" msgid="6572718611315165117">"قابل تطبیق"</string>
+    <string name="color_mode_option_automatic" msgid="6572718611315165117">"تطبیقی"</string>
     <string name="color_mode_summary_natural" msgid="1247153893843263340">"فقط استفاده از رنگ‌های دقیق"</string>
     <string name="color_mode_summary_automatic" msgid="6066740785261330514">"تنظیم بین رنگ‌های روشن و دقیق"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="5750977897791656412">"هنگام چرخاندن رایانهٔ لوحی، جهت به‌طور خودکار تغییر می‌کند"</string>
@@ -1541,7 +1541,7 @@
     <string name="apn_mms_port" msgid="6606572282014819299">"درگاه فراپیام"</string>
     <string name="apn_mcc" msgid="9138301167194779180">"MCC"</string>
     <string name="apn_mnc" msgid="1276161191283274976">"MNC"</string>
-    <string name="apn_auth_type" msgid="4286147728662523362">"نوع احراز هویت"</string>
+    <string name="apn_auth_type" msgid="4286147728662523362">"نوع اصالت‌سنجی"</string>
     <string name="apn_auth_type_none" msgid="3679273936413404046">"هیچ‌کدام"</string>
     <string name="apn_auth_type_pap" msgid="6155876141679480864">"PAP"</string>
     <string name="apn_auth_type_chap" msgid="5484031368454788686">"CHAP"</string>
@@ -1637,7 +1637,7 @@
     <string name="sms_change_default_dialog_title" msgid="6301260161969667578">"برنامه پیامک تغییر داده شود؟"</string>
     <string name="sms_change_default_dialog_text" msgid="8275088077930942680">"از <xliff:g id="NEW_APP">%1$s</xliff:g> به‌جای <xliff:g id="CURRENT_APP">%2$s</xliff:g> به‌عنوان برنامه پیامک‌تان استفاده می‌کنید؟"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="4680224695080527907">"از <xliff:g id="NEW_APP">%s</xliff:g> به‌جای برنامه پبامک‌تان استفاده می‌کنید؟"</string>
-    <string name="network_scorer_picker_title" msgid="1691073966560952916">"ارائه‌دهنده رتبه‌بندی شبکه"</string>
+    <string name="network_scorer_picker_title" msgid="1691073966560952916">"ارائه‌دهنده رده‌بندی شبکه"</string>
     <string name="network_scorer_picker_none_preference" msgid="6448280557733231737">"هیچ‌کدام"</string>
     <string name="network_scorer_change_active_dialog_title" msgid="4274159562371475090">"دستیار Wi‑Fi را تغییر می‌دهید؟"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="4264089809189760730">"از <xliff:g id="NEW_APP">%1$s</xliff:g> به‌جای <xliff:g id="CURRENT_APP">%2$s</xliff:g> استفاده می‌کنید تا ارتباطات شبکه‌تان را مدیریت کنید؟"</string>
@@ -1690,7 +1690,7 @@
     <string name="manual" msgid="5431859421432581357">"دفترچه راهنما"</string>
     <string name="regulatory_labels" msgid="380968489247381025">"برچسب‌های نظارتی"</string>
     <string name="safety_and_regulatory_info" msgid="7113766428000920132">"راهنمای ایمنی و مقررات نظارتی"</string>
-    <string name="copyright_title" msgid="3847703367689932190">"حق نسخه‌برداری"</string>
+    <string name="copyright_title" msgid="3847703367689932190">"حق نشر"</string>
     <string name="license_title" msgid="7582145947873528540">"مجوز"</string>
     <string name="terms_title" msgid="1804549588198223771">"شرایط و مقررات"</string>
     <string name="webview_license_title" msgid="8244960025549725051">"مجوز وب‌نمای سیستم"</string>
@@ -1723,9 +1723,9 @@
     <string name="lockpassword_password_set_toast" msgid="601928982984489868">"گذرواژه تنظیم شد"</string>
     <string name="lockpassword_pin_set_toast" msgid="172594825722240059">"پین تنظیم شد"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6923260369475481406">"الگو تنظیم شد"</string>
-    <string name="lockpassword_choose_your_password_header_for_face" msgid="8823110536502072216">"برای استفاده از احراز هویت با چهره، گذرواژه تنظیم کنید"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_face" msgid="5563793748503883666">"برای استفاده از احراز هویت با چهره، الگو تنظیم کنید"</string>
-    <string name="lockpassword_choose_your_pin_header_for_face" msgid="7238352632535405068">"برای استفاده از احراز هویت با چهره، پین تنظیم کنید"</string>
+    <string name="lockpassword_choose_your_password_header_for_face" msgid="8823110536502072216">"برای استفاده از اصالت‌سنجی با چهره، گذرواژه تنظیم کنید"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_face" msgid="5563793748503883666">"برای استفاده از اصالت‌سنجی با چهره، الگو تنظیم کنید"</string>
+    <string name="lockpassword_choose_your_pin_header_for_face" msgid="7238352632535405068">"برای استفاده از اصالت‌سنجی با چهره، پین تنظیم کنید"</string>
     <string name="lockpassword_confirm_your_pattern_generic" msgid="6146545393074070916">"برای ادامه، از الگوی دستگاهتان استفاده کنید"</string>
     <string name="lockpassword_confirm_your_pin_generic" msgid="8732268389177735264">"برای ادامه، کد پین دستگاهتان را وارد کنید"</string>
     <string name="lockpassword_confirm_your_password_generic" msgid="6304552647060899594">"برای ادامه گذرواژه دستگاهتان را وارد کنید"</string>
@@ -1755,7 +1755,7 @@
     <string name="lockpattern_recording_inprogress" msgid="4060818382176523671">"وقتی الگو را کشیدید، انگشتتان را بردارید"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="6374760294545431845">"حداقل <xliff:g id="NUMBER">%d</xliff:g> نقطه را به یکدیگر متصل کنید. دوباره امتحان کنید."</string>
     <string name="lockpattern_pattern_entered_header" msgid="2108106638322637851">"الگو ضبط شد"</string>
-    <string name="lockpattern_need_to_confirm" msgid="4079482507985867389">"برای تأیید دوباره الگو را بکشید"</string>
+    <string name="lockpattern_need_to_confirm" msgid="4079482507985867389">"برای تأیید، دوباره الگو را بکشید"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="5603156929428721407">"الگوی جدید بازگشایی قفلتان"</string>
     <string name="lockpattern_confirm_button_text" msgid="7059311304112902598">"تأیید"</string>
     <string name="lockpattern_restart_button_text" msgid="4322968353922529868">"کشیدن مجدد"</string>
@@ -1836,7 +1836,7 @@
     <string name="enable_compatibility" msgid="1754177974320410195">"مقیاس‌بندی برنامه"</string>
     <string name="unknown" msgid="2780743426415501227">"ناشناس"</string>
     <string name="sort_order_alpha" msgid="6689698854460261212">"مرتب سازی براساس نام"</string>
-    <string name="sort_order_size" msgid="3167376197248713027">"مرتب‌سازی براساس اندازه"</string>
+    <string name="sort_order_size" msgid="3167376197248713027">"به‌ترتیب اندازه"</string>
     <string name="sort_order_recent_notification" msgid="5592496977404445941">"جدیدترین"</string>
     <string name="sort_order_frequent_notification" msgid="5640245013098010347">"پرتکرارترین"</string>
     <string name="show_running_services" msgid="1895994322704667543">"نمایش سرویس‌های در حال اجرا"</string>
@@ -1844,7 +1844,7 @@
     <string name="default_emergency_app" msgid="286530070173495823">"برنامه اضطراری"</string>
     <string name="reset_app_preferences" msgid="1426500030595212077">"بازنشانی اولویت‌های برنامه"</string>
     <string name="reset_app_preferences_title" msgid="792909865493673598">"بازنشانی اولویت‌های برنامه؟"</string>
-    <string name="reset_app_preferences_desc" msgid="7935273005301096031">"این کار همه اولویت‌های موارد زیر را بازنشانی می‌کند:\n\n "<li>"برنامه‌های غیرفعال‌شده"</li>\n" "<li>"اعلان‌های برنامه غیرفعال‌شده"</li>\n" "<li>"برنامه‌های پیش‌فرض برای عمل"</li>\n" "<li>"محدودیت‌های داده پس‌زمینه برای برنامه‌ها"</li>\n" "<li>"هرگونه محدودیت‌های مجوز"</li>\n\n" هیچ داده برنامه‌ای را از دست نخواهید داد."</string>
+    <string name="reset_app_preferences_desc" msgid="7935273005301096031">"این کار همه اولویت‌های موارد زیر را بازنشانی می‌کند:\n\n "<li>"برنامه‌های غیرفعال‌شده"</li>\n" "<li>"اعلان‌های برنامه غیرفعال‌شده"</li>\n" "<li>"برنامه‌های پیش‌فرض برای کنش‌ها"</li>\n" "<li>"محدودیت‌های داده پس‌زمینه برای برنامه‌ها"</li>\n" "<li>"همه محدودیت‌های اجازه‌ها"</li>\n\n" هیچ داده برنامه‌ای را ازدست نخواهید داد."</string>
     <string name="reset_app_preferences_button" msgid="2041894727477934656">"بازنشانی برنامه‌ها"</string>
     <string name="manage_space_text" msgid="6166469422303124302">"مدیریت فضا"</string>
     <string name="filter" msgid="2426943916212457962">"فیلتر"</string>
@@ -1980,7 +1980,7 @@
     <string name="game_controller_settings_category" msgid="9066526500617769463">"دسته کنترل بازی"</string>
     <string name="vibrate_input_devices" msgid="3584406079534121467">"تغییر مسیر لرزش"</string>
     <string name="vibrate_input_devices_summary" msgid="7503148018220540038">"وقتی متصل شد، لرزش به دسته کنترل بازی ارسال شود"</string>
-    <string name="keyboard_layout_dialog_title" msgid="4762706917037085797">"انتخاب طرح‌بندی صفحه‌کلید"</string>
+    <string name="keyboard_layout_dialog_title" msgid="4762706917037085797">"انتخاب جانمایی صفحه‌کلید"</string>
     <string name="keyboard_layout_dialog_setup_button" msgid="771293535107618283">"تنظیم طرح‌بندی‌های صفحه‌کلید"</string>
     <string name="keyboard_layout_dialog_switch_hint" msgid="138516114253502182">"برای تغییر، Control-کلید فاصله را فشار هید"</string>
     <string name="keyboard_layout_default_label" msgid="8368579311667189793">"پیش‌فرض"</string>
@@ -2008,7 +2008,7 @@
     <string name="testing" msgid="4255916838792186365">"تست کردن"</string>
     <string name="testing_phone_info" product="tablet" msgid="2714303457408649566">"اطلاعات رایانهٔ لوحی"</string>
     <string name="testing_phone_info" product="default" msgid="1954062952628179016">"اطلاعات تلفن"</string>
-    <string name="input_methods_settings_title" msgid="880477541100103388">"ووردی متن"</string>
+    <string name="input_methods_settings_title" msgid="880477541100103388">"ورودی نوشتاری"</string>
     <string name="input_method" msgid="2426639635860376775">"روش ورودی"</string>
     <string name="current_input_method" msgid="4831870685505762355">"صفحه‌کلید کنونی"</string>
     <string name="input_method_selector" msgid="2053594139601607047">"انتخابگر روش ورودی"</string>
@@ -2020,7 +2020,7 @@
     <string name="input_method_settings_button" msgid="6151412131733672062">"تنظیمات"</string>
     <string name="input_methods_settings_label_format" msgid="5927400388781960176">"<xliff:g id="IME_NAME">%1$s</xliff:g> تنظیمات"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="75557930915149416">"انتخاب روش‌های ورودی فعال"</string>
-    <string name="onscreen_keyboard_settings_summary" msgid="148763210673670769">"تنظیمات صفحه‌کلید روی صفحه"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="148763210673670769">"تنظیمات صفحه‌کلید مجازی"</string>
     <string name="builtin_keyboard_settings_title" msgid="3683883402326039724">"صفحه‌کلید فیزیکی"</string>
     <string name="builtin_keyboard_settings_summary" msgid="6498739864479285932">"تنظیمات صفحه‌کلید فیزیکی"</string>
     <string name="gadget_picker_title" msgid="9146981887780645322">"انتخاب اسبابک"</string>
@@ -2030,7 +2030,7 @@
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="1185486443615658430">"همیشه به <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> برای ایجاد ابزارک‌ها و دسترسی به اطلاعات آن‌ها اجازه داده شود"</string>
     <string name="usage_stats_label" msgid="3128999956478977035">"آمار کاربرد"</string>
     <string name="testing_usage_stats" msgid="704965692323956976">"آمار کاربرد"</string>
-    <string name="display_order_text" msgid="2973620313510295873">"ترتیب براساس:"</string>
+    <string name="display_order_text" msgid="2973620313510295873">"به‌ترتیب:"</string>
     <string name="app_name_label" msgid="2258469951312794816">"برنامه"</string>
     <string name="last_time_used_label" msgid="1119322667349666930">"آخرین زمان استفاده"</string>
     <string name="usage_time_label" msgid="5615725415876461039">"زمان استفاده"</string>
@@ -2102,7 +2102,7 @@
     <string name="accessibility_hearingaid_title" msgid="3700978781235124891">"سمعک‌ها"</string>
     <string name="accessibility_hearingaid_not_connected_summary" msgid="634573930469952213">"هیچ سمعکی متصل نشده است"</string>
     <string name="accessibility_hearingaid_adding_summary" msgid="4139031880828714300">"افزودن سمعک‌ها"</string>
-    <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="2671518890909750740">"برای مرتبط‌سازی سمعکتان، دستگاهتان را در صفحه بعدی پیدا کنید و روی آن ضربه بزنید."</string>
+    <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="2671518890909750740">"برای مرتبط‌سازی سمعکتان، دستگاهتان را در صفحه بعد پیدا کنید و روی آن ضربه بزنید."</string>
     <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="1584538735488464991">"مطمئن شوید سمعکتان در حالت مرتبط‌سازی باشد."</string>
     <string name="accessibility_hearingaid_active_device_summary" msgid="6081382497207168885">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> فعال"</string>
     <plurals name="show_number_hearingaid_count" formatted="false" msgid="7906547154695855096">
@@ -2224,8 +2224,8 @@
     <string name="print_cancelling_state_title_template" msgid="4627355699517405600">"در حال لغو <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="print_failed_state_title_template" msgid="6575080578316671101">"خطای چاپگر <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="print_blocked_state_title_template" msgid="1671128179616943823">"چاپگر کار <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> را مسدود کرد"</string>
-    <string name="print_search_box_shown_utterance" msgid="5164929050163660303">"کادر جستجو نمایان شد"</string>
-    <string name="print_search_box_hidden_utterance" msgid="1726782308351002642">"کادر جستجو پنهان شد"</string>
+    <string name="print_search_box_shown_utterance" msgid="5164929050163660303">"چارگوش جستجو نمایان شد"</string>
+    <string name="print_search_box_hidden_utterance" msgid="1726782308351002642">"چارگوش جستجو پنهان شد"</string>
     <string name="printer_info_desc" msgid="5913001479556045848">"اطلاعات بیشتر درباره این چاپگر"</string>
     <string name="power_usage_summary_title" msgid="3871905566750338898">"باتری"</string>
     <string name="power_usage_summary" msgid="2950273948620691117">"چه چیزی باتری را مصرف کرده است"</string>
@@ -2443,7 +2443,7 @@
     <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="process_kernel_label" msgid="4175060316414593760">"سیستم عامل Android"</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>
@@ -2475,7 +2475,7 @@
     <string name="process_stats_type_background" msgid="7867552451658035199">"پس‌زمینه"</string>
     <string name="process_stats_type_foreground" msgid="9185538008409818577">"پیش‌زمینه"</string>
     <string name="process_stats_type_cached" msgid="6774816751826613732">"در حافظه پنهان"</string>
-    <string name="process_stats_os_label" msgid="2866711070924260440">"سیستم عامل Android"</string>
+    <string name="process_stats_os_label" msgid="2866711070924260440">"سیستم‌عامل Android"</string>
     <string name="process_stats_os_native" msgid="8971193568864959041">"داخلی"</string>
     <string name="process_stats_os_kernel" msgid="496627624157605578">"مرکزی"</string>
     <string name="process_stats_os_zram" msgid="5654662484619165424">"Z-Ram"</string>
@@ -2930,7 +2930,7 @@
     <string name="nfc_more_title" msgid="2825856411836382264">"بیشتر..."</string>
     <string name="nfc_payment_set_default_label" msgid="3997927342761454042">"به عنوان روش ترجیحی شما تنظیم شود؟"</string>
     <string name="nfc_payment_set_default" msgid="1186837502664412132">"همیشه هنگام «ضربه و پرداخت»، از <xliff:g id="APP">%1$s</xliff:g> استفاده شود؟"</string>
-    <string name="nfc_payment_set_default_instead_of" msgid="5746952277762109289">"همیشه هنگام «ضربه و پرداخت» از <xliff:g id="APP_0">%1$s</xliff:g> به جای <xliff:g id="APP_1">%2$s</xliff:g> استفاده شود؟"</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="5746952277762109289">"همیشه هنگام «ضربه و پرداخت» از <xliff:g id="APP_0">%1$s</xliff:g> به‌جای <xliff:g id="APP_1">%2$s</xliff:g> استفاده شود؟"</string>
     <string name="restriction_settings_title" msgid="4143751894908963736">"محدودیت‌ها"</string>
     <string name="restriction_menu_reset" msgid="3642252461410370554">"حذف محدودیت‌ها"</string>
     <string name="restriction_menu_change_pin" msgid="592512748243421101">"تغییر پین"</string>
@@ -3072,7 +3072,7 @@
     <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_text_to_speech_output" msgid="1337378060761399890">"رتبه‌بندی، زبان، پیش‌فرض، بلند صحبت کردن، گفتن، صحبت کردن، صحبت، tts، دسترس‌پذیری، صفحه‌خوان، نابینا"</string>
+    <string name="keywords_text_to_speech_output" msgid="1337378060761399890">"رده‌بندی، زبان، پیش‌فرض، بلند صحبت کردن، گفتن، صحبت کردن، صحبت، tts، دسترس‌پذیری، صفحه‌خوان، نابینا"</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>
@@ -3098,7 +3098,7 @@
     <string name="keywords_payment_settings" msgid="4745023716567666052">"پرداخت کردن، ضربه زدن، پرداخت‌ها"</string>
     <string name="keywords_backup" msgid="7433356270034921627">"پشتیبان‌گیری، پشتیبان"</string>
     <string name="keywords_assist_gesture_launch" msgid="2711433664837843513">"اشاره"</string>
-    <string name="keywords_face_unlock" msgid="651615819291927262">"چهره، بازگشایی، احراز هویت، ورود به سیستم"</string>
+    <string name="keywords_face_unlock" msgid="651615819291927262">"چهره، بازگشایی، اصالت‌سنجی، ورود به سیستم"</string>
     <string name="keywords_imei_info" msgid="4325847870422053408">"imei، ‏meid،‏ min، نسخه prl، ‏imei sv"</string>
     <string name="keywords_sim_status" msgid="3852088576719874387">"شبکه، وضعیت شبکه همراه، وضعیت سرویس، شدت سیگنال، نوع شبکه همراه، فراگردی، iccid"</string>
     <string name="keywords_model_and_hardware" msgid="2743197096210895251">"شماره سریال، نسخه سخت‌افزار"</string>
@@ -3113,7 +3113,7 @@
     <string name="keywords_fingerprint_settings" msgid="902902368701134163">"اثر انگشت، افزودن اثر انگشت"</string>
     <string name="keywords_display_auto_brightness" msgid="1810596220466483996">"تار کردن صفحه‌نمایش، صفحه لمسی، باتری، روشنایی هوشمند، روشنایی پویا"</string>
     <string name="keywords_display_adaptive_sleep" msgid="1695357782432822811">"کم‌نور کردن صفحه، خواب، باتری، درنگ، توجه، نمایشگر، صفحه، بی‌فعالیتی"</string>
-    <string name="keywords_auto_rotate" msgid="4320791369951647513">"چرخاندن، چرخش، چرخش، پرتره، منظره، جهت، عمودی، افقی"</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_screen_timeout" msgid="4328381362313993666">"صفحه نمایش، زمان قفل شدن، درنگ، صفحه درحالت قفل"</string>
@@ -3316,8 +3316,8 @@
     <string name="bubbles_feature_disabled_button_approve" msgid="6661464849674493351">"روشن کردن برای دستگاه"</string>
     <string name="bubbles_feature_disabled_button_cancel" msgid="4807286844588486198">"لغو"</string>
     <string name="swipe_direction_title" msgid="7535031630668873009">"کنش‌های تند کشیدن"</string>
-    <string name="swipe_direction_ltr" msgid="944932514821822709">"برای رد کردن تند به چپ بکشید و برای نمایش منو تند به راست بکشید"</string>
-    <string name="swipe_direction_rtl" msgid="4521416787262888813">"برای رد کردن تند به راست بکشید و برای نمایش منو تند به چپ بکشید"</string>
+    <string name="swipe_direction_ltr" msgid="944932514821822709">"برای رد کردن تند به‌چپ بکشید و برای نمایش منو تند به‌راست بکشید"</string>
+    <string name="swipe_direction_rtl" msgid="4521416787262888813">"برای رد کردن تند به‌راست بکشید و برای نمایش منو تند به‌چپ بکشید"</string>
     <string name="notification_pulse_title" msgid="4861418327614907116">"نور چشمک‌زن"</string>
     <string name="lock_screen_notifications_title" msgid="6889072265118747835">"در صفحه قفل"</string>
     <string name="locked_work_profile_notification_title" msgid="8307025804986190658">"وقتی نمایه کاری قفل است"</string>
@@ -3772,8 +3772,8 @@
     <string name="memory_details" msgid="5165105904103664110">"جزئیات"</string>
     <string name="memory_use_summary" msgid="7676311343819965850">"<xliff:g id="SIZE">%1$s</xliff:g> متوسط حافظه استفاده شده در ۳ ساعت گذشته"</string>
     <string name="no_memory_use_summary" msgid="3966550113388917978">"در ۳ ساعت گذشته از حافظه استفاده نشده است"</string>
-    <string name="sort_avg_use" msgid="78428601253054298">"مرتب‌سازی براساس مصرف متوسط"</string>
-    <string name="sort_max_use" msgid="322772647893307413">"مرتب‌سازی براساس حداکثر مصرف"</string>
+    <string name="sort_avg_use" msgid="78428601253054298">"به‌ترتیب مصرف متوسط"</string>
+    <string name="sort_max_use" msgid="322772647893307413">"به‌ترتیب حداکثر مصرف"</string>
     <string name="memory_performance" msgid="3506743771947250453">"عملکرد"</string>
     <string name="total_memory" msgid="7352192982476976453">"کل حافظه"</string>
     <string name="average_used" msgid="3022736210190754669">"مصرف متوسط (%)"</string>
@@ -3939,7 +3939,7 @@
     <string name="ethernet_data_usage" msgid="747614925362556718">"میزان مصرف داده اترنت"</string>
     <string name="wifi" msgid="1586738489862966138">"Wi-Fi"</string>
     <string name="ethernet" msgid="2365753635113154667">"اترنت"</string>
-    <string name="cell_data_template" msgid="5473177306229738078">"<xliff:g id="AMOUNT">^1</xliff:g> داده شبکه تلفن همراه"</string>
+    <string name="cell_data_template" msgid="5473177306229738078">"‏<xliff:g id="AMOUNT">^1</xliff:g> داده شبکه تلفن همراه"</string>
     <string name="wifi_data_template" msgid="3146090439147042068">"<xliff:g id="AMOUNT">^1</xliff:g> داده‌های Wi-Fi"</string>
     <string name="ethernet_data_template" msgid="6414118030827090119">"<xliff:g id="AMOUNT">^1</xliff:g> داده‌ اترنت"</string>
     <string name="billing_cycle" msgid="5740717948341713190">"محدودیت و اخطار داده"</string>
@@ -4041,8 +4041,8 @@
     <string name="notification_log_details_vibrate_pattern" msgid="7015554755444260922">"الگو"</string>
     <string name="notification_log_details_default" msgid="455451833359888182">"پیش‌فرض"</string>
     <string name="notification_log_details_none" msgid="4294690532744821638">"هیچ‌کدام"</string>
-    <string name="notification_log_details_ranking_null" msgid="3907234749871463339">"شیء رتبه‌بندی وجود ندارد."</string>
-    <string name="notification_log_details_ranking_none" msgid="3687243721168608404">"شیء رتبه‌بندی حاوی این کلید نیست."</string>
+    <string name="notification_log_details_ranking_null" msgid="3907234749871463339">"شیء رده‌بندی وجود ندارد."</string>
+    <string name="notification_log_details_ranking_none" msgid="3687243721168608404">"شیء رده‌بندی حاوی این کلید نیست."</string>
     <string name="theme_customization_category" msgid="4043457940936660368">"سفارشی‌سازی طرح زمینه"</string>
     <string name="theme_customization_accent_color_title" msgid="3949108608589133216">"رنگ تأکیدی"</string>
     <string name="theme_customization_font_title" msgid="309728559821356597">"قلم عنوان / متن"</string>
@@ -4117,7 +4117,7 @@
     <string name="double_twist_for_camera_mode_title" msgid="2606032140297556018">"چرخاندن دوربین"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="8979914206876018137"></string>
     <string name="double_twist_for_camera_suggestion_title" msgid="5932411386316771246">"سریع‌تر گرفتن خودگرفت"</string>
-    <string name="swipe_up_to_switch_apps_summary" msgid="4644068184114154787">"برای رفتن به یک برنامه دیگر، انگشتتان را روی دکمه اصلی به بالا تند بکشید. برای دیدن همه برنامه‌ها، انگشتتان را دوباره تند به بالا بکشید. دیگر در سمت چپ پایین صفحه‌نمایش، دکمه نمای کلی ندارید."</string>
+    <string name="swipe_up_to_switch_apps_summary" msgid="4644068184114154787">"برای رفتن به یک برنامه دیگر، انگشتتان را روی دکمه اصلی به بالا تند بکشید. برای دیدن همه برنامه‌ها، انگشتتان را دوباره تند به‌بالا بکشید. دیگر در سمت چپ پایین صفحه‌نمایش، دکمه نمای کلی ندارید."</string>
     <string name="swipe_up_to_switch_apps_suggestion_title" msgid="7641846365137536128">"دکمه صفحه اصلی جدید را امتحان کنید"</string>
     <string name="swipe_up_to_switch_apps_suggestion_summary" msgid="7338653224520387852">"برای تغییر برنامه‌ها، اشاره جدید را روشن کنید"</string>
     <string name="ambient_display_title" product="default" msgid="6785677099744344088">"دو ضربه برای چک کردن تلفن"</string>
@@ -4137,9 +4137,9 @@
     <string name="ambient_display_tap_screen_summary" msgid="7869039870571925213">"برای بررسی زمان، اعلان‌ها و اطلاعات دیگر، روی صفحه‌نمایش ضربه بزنید."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="3676002930672489760">"تند کشیدن اثرانگشت برای اعلان‌ها"</string>
     <string name="fingerprint_gesture_screen_title" msgid="8638932855807473479">"تند کشیدن اثرانگشت"</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="4347999905190477310">"برای بررسی اعلان‌ها، انگشتتان را روی حسگر اثرانگشت (در پشت تلفن) تند به پایین بکشید."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="3480057984564476283">"برای بررسی اعلان‌ها، انگشتتان را روی حسگر اثرانگشت (در پشت رایانه لوحی) تند به پایین بکشید."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="7950264130913070035">"برای بررسی اعلان‌ها، انگشتتان را روی حسگر اثرانگشت (در پشت دستگاه) تند به پایین بکشید."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="4347999905190477310">"برای بررسی اعلان‌ها، انگشتتان را روی حسگر اثرانگشت (در پشت تلفن) تند به‌پایین بکشید."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="3480057984564476283">"برای بررسی اعلان‌ها، انگشتتان را روی حسگر اثرانگشت (در پشت رایانه لوحی) تند به‌پایین بکشید."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="7950264130913070035">"برای بررسی اعلان‌ها، انگشتتان را روی حسگر اثرانگشت (در پشت دستگاه) تند به‌پایین بکشید."</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="948946491233738823">"دیدن سریع اعلان‌ها"</string>
     <string name="gesture_setting_on" msgid="7573680730101327866">"روشن"</string>
     <string name="gesture_setting_off" msgid="2540159841716890511">"خاموش"</string>
@@ -4470,7 +4470,7 @@
     <string name="force_desktop_mode_summary" msgid="8865007610266954719">"اجرای اجباری حالت دسک‌تاپ آزمایشی در نمایشگرهای ثانوی"</string>
     <string name="hwui_force_dark_title" msgid="3744825212652331461">"لغو اجبار حالت تاریک"</string>
     <string name="hwui_force_dark_summary" msgid="2051891908674765817">"ویژگی اجبار حالت تاریک را برای همیشه روشن بودن لغو می‌کند"</string>
-    <string name="privacy_dashboard_title" msgid="8764930992456607513">"حریم خصوصی"</string>
+    <string name="privacy_dashboard_title" msgid="8764930992456607513">"حریم‌خصوصی"</string>
     <string name="privacy_dashboard_summary" msgid="7916431309860824945">"مجوزها، فعالیت حساب، داده‌های شخصی"</string>
     <string name="contextual_card_dismiss_remove" msgid="1750420285615827309">"حذف"</string>
     <string name="contextual_card_dismiss_keep" msgid="3204450672928193661">"حفظ شود"</string>
diff --git a/tests/CarDeveloperOptions/res/values-fi/strings.xml b/tests/CarDeveloperOptions/res/values-fi/strings.xml
index 6f55fcb..c583090 100644
--- a/tests/CarDeveloperOptions/res/values-fi/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-fi/strings.xml
@@ -26,7 +26,7 @@
       <item quantity="other">Enää <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> vaihetta, niin sinusta tulee kehittäjä.</item>
       <item quantity="one">Enää <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> vaihe, niin sinusta tulee kehittäjä.</item>
     </plurals>
-    <string name="show_dev_on" msgid="9075712234786224065">"Olet nyt kehittäjä!"</string>
+    <string name="show_dev_on" msgid="9075712234786224065">"Olet nyt kehittäjä."</string>
     <string name="show_dev_already" msgid="7665948832405148689">"Ei tarvitse klikata, olet jo kehittäjä."</string>
     <string name="dev_settings_disabled_warning" msgid="3198732189395396721">"Ota kehittäjäasetukset ensin käyttöön."</string>
     <string name="header_category_wireless_networks" msgid="8968405993937795898">"Langaton verkko ja verkot"</string>
@@ -180,7 +180,7 @@
     <string name="connected_device_saved_title" msgid="8270136893488475163">"Tallennetut laitteet"</string>
     <string name="connected_device_add_device_summary" msgid="7960491471270158891">"Bluetooth käynnistetään parinmuodostusta varten."</string>
     <string name="connected_device_connections_title" msgid="9205000271382018428">"Yhteysasetukset"</string>
-    <string name="connected_device_previously_connected_title" msgid="225918223397410428">"Aiemmin liitetyt laitteet"</string>
+    <string name="connected_device_previously_connected_title" msgid="225918223397410428">"Aiemmin yhdistetyt laitteet"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="2018789662358162716">"Aiemmin liitetyt"</string>
     <string name="connected_device_bluetooth_turned_on_toast" msgid="4652326177920814476">"Bluetooth käytössä"</string>
     <string name="previous_connected_see_all" msgid="7237095013087310923">"Näytä kaikki"</string>
@@ -814,8 +814,8 @@
     <string name="wifi_band_5ghz" msgid="6469832209748522207">"5 GHz"</string>
     <string name="wifi_sign_in_button_text" msgid="7573695522292386360">"Kirjaudu sisään"</string>
     <string name="wifi_tap_to_sign_in" msgid="1075925570550560453">"Napauta tästä kirjautuaksesi verkkoon"</string>
-    <string name="tx_link_speed" msgid="4557508597788146162">"<xliff:g id="TRANSMIT_LINK_SPEED">%1$d</xliff:g> Mt/s"</string>
-    <string name="rx_link_speed" msgid="3735337600274627581">"<xliff:g id="RECEIVE_LINK_SPEED">%1$d</xliff:g> Mt/s"</string>
+    <string name="tx_link_speed" msgid="4557508597788146162">"<xliff:g id="TRANSMIT_LINK_SPEED">%1$d</xliff:g> Mb/s"</string>
+    <string name="rx_link_speed" msgid="3735337600274627581">"<xliff:g id="RECEIVE_LINK_SPEED">%1$d</xliff:g> Mb/s"</string>
     <string name="wifi_ask_enable" msgid="925862998663619616">"<xliff:g id="REQUESTER">%s</xliff:g> haluaa ottaa Wi-Fin käyttöön."</string>
     <string name="wifi_ask_disable" msgid="2146839060110412974">"<xliff:g id="REQUESTER">%s</xliff:g> haluaa poistaa Wi-Fin käytöstä."</string>
     <string name="art_verifier_for_debuggable_title" msgid="5223835619409464642">"Vahvista korjattavien sovell. tavukoodi"</string>
@@ -1053,11 +1053,11 @@
     <string name="wifi_p2p_disconnect_title" msgid="915880461655863812">"Katkaistaanko yhteys?"</string>
     <string name="wifi_p2p_disconnect_message" msgid="3745286932812740784">"Jos katkaiset yhteyden, yhteys laitteeseen <xliff:g id="PEER_NAME">%1$s</xliff:g> katkaistaan."</string>
     <string name="wifi_p2p_disconnect_multiple_message" msgid="6051173422663731688">"Jos kosketat Katkaise yhteys, yhteys laitteeseen <xliff:g id="PEER_NAME">%1$s</xliff:g> ja <xliff:g id="PEER_COUNT">%2$s</xliff:g> muuhun laitteeseen katkaistaan."</string>
-    <string name="wifi_p2p_cancel_connect_title" msgid="2465200999145769427">"Peruutetaanko kutsu?"</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="2465200999145769427">"Perutaanko kutsu?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="3752679335020392154">"Haluatko peruuttaa laitteelle <xliff:g id="PEER_NAME">%1$s</xliff:g> lähetetyn yhteydenmuodostuskutsun?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="3206660449067701089">"Unohdetaanko tämä ryhmä?"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="12062341344410520">"Wi‑Fi-hotspot"</string>
-    <string name="wifi_hotspot_off_subtext" msgid="6177054857136221058">"Internetyhteyttä tai sisältöä ei jaeta muiden laitteiden kanssa."</string>
+    <string name="wifi_hotspot_off_subtext" msgid="6177054857136221058">"Internetyhteyttä tai sisältöä ei jaeta muille laitteille."</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="71421730039785897">"Tabletin internetyhteys jaetaan hotspotin kautta"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="8914285514605049879">"Puhelimen internetyhteys jaetaan hotspotin kautta"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="7415381343846704553">"Sovellus jakaa sisältöä – jos haluat jakaa internetyhteyden, sammuta hotspot ja käynnistä se uudelleen"</string>
@@ -1068,7 +1068,7 @@
     <string name="wifi_hotspot_password_title" msgid="4289338152595154889">"Hotspotin salasana"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="3485744480410441949">"AP-taajuus"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="3876006922622827363">"Hotspot-ominaisuudella voit luoda muille laitteillesi Wi-Fi-verkon. Ominaisuus jakaa internetyhteyden muille laitteille mobiilidatayhteydellä. Lisämaksuja mobiilidatan käytöstä voidaan periä."</string>
-    <string name="wifi_hotspot_footer_info_local_only" msgid="3339582350894639261">"Sovellukset voivat luoda hotspotin ja jakaa sisältöä lähellä olevien laitteiden kanssa."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="3339582350894639261">"Sovellukset voivat luoda hotspotin ja jakaa sisältöä lähellä oleville laitteille."</string>
     <string name="wifi_hotspot_auto_off_title" msgid="7416022590415189590">"Laita hotspot pois päältä automaattisesti"</string>
     <string name="wifi_hotspot_auto_off_summary" msgid="3866769400624802105">"Wi‑Fi-hotspot poistetaan käytöstä, jos laitteita ei ole yhdistetty."</string>
     <string name="wifi_tether_starting" msgid="7676952148471297900">"Otetaan yhteyspiste käyttöön..."</string>
@@ -1388,8 +1388,8 @@
     <string name="sd_mount_summary" product="default" msgid="6849124618494311233"></string>
     <string name="sd_format" product="nosdcard" msgid="918370986254863144">"Tyhjennä USB-tila"</string>
     <string name="sd_format" product="default" msgid="1346245995138883960">"Tyhjennä SD-kortti"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="1179857727779521920">"Poistaa kaikki sisäisen USB-tallennustilan tiedot, kuten musiikin tai valokuvat."</string>
-    <string name="sd_format_summary" product="default" msgid="4284028411908176234">"Poistaa kaikki SD-kortin tiedot, kuten musiikin ja valokuvat"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="1179857727779521920">"Poistaa kaikki sisäisen USB-tallennustilan tiedot, kuten musiikin tai kuvat."</string>
+    <string name="sd_format_summary" product="default" msgid="4284028411908176234">"Poistaa kaikki SD-kortin tiedot, kuten musiikin ja kuvat"</string>
     <string name="memory_clear_cache_title" msgid="4306793268129306684">"Tyhjennetäänkö välimuistitiedot?"</string>
     <string name="memory_clear_cache_message" msgid="6723120398411410031">"Sovellusten välimuistit tyhjennetään."</string>
     <string name="mtp_ptp_mode_summary" msgid="6074099855478444183">"MTP- tai PTP-toiminto on käytössä"</string>
@@ -1448,7 +1448,7 @@
     <string name="storage_internal_unmount_details" msgid="4667435317528624039"><b>"Kun tämä <xliff:g id="NAME_0">^1</xliff:g> poistetaan, siihen tallennetut sovellukset lakkaavat toimimasta eivätkä mediatiedostot ole käytettävissä ennen kuin se liitetään uudelleen."</b>" \n\n<xliff:g id="NAME_1">^1</xliff:g> on alustettu niin, että se toimii vain tämän laitteen kanssa."</string>
     <string name="storage_internal_forget_details" msgid="5655856574682184453">"Jos haluat käyttää tallennuslaitteen <xliff:g id="NAME">^1</xliff:g> sisältämiä sovelluksia, kuvia tai tietoja, liitä se uudelleen. \n\nVoit myös halutessasi unohtaa tämän tallennuslaitteen, jos se ei ole käytettävissä. \n\nJos päätät unohtaa laitteen, menetät kaikki sen sisältämät tiedot lopullisesti. \n\nVoit asentaa sovellukset uudelleen myöhemmin, mutta niiden laitteelle tallentamat tiedot menetetään."</string>
     <string name="storage_internal_forget_confirm_title" msgid="331032276130605241">"Unohdetaanko <xliff:g id="NAME">^1</xliff:g>?"</string>
-    <string name="storage_internal_forget_confirm" msgid="3052483375203727176">"Kaikki kohteen (<xliff:g id="NAME">^1</xliff:g>) sovellukset, valokuvat ja tiedot poistetaan pysyvästi."</string>
+    <string name="storage_internal_forget_confirm" msgid="3052483375203727176">"Kaikki kohteen (<xliff:g id="NAME">^1</xliff:g>) sovellukset, kuvat ja tiedot poistetaan pysyvästi."</string>
     <string name="storage_detail_apps" msgid="8154648512504196820">"Sovellukset"</string>
     <string name="storage_detail_images" msgid="6996202225684468964">"Kuvahaku"</string>
     <string name="storage_detail_videos" msgid="6030983354721080849">"Videot"</string>
@@ -1586,7 +1586,7 @@
     <string name="master_clear_title" msgid="1560712943955904673">"Poista kaikki tiedot (palauta tehdasasetukset)"</string>
     <string name="master_clear_short_title" msgid="919098101581335101">"Poista data (tehdasasetuksiin)"</string>
     <string name="master_clear_desc" product="tablet" msgid="3432373610755760899">"Tämä poistaa kaiken datan tabletin "<b>"sisäisestä tallennustilasta"</b>", esimerkiksi\n\n"<li>"Google-tilisi"</li>\n<li>"järjestelmän ja sovellusten datan ja asetukset"</li>\n<li>"ladatut sovellukset"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8765543541962866697">"Tämä poistaa kaiken datan puhelimen "<b>"sisäisestä tallennustilasta"</b>", esimerkiksi\n\n"<li>"Google-tilisi"</li>\n<li>"järjestelmän ja sovellusten datan ja asetukset"</li>\n<li>"ladatut sovellukset"</li></string>
+    <string name="master_clear_desc" product="default" msgid="8765543541962866697">"Tämä tyhjentää  kaiken datan puhelimen "<b>"sisäisestä tallennustilasta"</b>", esimerkiksi\n\n"<li>"Google-tilisi"</li>\n<li>"järjestelmän ja sovellusten datan ja asetukset"</li>\n<li>"ladatut sovellukset"</li></string>
     <string name="master_clear_accounts" product="default" msgid="3432884235445405376">\n\n"Olet kirjautunut sisään seuraaviin tileihin:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5993259656117566767">\n\n"Tällä laitteella on muita paikalla olevia käyttäjiä.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="3947303501615091903"><li>"Musiikki"</li>\n<li>"Valokuvat"</li>\n<li>"Muut käyttäjän tiedot"</li></string>
@@ -1596,10 +1596,10 @@
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="9003555775524798797">\n\n"Jos haluat poistaa musiikin, kuvat ja muut käyttäjän tiedot, "<b>"SD-kortti"</b>" tulee tyhjentää."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="8989746770347525207">"Tyhjennä USB-tallennustila"</string>
     <string name="erase_external_storage" product="default" msgid="194249742376770215">"Tyhjennä SD-kortti"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="8020275102431496261">"Poista kaikki sisäisen USB-tallennustilan tiedot, kuten musiikki tai valokuvat."</string>
-    <string name="erase_external_storage_description" product="default" msgid="5029355708082861798">"Poista kaikki SD-kortin tiedot, kuten musiikki tai valokuvat."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="8000547818499182920">"Pyyhi kaikki tiedot"</string>
-    <string name="master_clear_button_text" product="default" msgid="8000547818499182920">"Pyyhi kaikki tiedot"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="8020275102431496261">"Poista kaikki sisäisen USB-tallennustilan tiedot, kuten musiikki tai kuvat."</string>
+    <string name="erase_external_storage_description" product="default" msgid="5029355708082861798">"Poista kaikki SD-kortin tiedot, kuten musiikki tai kuvat."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="8000547818499182920">"Tyhjennä kaikki data"</string>
+    <string name="master_clear_button_text" product="default" msgid="8000547818499182920">"Tyhjennä kaikki data"</string>
     <string name="master_clear_final_desc" msgid="5189365498015339294">"Kaikki henkilökohtaiset tietosi ja ladatut sovellukset poistetaan. Toimintoa ei voi kumota."</string>
     <string name="master_clear_final_desc_esim" msgid="3058919823436953662">"Kaikki henkilökohtaiset tietosi poistetaan, mukaan lukien ladatut sovellukset ja SIM-kortit. Toimintoa ei voi kumota."</string>
     <string name="master_clear_final_button_text" msgid="866772743886027768">"Poista kaikki"</string>
@@ -1629,7 +1629,7 @@
     <string name="bluetooth_tethering_off_subtext_config" msgid="3981528184780083266">"<xliff:g id="DEVICE_NAME">%1$d</xliff:g> jakaa internetyhteyden Bluetoothilla"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="6946561351369376943">"Voidaan yhdistää korkeintaan <xliff:g id="MAXCONNECTION">%1$d</xliff:g> laitteeseen."</string>
     <string name="bluetooth_untether_blank" msgid="5428300773782256084">"Jaettu internetyhteys katkaistaan laitteesta <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="tethering_footer_info" msgid="8019555174339154124">"Hotspot- ja yhteyden jako ‑ominaisuuksien avulla voit jakaa internetyhteyden muille laitteille mobiilidatayhteydellä. Sovellukset voivat myös luoda hotspotin ja jakaa sisältöä lähellä olevien laitteiden kanssa."</string>
+    <string name="tethering_footer_info" msgid="8019555174339154124">"Hotspot- ja yhteyden jako ‑ominaisuuksien avulla voit jakaa internetyhteyden muille laitteille mobiilidatayhteydellä. Sovellukset voivat myös luoda hotspotin ja jakaa sisältöä lähellä oleville laitteille."</string>
     <string name="tethering_help_button_text" msgid="7653022000284543996">"Ohjeet"</string>
     <string name="network_settings_title" msgid="8516526011407061679">"Mobiiliverkko"</string>
     <string name="manage_mobile_plan_title" msgid="3312016665522553062">"Mobiilisopimus"</string>
@@ -1750,7 +1750,7 @@
     <string name="lock_settings_title" msgid="233657584969886812">"Laitteen suojaus"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="333149762562581510">"Vaihda lukituksenpoistokuvio"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="3435796032210265723">"Muuta lukituksen poistoon tarvittava PIN-koodi"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2262005028838969839">"Piirrä lukituksenpoistokuvio"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2262005028838969839">"Piirrä lukituksen avaava kuvio"</string>
     <string name="lockpattern_recording_intro_footer" msgid="5426745740754065099">"Saat ohjeita painamalla Valikko-painiketta."</string>
     <string name="lockpattern_recording_inprogress" msgid="4060818382176523671">"Nosta sormi, kun olet valmis"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="6374760294545431845">"Yhdistä vähintään <xliff:g id="NUMBER">%d</xliff:g> pistettä. Yritä uudelleen."</string>
@@ -1813,7 +1813,7 @@
     </plurals>
     <string name="clear_uri_btn_text" msgid="3528618179883855727">"Poista käyttöoikeus"</string>
     <string name="controls_label" msgid="5609285071259457221">"Hallinta"</string>
-    <string name="force_stop" msgid="9213858124674772386">"Pakota lopetus"</string>
+    <string name="force_stop" msgid="9213858124674772386">"Pakota sulkeutumaan"</string>
     <string name="total_size_label" msgid="3929917501176594692">"Yhteensä"</string>
     <string name="application_size_label" msgid="175357855490253032">"Sovelluksen koko"</string>
     <string name="external_code_size_label" msgid="3434421216268309411">"Sovelluksen käyttämä USB-tallennustila"</string>
@@ -1883,8 +1883,8 @@
     <string name="invalid_location" msgid="8057409982223429673">"Asennussijainti on virheellinen."</string>
     <string name="system_package" msgid="1824541892695233351">"Järjestelmäpäivityksiä ei voi asentaa ulkoiseen mediaan."</string>
     <string name="move_error_device_admin" msgid="6640501923867066901">"Laitteenhallintasovellusta ei voi asentaa ulkoiseen tallennustilaan."</string>
-    <string name="force_stop_dlg_title" msgid="8822779487097246675">"Pakotetaanko lopetus?"</string>
-    <string name="force_stop_dlg_text" msgid="7435245769456493398">"Jos pakotat sovelluksen pysähtymään, se saattaa alkaa toimia virheellisesti."</string>
+    <string name="force_stop_dlg_title" msgid="8822779487097246675">"Pakotetaanko sulkeutumaan?"</string>
+    <string name="force_stop_dlg_text" msgid="7435245769456493398">"Jos pakotat sovelluksen sulkeutumaan, se saattaa alkaa toimia virheellisesti."</string>
     <string name="app_install_location_title" msgid="5121617802063021720">"Ensisijainen asennussijainti"</string>
     <string name="app_install_location_summary" msgid="109719780117187797">"Vaihda uusien sovelluksien ensisijaista asennussijaintia."</string>
     <string name="app_disable_dlg_positive" msgid="5508828271100168073">"Poista sovellus käytöstä"</string>
@@ -2392,7 +2392,7 @@
     <string name="usage_type_total_battery_capacity" msgid="1954889791720119945">"Akun kokonaiskapasiteetti"</string>
     <string name="usage_type_computed_power" msgid="2594890316149868151">"Laskettu virrankäyttö"</string>
     <string name="usage_type_actual_power" msgid="8067253427718526111">"Havaittu virrankäyttö"</string>
-    <string name="battery_action_stop" msgid="1866624019460630143">"Pakota lopetus"</string>
+    <string name="battery_action_stop" msgid="1866624019460630143">"Pakota sulkeutumaan"</string>
     <string name="battery_action_app_details" msgid="1077011181969550402">"Sovelluksen tiedot"</string>
     <string name="battery_action_app_settings" msgid="587998773852488539">"Sovellusasetukset"</string>
     <string name="battery_action_display" msgid="4887913003634317465">"Ruudun asetukset"</string>
@@ -2563,7 +2563,7 @@
     <string name="backup_erase_dialog_title" msgid="8178424339104463014"></string>
     <string name="backup_erase_dialog_message" msgid="8767843355330070902">"Haluatko lopettaa Wi-Fi-salasanojen, kirjanmerkkien, muiden asetuksien ja sovellustietojen varmuuskopioinnin ja poistaa kaikki kopiot Googlen palvelimilta?"</string>
     <string name="fullbackup_erase_dialog_message" msgid="2588536036471144070">"Lopetetaanko laitteen tietojen (kuten Wi-Fi-salasanojen ja soittohistorian) ja sovellusten tietojen (kuten asetusten ja sovellusten tallentamien tiedostojen) automaattinen varmuuskopiointi? Myös vanhat varmuuskopiot poistetaan etäpalvelimilta."</string>
-    <string name="fullbackup_data_summary" msgid="406274198094268556">"Varmuuskopioi laitteen tiedot (kuten Wi-Fi-salasanat ja soittohistoria) sekä sovellusten tiedot (kuten asetukset ja sovellusten tallentamat tiedostot) automaattisesti etäyhteyden kautta.\n\nKun otat automaattisen varmuuskopioinnin käyttöön, laitteen ja sovellusten tiedot varmuuskopioidaan säännöllisesti etäyhteyden kautta. Sovellusten tietoihin voi sisältyä mitä tahansa tietoja, joita sovellukset ovat tallentaneet (kehittäjien asetuksien perusteella). Ne saattavat sisältää myös arkaluontoisia tietoja, kuten yhteystietoja, viestejä ja valokuvia."</string>
+    <string name="fullbackup_data_summary" msgid="406274198094268556">"Varmuuskopioi laitteen tiedot (kuten Wi-Fi-salasanat ja soittohistoria) sekä sovellusten tiedot (kuten asetukset ja sovellusten tallentamat tiedostot) automaattisesti etäyhteyden kautta.\n\nKun otat automaattisen varmuuskopioinnin käyttöön, laitteen ja sovellusten tiedot varmuuskopioidaan säännöllisesti etäyhteyden kautta. Sovellusten tietoihin voi sisältyä mitä tahansa tietoja, joita sovellukset ovat tallentaneet (kehittäjien asetuksien perusteella). Ne saattavat sisältää myös arkaluontoisia tietoja, kuten yhteystietoja, viestejä ja kuvia."</string>
     <string name="device_admin_settings_title" msgid="2074319456047334589">"Laitteenhallinnan asetukset"</string>
     <string name="active_device_admin_msg" msgid="6929247869516924549">"Laitteenhallintasovellus"</string>
     <string name="remove_device_admin" msgid="4413438593788336400">"Poista laitteenhallintasovellus käytöstä"</string>
@@ -2629,9 +2629,9 @@
     <string name="remove_account_label" msgid="5885425720323823387">"Poista tili"</string>
     <string name="header_add_an_account" msgid="8482614556580804956">"Lisää tili"</string>
     <string name="really_remove_account_title" msgid="4166512362915154319">"Poistetaanko tili?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Poistamalla tämän tilin poistat kaikki sen viestit, yhteystiedot ja muut tiedot tabletista."</string>
-    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Poistamalla tämän tilin poistat kaikki sen viestit, yhteystiedot ja muut tiedot puhelimesta."</string>
-    <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Poistamalla tämän tilin poistat kaikki sen viestit, yhteystiedot ja muut tiedot laitteelta."</string>
+    <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Jos poistat tämän tilin, myös kaikki sen viestit, yhteystiedot ja muut tiedot poistetaan tabletilta."</string>
+    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Jos poistat tämän tilin, myös kaikki sen viestit, yhteystiedot ja muut tiedot poistetaan puhelimelta."</string>
+    <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Jos poistat tämän tilin, myös kaikki sen viestit, yhteystiedot ja muut tiedot poistetaan laitteelta."</string>
     <string name="remove_account_failed" msgid="491458185327106966">"Järjestelmänvalvoja ei salli tätä muutosta."</string>
     <string name="cant_sync_dialog_title" msgid="5483419398223189881">"Manuaalinen synkronointi epäonnistui"</string>
     <string name="cant_sync_dialog_message" msgid="3467126947262857534">"Tämän kohteen synkronointi on tällä hetkellä pois käytöstä. Voit muuttaa asetuksia ottamalla taustatiedonsiirron ja automaattisen synkronoinnin väliaikaisesti käyttöön."</string>
@@ -2870,7 +2870,7 @@
     <string name="user_add_user_item_title" msgid="6835385073795492410">"Käyttäjä"</string>
     <string name="user_add_profile_item_title" msgid="4932743891449790664">"Rajoitettu profiili"</string>
     <string name="user_add_user_title" msgid="2320897397066676472">"Lisätäänkö uusi käyttäjä?"</string>
-    <string name="user_add_user_message_long" msgid="686637203224195465">"Voit jakaa tämän laitteen muiden kanssa luomalla lisää käyttäjiä. Kullakin käyttäjällä on oma tilansa, jota he voivat muokata esimerkiksi omilla sovelluksilla ja taustakuvilla. Käyttäjät voivat myös muokata laiteasetuksia, kuten Wi‑Fi-asetuksia, jotka vaikuttavat laitteen kaikkiin käyttäjiin.\n\nKun lisäät uuden käyttäjän, hänen tulee määrittää oman tilansa asetukset.\n\nKaikki käyttäjät voivat päivittää muiden käyttäjien sovelluksia. Esteettömyysominaisuuksia tai ‑palveluita ei välttämättä siirretä uudelle käyttäjälle."</string>
+    <string name="user_add_user_message_long" msgid="686637203224195465">"Voit jakaa tämän laitteen muiden kanssa luomalla lisää käyttäjiä. Kullakin käyttäjällä on oma tilansa, jota he voivat muokata esimerkiksi omilla sovelluksilla ja taustakuvilla. Käyttäjät voivat myös muokata laiteasetuksia, kuten Wi‑Fi-asetuksia, jotka vaikuttavat laitteen kaikkiin käyttäjiin.\n\nKun lisäät uuden käyttäjän, hänen tulee määrittää oman tilansa asetukset.\n\nKaikki käyttäjät voivat päivittää sovelluksia muille käyttäjille. Esteettömyysominaisuuksia tai ‑palveluita ei välttämättä siirretä uudelle käyttäjälle."</string>
     <string name="user_add_user_message_short" msgid="1802594476285458254">"Kun lisäät uuden käyttäjän, hänen tulee määrittää oman tilansa asetukset.\n\nKaikki käyttäjät voivat päivittää sovelluksia muille käyttäjille."</string>
     <string name="user_setup_dialog_title" msgid="6748950002206392396">"Lisätäänkö käyttäjä nyt?"</string>
     <string name="user_setup_dialog_message" msgid="2988559933258353919">"Varmista, että käyttäjä voi ottaa laitteen nyt ja määrittää oman tilansa."</string>
@@ -2983,7 +2983,7 @@
     <string name="wizard_finish" msgid="3742102879981212094">"Valmis"</string>
     <string name="user_image_take_photo" msgid="2000247510236178111">"Ota kuva"</string>
     <string name="user_image_choose_photo" msgid="4920315415203051898">"Valitse kuva"</string>
-    <string name="user_image_photo_selector" msgid="8429694590849882411">"Valitse valokuva"</string>
+    <string name="user_image_photo_selector" msgid="8429694590849882411">"Valitse kuva"</string>
     <string name="regulatory_info_text" msgid="9112993912873512834"></string>
     <string name="sim_setup_wizard_title" msgid="77627575294867180">"SIM-kortit"</string>
     <string name="sim_settings_title" msgid="8818243954752261922">"SIM-kortit"</string>
@@ -3044,7 +3044,7 @@
     <string name="app_and_notification_dashboard_summary" msgid="4165181440955038145">"Assistant, viimeaikaiset sovellukset, oletussovellukset"</string>
     <string name="notification_settings_work_profile" msgid="7190550347842400029">"Työprofiilin sovelluksilla ei voi olla ilmoitusten käyttöoikeuksia."</string>
     <string name="account_dashboard_title" msgid="4734300939532555885">"Tilit"</string>
-    <string name="account_dashboard_default_summary" msgid="6822549669771936206">"Tilejä ei lisätty"</string>
+    <string name="account_dashboard_default_summary" msgid="6822549669771936206">"Tilejä ei ole lisätty"</string>
     <string name="app_default_dashboard_title" msgid="6575301028225232193">"Oletussovellukset"</string>
     <string name="system_dashboard_summary" msgid="6582464466735779394">"Kielet, eleet, aika, varmuuskopiointi"</string>
     <string name="search_results_title" msgid="4160717656435503940">"Asetukset"</string>
@@ -3332,7 +3332,7 @@
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="4043621508889929254">"Profiilin ilmoitukset"</string>
     <string name="notifications_title" msgid="8334011924253810654">"Ilmoitukset"</string>
     <string name="app_notifications_title" msgid="1141791221581312325">"Sovellusilmoitukset"</string>
-    <string name="notification_channel_title" msgid="6637705960909690229">"Ilmoituksen luokka"</string>
+    <string name="notification_channel_title" msgid="6637705960909690229">"Ilmoituskategoria"</string>
     <string name="notification_group_title" msgid="6105337987437608590">"Ilmoitusluokka"</string>
     <string name="notification_importance_title" msgid="4131979083408000545">"Käyttäytyminen"</string>
     <string name="notification_importance_unspecified" msgid="2515778981253707724">"Salli ääni"</string>
@@ -3732,7 +3732,7 @@
     <string name="usb_use_file_transfers" msgid="6153021302176151884">"Tiedostonsiirto"</string>
     <string name="usb_use_file_transfers_desc" msgid="6953866660041189580">"Siirrä tiedostoja toiselle laitteelle."</string>
     <string name="usb_use_photo_transfers" msgid="5974236250197451257">"PTP"</string>
-    <string name="usb_use_photo_transfers_desc" msgid="2325112887316125320">"Siirrä valokuvia tai tiedostoja, jos MTP:tä ei tueta (PTP)."</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2325112887316125320">"Siirrä kuvia tai tiedostoja, jos MTP:tä ei tueta (PTP)."</string>
     <string name="usb_use_tethering" msgid="4250626730173163846">"Internetin jakaminen USB:n kautta"</string>
     <string name="usb_use_MIDI" msgid="4710632870781041401">"MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="1770966187150010947">"Käytä tätä laitetta MIDI-tilassa."</string>
@@ -3789,7 +3789,7 @@
     <string name="zen_access_warning_dialog_title" msgid="7704910289810337055">"Myönnetäänkö Älä häiritse -tilan käyttöoikeus sovellukselle <xliff:g id="APP">%1$s</xliff:g>?"</string>
     <string name="zen_access_warning_dialog_summary" msgid="2717755746850874577">"Sovellus voi ottaa Älä häiritse -tilan käyttöön tai poistaa sen käytöstä sekä muokata siihen liittyviä asetuksia."</string>
     <string name="zen_access_disabled_package_warning" msgid="7086237569177576966">"Tämän täytyy olla käytössä, sillä ilmoitusten käyttöoikeus on myönnetty."</string>
-    <string name="zen_access_revoke_warning_dialog_title" msgid="6850994585577513299">"Peruutetaanko sovellukselta <xliff:g id="APP">%1$s</xliff:g> Älä häiritse -tilan käyttöoikeus?"</string>
+    <string name="zen_access_revoke_warning_dialog_title" msgid="6850994585577513299">"Perutaanko sovellukselta <xliff:g id="APP">%1$s</xliff:g> Älä häiritse -tilan käyttöoikeus?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="3487422193181311403">"Kaikki tämän sovelluksen luomat Älä häiritse -säännöt poistetaan."</string>
     <string name="ignore_optimizations_on" msgid="4373971641328943551">"Älä optimoi"</string>
     <string name="ignore_optimizations_off" msgid="4372289432580282870">"Optimoi"</string>
@@ -4163,7 +4163,7 @@
     <string name="auto_sync_account_summary" msgid="6316230976974033772">"Salli sovellusten päivittää tietoja automaattisesti"</string>
     <string name="account_sync_title" msgid="1570164819114297154">"Tilin synkronointi"</string>
     <string name="account_sync_summary_some_on" msgid="1934556869158274053">"Synkronointi käytössä <xliff:g id="ID_1">%1$d</xliff:g>/<xliff:g id="ID_2">%2$d</xliff:g> kohteella"</string>
-    <string name="account_sync_summary_all_on" msgid="3634161204232431700">"Synkronointi käytössä kaikilla kohteilla"</string>
+    <string name="account_sync_summary_all_on" msgid="3634161204232431700">"Synkronointi käytössä kaikille kohteille"</string>
     <string name="account_sync_summary_all_off" msgid="1971584632343645602">"Synkronointi pois käytöstä kaikilla kohteilla"</string>
     <string name="enterprise_privacy_settings" msgid="2777101678653072889">"Hallinnoidun laitteen tiedot"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5557859169062703683">"Organisaatiosi hallitsemat valinnat ja asetukset"</string>
diff --git a/tests/CarDeveloperOptions/res/values-fr-rCA/strings.xml b/tests/CarDeveloperOptions/res/values-fr-rCA/strings.xml
index cb1dfc3..1ddb3f6 100644
--- a/tests/CarDeveloperOptions/res/values-fr-rCA/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-fr-rCA/strings.xml
@@ -300,7 +300,7 @@
     <string name="settings_label" msgid="7263237773415875813">"Paramètres"</string>
     <string name="settings_label_launcher" msgid="500627679902923496">"Paramètres"</string>
     <string name="settings_shortcut" msgid="4503714880251502167">"Raccourci vers les paramètres"</string>
-    <string name="airplane_mode" msgid="4508870277398231073">"Mode avion"</string>
+    <string name="airplane_mode" msgid="4508870277398231073">"Mode Avion"</string>
     <string name="wireless_networks_settings_title" msgid="4298430520189173949">"Sans fil et réseaux"</string>
     <string name="radio_controls_summary" msgid="4596981962167684814">"Gérer le Wi-Fi, le Bluetooth, le mode Avion, les réseaux mobiles et les RPV"</string>
     <string name="cellular_data_title" msgid="7909624119432695022">"Données cellulaires"</string>
@@ -508,8 +508,8 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="2292129135369853167">"Chiffrer la tablette"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="3110852053238357832">"Chiffrer le téléphone"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="2438498691741626642">"Chiffré"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="9142792050252407734">"Vous pouvez chiffrer vos comptes, vos paramètres, les applications téléchargées et les données associées, les contenus multimédias et d\'autres fichiers. Si vous avez chiffré votre tablette en définissant un verrouillage d\'écran (au moyen d\'un schéma, d\'un NIP ou d\'un mot de passe), vous devez déverrouiller l\'écran pour déchiffrer la tablette à chaque fois que vous l\'allumez. La seule autre manière de déchiffrer cette dernière consiste à rétablir la configuration d\'usine, ce qui entraîne la suppression de l\'ensemble de vos données.\n\nLa procédure de chiffrement dure au moins une heure. La pile de la tablette doit être chargée au départ, et la tablette doit rester branchée pendant tout le processus. Toute interruption entraîne la perte d\'une partie ou de la totalité des données."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="1996334685607444282">"Vous pouvez chiffrer vos comptes, vos paramètres, les applications téléchargées et les données associées, les contenus multimédias et d\'autres fichiers. Si vous avez chiffré votre téléphone en définissant un verrouillage d\'écran (au moyen d\'un schéma, d\'un NIP ou d\'un mot de passe), vous devez déverrouiller l\'écran pour déchiffrer le téléphone à chaque fois que vous l\'allumez. La seule autre manière de déchiffrer ce dernier consiste à rétablir la configuration d\'usine, ce qui entraîne la suppression de l\'ensemble de vos données.\n\nLa procédure de chiffrement dure au moins une heure. La pile du téléphone doit être chargée au départ, et le téléphone doit rester branché pendant tout le processus. Toute interruption entraîne la perte d\'une partie ou de la totalité des données."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="9142792050252407734">"Vous pouvez chiffrer vos comptes, vos paramètres, les applications téléchargées et les données associées, les contenus multimédias et d\'autres fichiers. Si vous avez chiffré votre tablette en définissant un verrouillage d\'écran (au moyen d\'un schéma, d\'un NIP ou d\'un mot de passe), vous devez déverrouiller l\'écran pour déchiffrer la tablette à chaque fois que vous l\'allumez. La seule autre manière de déchiffrer cette dernière consiste à rétablir les paramètres par défaut, ce qui entraîne la suppression de l\'ensemble de vos données.\n\nLa procédure de chiffrement dure au moins une heure. La pile de la tablette doit être chargée au départ, et la tablette doit rester branchée pendant tout le processus. Toute interruption entraîne la perte d\'une partie ou de la totalité des données."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="1996334685607444282">"Vous pouvez chiffrer vos comptes, vos paramètres, les applications téléchargées et les données associées, les contenus multimédias et d\'autres fichiers. Si vous avez chiffré votre téléphone en définissant un verrouillage d\'écran (au moyen d\'un schéma, d\'un NIP ou d\'un mot de passe), vous devez déverrouiller l\'écran pour déchiffrer le téléphone à chaque fois que vous l\'allumez. La seule autre manière de déchiffrer ce dernier consiste à rétablir les paramètres par défaut, ce qui entraîne la suppression de l\'ensemble de vos données.\n\nLa procédure de chiffrement dure au moins une heure. La pile du téléphone doit être chargée au départ, et le téléphone doit rester branché pendant tout le processus. Toute interruption entraîne la perte d\'une partie ou de la totalité des données."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="7918671468758813824">"Chiffrer la tablette"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="8737394386627318489">"Chiffrer le téléphone"</string>
     <string name="crypt_keeper_low_charge_text" msgid="1422879728632636311">"Veuillez charger votre batterie, puis réessayer."</string>
@@ -529,11 +529,11 @@
     <string name="crypt_keeper_warn_wipe" msgid="700814581500057050">"Attention : Les données de votre appareil seront effacées si vous effectuez encore <xliff:g id="COUNT">^1</xliff:g> tentatives de déverrouillage infructueuses."</string>
     <string name="crypt_keeper_enter_password" msgid="726933635335219421">"Saisissez votre mot de passe."</string>
     <string name="crypt_keeper_failed_title" msgid="1906382607060855782">"Échec du chiffrement"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="7844833877734529625">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre tablette ne sont plus accessibles.\n\nPour continuer d\'utiliser votre tablette, vous devez rétablir la configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre tablette."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="2895589681839090312">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre téléphone ne sont plus accessibles.\n\nPour continuer d\'utiliser votre téléphone, vous devez rétablir la configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre téléphone."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="7844833877734529625">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre tablette ne sont plus accessibles.\n\nPour continuer d\'utiliser votre tablette, vous devez rétablir les paramètres par défaut. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre tablette."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="2895589681839090312">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre téléphone ne sont plus accessibles.\n\nPour continuer d\'utiliser votre téléphone, vous devez rétablir ses paramètres par défaut. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre téléphone."</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="6561535293845985713">"Échec du déchiffrement"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="7018748502706237323">"Le mot de passe entré est correct. Malheureusement, vos données sont corrompues.\n\nPour continuer d\'utiliser votre tablette, vous devez rétablir sa configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données que vous aviez sauvegardées dans votre compte Google lors de la nouvelle configuration de votre tablette."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="5798580588985326937">"Le mot de passe entré est correct. Malheureusement, vos données sont corrompues.\n\nPour continuer d\'utiliser votre téléphone, vous devez rétablir sa configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données que vous aviez sauvegardées dans votre compte Google lors de la nouvelle configuration de votre téléphone."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="7018748502706237323">"Le mot de passe entré est correct. Malheureusement, vos données sont corrompues.\n\nPour continuer d\'utiliser votre tablette, vous devez rétablir ses paramètres par défaut. Une fois cette opération terminée, vous pourrez restaurer toutes les données que vous aviez sauvegardées dans votre compte Google lors de la nouvelle configuration de votre tablette."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="5798580588985326937">"Le mot de passe entré est correct. Malheureusement, vos données sont corrompues.\n\nPour continuer d\'utiliser votre téléphone, vous devez rétablir ses paramètres par défaut. Une fois cette opération terminée, vous pourrez restaurer toutes les données que vous aviez sauvegardées dans votre compte Google lors de la nouvelle configuration de votre téléphone."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4744137470890459582">"Changer le mode de saisie"</string>
     <string name="suggested_lock_settings_title" msgid="1518155558803371661">"Sécurisez votre téléphone"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="1861066918594412519">"Définir un verr. de l\'écran pour protéger la tablette"</string>
@@ -763,7 +763,7 @@
     <string name="bluetooth_device_context_unpair" msgid="250588431708253041">"Dissocier"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="4519151805677280077">"Déconnecter et dissocier"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="423463405499392444">"Options…"</string>
-    <string name="bluetooth_menu_advanced" msgid="7566858513372603652">"Options avancées"</string>
+    <string name="bluetooth_menu_advanced" msgid="7566858513372603652">"Paramètres avancés"</string>
     <string name="bluetooth_advanced_titlebar" msgid="6459469494039004784">"Paramètres Bluetooth avancés"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6255367297830430459">"Si la fonctionnalité Bluetooth est activée, l\'appareil peut communiquer avec les autres appareils Bluetooth à proximité."</string>
     <string name="bluetooth_scanning_on_info_message" msgid="5460370815156050550">"Lorsque le Bluetooth est activé, votre appareil peut communiquer avec d\'autres appareils Bluetooth à proximité.\n\nPour améliorer l\'expérience d\'utilisation de l\'appareil, les applications et les services peuvent continuer de rechercher les appareils à proximité à tout moment, même si le Bluetooth est désactivé. Cette autorisation peut permettre, par exemple, d\'améliorer les fonctionnalités et les services basés sur la localisation. Vous pouvez modifier cette option dans les "<annotation id="link">"paramètres de recherche"</annotation>"."</string>
@@ -882,7 +882,7 @@
     <string name="wifi_menu_more_options" msgid="8318269834264035524">"Plus d\'options"</string>
     <string name="wifi_menu_p2p" msgid="4945665601551289791">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="9082691677803181629">"Scanner"</string>
-    <string name="wifi_menu_advanced" msgid="5984484498045511072">"Options avancées"</string>
+    <string name="wifi_menu_advanced" msgid="5984484498045511072">"Paramètres avancés"</string>
     <string name="wifi_menu_configure" msgid="52192491120701266">"Configurer"</string>
     <string name="wifi_menu_connect" msgid="3984327567173931219">"Se connecter au réseau"</string>
     <string name="wifi_menu_remember" msgid="717257200269700641">"Mémoriser ce réseau"</string>
@@ -1605,7 +1605,7 @@
     <string name="master_clear_final_button_text" msgid="866772743886027768">"Tout effacer"</string>
     <string name="master_clear_failed" msgid="7588397453984229892">"Les données n\'ont pas été réinitialisées, car le service de nettoyage du système n\'est pas disponible."</string>
     <string name="master_clear_confirm_title" msgid="698328669893512402">"Effacer toutes les données?"</string>
-    <string name="master_clear_not_available" msgid="4676613348163652454">"Le rétablissement de la configuration d\'usine n\'est pas possible pour cet utilisateur"</string>
+    <string name="master_clear_not_available" msgid="4676613348163652454">"Le rétablissement des paramètres par défaut n\'est pas possible pour cet utilisateur"</string>
     <string name="master_clear_progress_title" msgid="378953167274114857">"Suppression en cours..."</string>
     <string name="master_clear_progress_text" msgid="5418958116008976218">"Veuillez patienter..."</string>
     <string name="call_settings_title" msgid="5033906789261282752">"Paramètres d\'appel"</string>
@@ -1738,9 +1738,9 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="6861154706098327320">"Pour plus de sécurité, tracez votre schéma professionnel"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="6306902249365524526">"Pour plus de sécurité, entrez votre NIP professionnel"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="2917338218971012776">"Pour plus de sécurité, entrez votre mot de passe professionnel"</string>
-    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="1085862410379709928">"La configuration d\'usine du téléphone a été rétablie. Pour l\'utiliser, entrez le schéma précédent."</string>
-    <string name="lockpassword_confirm_your_pin_details_frp" msgid="6849889353126558761">"La configuration d\'usine du téléphone a été rétablie. Pour l\'utiliser, entrez le NIP précédent."</string>
-    <string name="lockpassword_confirm_your_password_details_frp" msgid="3239944795659418737">"La configuration d\'usine du téléphone a été rétablie. Pour l\'utiliser, entrez le mot passe précédent."</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="1085862410379709928">"Les paramètres par défaut du téléphone ont été rétablis. Pour l\'utiliser, entrez le schéma précédent."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="6849889353126558761">"Les paramètres par défaut du téléphone ont été rétablis. Pour l\'utiliser, entrez le NIP précédent."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="3239944795659418737">"Paramètres par défaut du téléphone rétablis. Pour l\'utiliser, entrez le mot de passe précédent."</string>
     <string name="lockpassword_confirm_your_pattern_header_frp" msgid="3290569334665839860">"Vérifier le schéma"</string>
     <string name="lockpassword_confirm_your_pin_header_frp" msgid="8520474869079710782">"Vérifier le NIP"</string>
     <string name="lockpassword_confirm_your_password_header_frp" msgid="7326670978891793470">"Vérifier le mot de passe"</string>
@@ -1798,7 +1798,7 @@
     <string name="install_all_warning" product="device" msgid="9141585291103603515">"Votre appareil et vos données personnelles sont plus vulnérables aux attaques provenant d\'applications inconnues. En installant des applications provenant de cette source, vous acceptez d\'être responsable de tout dommage causé à votre appareil ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
     <string name="advanced_settings" msgid="6282069364060968122">"Paramètres avancés"</string>
     <string name="advanced_settings_summary" msgid="5912237062506771716">"Activer d\'autres paramètres"</string>
-    <string name="application_info_label" msgid="3886253474964599105">"Infos sur les applis"</string>
+    <string name="application_info_label" msgid="3886253474964599105">"Détails de l\'application"</string>
     <string name="storage_label" msgid="1109537840103290384">"Stockage"</string>
     <string name="auto_launch_label" msgid="47089737922907379">"Ouvert par défaut"</string>
     <string name="auto_launch_label_generic" msgid="7865828543459493308">"Valeurs par défaut"</string>
@@ -1825,7 +1825,7 @@
     <string name="install_text" msgid="2798092278891807849">"Installer"</string>
     <string name="disable_text" msgid="5065834603951474397">"Désactiver"</string>
     <string name="enable_text" msgid="7179141636849225884">"Activer"</string>
-    <string name="clear_user_data_text" msgid="8894073247302821764">"Effacer le stockage"</string>
+    <string name="clear_user_data_text" msgid="8894073247302821764">"Effacer l\'espace de stockage"</string>
     <string name="app_factory_reset" msgid="8718986000278776272">"Désinstaller mises à jour"</string>
     <string name="auto_launch_enable_text" msgid="3372898942144027341">"Vous avez choisi de lancer cette application par défaut pour certaines actions."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2286211654774611037">"Vous avez choisi de permettre à cette application de créer des widgets et d\'accéder à leurs données."</string>
@@ -2533,7 +2533,7 @@
     <string name="trusted_credentials_summary" msgid="7411781319056251582">"Afficher les certificats d\'autorité de confiance"</string>
     <string name="user_credentials" msgid="8365731467650306757">"Authentifiants d\'utilisateur"</string>
     <string name="user_credentials_summary" msgid="7350223899317423252">"Afficher et modifier les authentifiants stockés"</string>
-    <string name="advanced_security_title" msgid="286883005673855845">"Avancés"</string>
+    <string name="advanced_security_title" msgid="286883005673855845">"Paramètres avancés"</string>
     <string name="credential_storage_type" msgid="2585337320206095255">"Type de stockage"</string>
     <string name="credential_storage_type_hardware" msgid="5054143224259023600">"Intégré au matériel"</string>
     <string name="credential_storage_type_software" msgid="1335905150062717150">"Uniquement logiciel"</string>
@@ -2619,7 +2619,7 @@
     <string name="sync_one_time_sync" msgid="6005174168405784256">"Touchez ici pour lancer la synchronisation<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">"# CALENDAR:"</string>
+    <string name="sync_calendar" msgid="6573708019827519372">"Agenda"</string>
     <string name="sync_contacts" msgid="5687434785723746534">"Contacts"</string>
     <string name="sync_plug" msgid="6703804441408427257"><font fgcolor="#ffffffff">"Bienvenue sur Google Sync!"</font>\n"Une solution Google pour synchroniser vos données et vous permettre d\'accéder à vos contacts, vos rendez-vous et plus, où que vous soyez."</string>
     <string name="header_application_sync_settings" msgid="4581847153669774489">"Paramètres de synchronisation de l\'application"</string>
@@ -3238,7 +3238,7 @@
     <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="5103454923160912313">"Le mode Ne pas déranger a été activé par une application (<xliff:g id="APP_NAME">%s</xliff:g>)"</string>
     <string name="zen_mode_settings_dnd_custom_settings_footer" msgid="6335108298640066560">"Le mode Ne pas déranger est activé <xliff:g id="RULE_NAMES">%s</xliff:g>, avec des paramètres personnalisés."</string>
     <string name="zen_mode_settings_dnd_custom_settings_footer_link" msgid="4007974052885089379"><annotation id="link">" Afficher les paramètres personnalisés"</annotation></string>
-    <string name="zen_interruption_level_priority" msgid="9178419297408319234">"Priorités seulement"</string>
+    <string name="zen_interruption_level_priority" msgid="9178419297408319234">"Prioritaires seulement"</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">"Activé/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_off_with_info" msgid="3910718455243440265">"Désactivé : <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -4518,7 +4518,7 @@
     <string name="error_capturing_system_heap_dump_message" msgid="5431592130805893098">"Impossible de capturer l\'empreinte de mémoire du système"</string>
     <string name="automatic_system_heap_dump_title" msgid="2153897396923488317">"Capturer automatiquement les empreintes de mémoire système"</string>
     <string name="automatic_system_heap_dump_summary" msgid="4962129546638974661">"Capturer automatiquement une empreinte de mémoire pour le système Android lorsqu\'il utilise trop de mémoire"</string>
-    <string name="wifi_disconnect_button_text" msgid="787688024070426706">"Déconnexion"</string>
+    <string name="wifi_disconnect_button_text" msgid="787688024070426706">"Déconnecter"</string>
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="26884532087670844">"Appels d\'urgence"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="8726152486964822599">"Votre fournisseur de services ne prend pas en charge les appels Wi‑Fi.\nL\'appareil basculera automatiquement vers le réseau cellulaire pour faire un appel urgence.\nLes appels d\'urgence sont uniquement possibles dans les régions couvertes par un réseau cellulaire."</string>
 </resources>
diff --git a/tests/CarDeveloperOptions/res/values-fr/strings.xml b/tests/CarDeveloperOptions/res/values-fr/strings.xml
index 2d4038f..7bf2782 100644
--- a/tests/CarDeveloperOptions/res/values-fr/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-fr/strings.xml
@@ -2113,7 +2113,7 @@
     <string name="accessibility_summary_state_disabled" msgid="9197369047683087620">"Désactivé"</string>
     <string name="accessibility_summary_state_stopped" msgid="3170264683616172746">"Ce service ne fonctionne pas. Appuyez ici pour en savoir plus."</string>
     <string name="accessibility_description_state_stopped" msgid="7666178628053039493">"Ce service ne fonctionne pas."</string>
-    <string name="enable_quick_setting" msgid="1580451877998661255">"Afficher dans la fenêtre de configuration rapide"</string>
+    <string name="enable_quick_setting" msgid="1580451877998661255">"Afficher dans les Réglages rapides"</string>
     <string name="daltonizer_type" msgid="6890356081036026791">"Mode de correction"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="3810676455925024813">
       <item quantity="one">Délai extrêmement court (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
@@ -2491,7 +2491,7 @@
     <string name="menu_duration_6h" msgid="6169009210638008417">"6 heures"</string>
     <string name="menu_duration_12h" msgid="1435242738163843797">"12 heures"</string>
     <string name="menu_duration_1d" msgid="6476370834372352174">"1 jour"</string>
-    <string name="menu_show_system" msgid="6315865548558708248">"Afficher les processus système"</string>
+    <string name="menu_show_system" msgid="6315865548558708248">"Afficher process. système"</string>
     <string name="menu_hide_system" msgid="8457027118873733782">"Masquer les processus système"</string>
     <string name="menu_show_percentage" msgid="6983272380729890884">"Afficher les pourcentages"</string>
     <string name="menu_use_uss" msgid="3765054705208926803">"Utiliser l\'USS"</string>
@@ -3731,7 +3731,7 @@
     <string name="usb_use_power_only" msgid="6595783381323810697">"Recharger l\'appareil connecté"</string>
     <string name="usb_use_file_transfers" msgid="6153021302176151884">"Transfert de fichiers"</string>
     <string name="usb_use_file_transfers_desc" msgid="6953866660041189580">"Transférer des fichiers vers un autre appareil"</string>
-    <string name="usb_use_photo_transfers" msgid="5974236250197451257">"PTP"</string>
+    <string name="usb_use_photo_transfers" msgid="5974236250197451257">"Transfert de photos (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2325112887316125320">"Transférer des photos ou des fichiers si MTP n\'est pas compatible (PTP)"</string>
     <string name="usb_use_tethering" msgid="4250626730173163846">"Partage de connexion via USB"</string>
     <string name="usb_use_MIDI" msgid="4710632870781041401">"Mode MIDI"</string>
@@ -3741,7 +3741,7 @@
     <string name="usb_default_info" msgid="953775292571786528">"Ces paramètres sont appliqués lorsqu\'un autre appareil est connecté et que votre téléphone est déverrouillé. Connectez-vous uniquement à des appareils vérifiés."</string>
     <string name="usb_pref" msgid="6194821550693495068">"USB"</string>
     <string name="usb_preference" msgid="7092987095048592826">"Préférences USB"</string>
-    <string name="usb_control_title" msgid="2379698856760894768">"USB contrôlé par"</string>
+    <string name="usb_control_title" msgid="2379698856760894768">"Connexion USB contrôlée par"</string>
     <string name="usb_control_host" msgid="193292043691034178">"Appareil connecté"</string>
     <string name="usb_control_device" msgid="9154790265254725254">"Cet appareil"</string>
     <string name="usb_switching" msgid="1230386065163529904">"Changement…"</string>
@@ -4078,7 +4078,7 @@
     <string name="dark_ui_mode_title" msgid="8774932716427742413">"Sélectionner un thème"</string>
     <string name="dark_ui_settings_light_summary" msgid="5219102347744462812">"Ce paramètre s\'applique aussi aux applications"</string>
     <string name="dark_ui_settings_dark_summary" msgid="7042737828943784289">"Le thème sombre s\'appliquera également aux applications compatibles."</string>
-    <string name="quick_settings_developer_tiles" msgid="7423485925757678719">"Tuiles de configuration rapide pour les développeurs"</string>
+    <string name="quick_settings_developer_tiles" msgid="7423485925757678719">"Blocs Réglages rapides pour les développeurs"</string>
     <string name="winscope_trace_quick_settings_title" msgid="940971040388411374">"Trace Winscope"</string>
     <string name="sensors_off_quick_settings_title" msgid="3655699045300438902">"Capteurs désactivés"</string>
     <string name="managed_profile_settings_title" msgid="4340409321523532402">"Paramètres du profil professionnel"</string>
diff --git a/tests/CarDeveloperOptions/res/values-gl/strings.xml b/tests/CarDeveloperOptions/res/values-gl/strings.xml
index 689e268..134abfa 100644
--- a/tests/CarDeveloperOptions/res/values-gl/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-gl/strings.xml
@@ -1185,7 +1185,7 @@
     <string name="brightness" msgid="7309120144111305275">"Nivel de brillo"</string>
     <string name="brightness_title" msgid="5660190946911149690">"Brillo"</string>
     <string name="brightness_summary" msgid="8687101964451818730">"Axusta o brillo da pantalla"</string>
-    <string name="auto_brightness_title" msgid="908511534369820426">"Brillo automático"</string>
+    <string name="auto_brightness_title" msgid="908511534369820426">"Brillo intelixente"</string>
     <string name="auto_brightness_summary_on" msgid="121488862610275737">"Activado"</string>
     <string name="auto_brightness_summary_off" msgid="8569141123211510256">"Desactivado"</string>
     <string name="auto_brightness_summary_very_low" msgid="7625647285740629347">"O brillo preferido é moi baixo"</string>
@@ -1203,7 +1203,7 @@
     <string name="auto_brightness_off_summary" msgid="6162650416289359104">"Non axustar á luz dispoñible"</string>
     <string name="auto_brightness_very_high_summary" msgid="7202032980509583918">"Maior consumo de batería"</string>
     <string name="auto_brightness_disclaimer" msgid="5416696351199148809">"Optimiza o nivel de brillo segundo a luz dispoñible. Cando estea activado, poderás axustar o brillo temporalmente."</string>
-    <string name="auto_brightness_description" msgid="8209140379089535411">"O brillo da pantalla axustarase automaticamente segundo o ambiente e as actividades que leves a cabo. Podes mover o control desprazable de forma manual para que o brillo automático recoñeza as túas preferencias."</string>
+    <string name="auto_brightness_description" msgid="8209140379089535411">"O brillo da pantalla axustarase automaticamente segundo o ambiente e as actividades que leves a cabo. Podes mover o control desprazable de forma manual para que o brillo intelixente recoñeza as túas preferencias."</string>
     <string name="display_white_balance_title" msgid="5747260735311935143">"Balance de brancos da pantalla"</string>
     <string name="adaptive_sleep_title" msgid="3237620948260957018">"Pantalla adaptable"</string>
     <string name="adaptive_sleep_summary_on" msgid="6670369739228487082">"Activado/A pantalla non se apagará se miras para ela"</string>
@@ -1257,7 +1257,7 @@
     <string name="screensaver_settings_current" msgid="4017556173596361672">"Protector de pantalla actual"</string>
     <string name="screensaver_settings_dream_start" msgid="3772227299054662550">"Iniciar agora"</string>
     <string name="screensaver_settings_button" msgid="4662384378821837589">"Configuración"</string>
-    <string name="automatic_brightness" msgid="8663792987774126192">"Brillo automático"</string>
+    <string name="automatic_brightness" msgid="8663792987774126192">"Brillo intelixente"</string>
     <string name="lift_to_wake_title" msgid="5523752279947392868">"Levantar para acender"</string>
     <string name="ambient_display_screen_title" msgid="2632871676917956691">"Pantalla en suspensión"</string>
     <string name="ambient_display_category_triggers" msgid="3496111745340047504">"Cando mostrar a pantalla"</string>
@@ -1625,7 +1625,7 @@
     <string name="usb_tethering_subtext" product="tablet" msgid="154536000235361034">"Comparte a conexión a Internet da tableta por USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="7257293066139372774">"Conexión por Bluetooth"</string>
     <string name="bluetooth_tethering_subtext" product="tablet" msgid="6868756914621131635">"Compartir a conexión a Internet da tableta por Bluetooth"</string>
-    <string name="bluetooth_tethering_subtext" product="default" msgid="9167912297565425178">"Compartir a conexión a Internet do teléfono por Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="9167912297565425178">"Comparte a conexión a Internet do teléfono por Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="3981528184780083266">"Compartindo a conexión a Internet de <xliff:g id="DEVICE_NAME">%1$d</xliff:g> por Bluetooth"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="6946561351369376943">"Non se pode compartir a conexión con máis de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivos"</string>
     <string name="bluetooth_untether_blank" msgid="5428300773782256084">"Desactivarase a conexión compartida de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
@@ -2429,7 +2429,7 @@
     <string name="battery_detail_since_full_charge" msgid="3814176986148084378">"Análise detallada desde a última carga completa"</string>
     <string name="battery_last_full_charge" msgid="5624033030647170717">"Última carga completa"</string>
     <string name="battery_full_charge_last" msgid="4614554109170251301">"Duración aproximada da carga completa"</string>
-    <string name="battery_footer_summary" msgid="4828444679643906943">"Os datos da utilización da batería son aproximados e poden cambiar en función do uso."</string>
+    <string name="battery_footer_summary" msgid="4828444679643906943">"Os datos de utilización da batería son aproximados e poden cambiar en función do uso."</string>
     <string name="battery_detail_foreground" msgid="6616408559186553085">"En uso activo"</string>
     <string name="battery_detail_background" msgid="7938146832943604280">"En segundo plano"</string>
     <string name="battery_detail_power_usage" msgid="3606930232257489212">"Uso da batería"</string>
@@ -2922,10 +2922,10 @@
     <string name="nfc_payment_app_and_desc" msgid="102312684211458190">"<xliff:g id="APP">%1$s</xliff:g> - <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="nfc_payment_use_default" msgid="3098724195746409476">"Usar aplicación predeterminada"</string>
     <string name="nfc_payment_favor_default" msgid="7555356982142464260">"Sempre"</string>
-    <string name="nfc_payment_favor_open" msgid="3739055715000436749">"Excepto cando estea aberta outra aplicación de pago"</string>
+    <string name="nfc_payment_favor_open" msgid="3739055715000436749">"Excepto cando estea aberta outra aplicación para pagos"</string>
     <string name="nfc_payment_pay_with" msgid="8412558374792061266">"Nun terminal de Tocar e pagar, paga con:"</string>
     <string name="nfc_how_it_works_title" msgid="6531433737926327904">"Pago no terminal"</string>
-    <string name="nfc_how_it_works_content" msgid="9174575836302449343">"Configura unha aplicación de pago. A continuación, coloca a parte traseira do teu teléfono sobre calquera terminal que teña o símbolo de pago sen contacto."</string>
+    <string name="nfc_how_it_works_content" msgid="9174575836302449343">"Configura unha aplicación para pagos. A continuación, coloca a parte traseira do teu teléfono sobre calquera terminal que teña o símbolo de pago sen contacto."</string>
     <string name="nfc_how_it_works_got_it" msgid="2432535672153247411">"Entendido"</string>
     <string name="nfc_more_title" msgid="2825856411836382264">"Máis..."</string>
     <string name="nfc_payment_set_default_label" msgid="3997927342761454042">"Establecer como preferencia?"</string>
@@ -3050,7 +3050,7 @@
     <string name="search_results_title" msgid="4160717656435503940">"Configuración"</string>
     <string name="keywords_wifi" msgid="8477688080895466846">"wifi, conexión de rede, Internet, sen fíos, datos"</string>
     <string name="keywords_wifi_notify_open_networks" msgid="1031260564121854773">"notificación Wifi, notificación wifi"</string>
-    <string name="keywords_auto_brightness" msgid="5007188989783072428">"Brillo automático"</string>
+    <string name="keywords_auto_brightness" msgid="5007188989783072428">"Brillo intelixente"</string>
     <string name="keywords_vibrate_on_touch" msgid="3615173661462446877">"Deter vibración, tocar, teclado"</string>
     <string name="keywords_time_format" msgid="8265826377023617424">"Usar formato de 24 horas"</string>
     <string name="keywords_storage_files" msgid="1995055540202216399">"Descarga"</string>
diff --git a/tests/CarDeveloperOptions/res/values-gu/arrays.xml b/tests/CarDeveloperOptions/res/values-gu/arrays.xml
index 9671c68..080bada 100644
--- a/tests/CarDeveloperOptions/res/values-gu/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-gu/arrays.xml
@@ -170,7 +170,7 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="9032900195127165132">"કોઈ નહીં"</item>
     <item msgid="1464741437353223198">"મેન્યુઅલ"</item>
-    <item msgid="5793600062487886090">"પ્રોક્સી આપમેળે ગોઠવો"</item>
+    <item msgid="5793600062487886090">"પ્રોક્સી ઑટોમૅટિક રીતે ગોઠવો"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="7099647881902405997">"કોઈ નહીં"</item>
@@ -257,7 +257,7 @@
     <item msgid="5420704980305018295">"વૉઇસ વૉલ્યૂમ"</item>
     <item msgid="5797363115508970204">"રિંગ વૉલ્યૂમ"</item>
     <item msgid="8233154098550715999">"મીડિયા વૉલ્યૂમ"</item>
-    <item msgid="5196715605078153950">"એલાર્મ વૉલ્યૂમ"</item>
+    <item msgid="5196715605078153950">"અલાર્મ વૉલ્યૂમ"</item>
     <item msgid="394030698764284577">"નોટિફિકેશન વૉલ્યૂમ"</item>
     <item msgid="8952898972491680178">"બ્લૂટૂથ વૉલ્યૂમ"</item>
     <item msgid="8506227454543690851">"સક્રિય રાખો"</item>
@@ -324,7 +324,7 @@
     <item msgid="1600379420669104929">"વૉઇસ વૉલ્યૂમ"</item>
     <item msgid="6296768210470214866">"રિંગ વૉલ્યૂમ"</item>
     <item msgid="510690696071629241">"મીડિયા વૉલ્યૂમ"</item>
-    <item msgid="406861638631430109">"એલાર્મ વૉલ્યૂમ"</item>
+    <item msgid="406861638631430109">"અલાર્મ વૉલ્યૂમ"</item>
     <item msgid="4715864795872233884">"નોટિફિકેશન વૉલ્યૂમ"</item>
     <item msgid="2311478519251301183">"બ્લૂટૂથ વૉલ્યૂમ"</item>
     <item msgid="5133991377896747027">"સક્રિય રાખો"</item>
@@ -495,7 +495,7 @@
   </string-array>
   <string-array name="cdma_system_select_choices">
     <item msgid="8444727359525554695">"માત્ર હોમ"</item>
-    <item msgid="1161026694891024702">"આપમેળે"</item>
+    <item msgid="1161026694891024702">"ઑટોમૅટિક રીતે"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices">
     <item msgid="1823884522189328861">"GSM/WCDMA પસંદ કર્યો છે"</item>
diff --git a/tests/CarDeveloperOptions/res/values-gu/strings.xml b/tests/CarDeveloperOptions/res/values-gu/strings.xml
index 0c2d68c..a1540c7 100644
--- a/tests/CarDeveloperOptions/res/values-gu/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-gu/strings.xml
@@ -26,7 +26,7 @@
       <item quantity="one">તમે હવે એક વિકાસકર્તા બનવાથી <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> પગલાં દૂર છો.</item>
       <item quantity="other">તમે હવે એક વિકાસકર્તા બનવાથી <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> પગલાં દૂર છો.</item>
     </plurals>
-    <string name="show_dev_on" msgid="9075712234786224065">"તમે હવે વિકાસકર્તા છો!"</string>
+    <string name="show_dev_on" msgid="9075712234786224065">"તમે હવે ડેવલપર છો!"</string>
     <string name="show_dev_already" msgid="7665948832405148689">"કોઈ જરૂર નથી, તમે પહેલાંથી જ એક ડેવલપર છો."</string>
     <string name="dev_settings_disabled_warning" msgid="3198732189395396721">"કૃપા કરીને પહેલાં વિકાસકર્તાના વિકલ્પો સક્ષમ કરો."</string>
     <string name="header_category_wireless_networks" msgid="8968405993937795898">"વાયરલેસ અને નેટવર્ક્સ"</string>
@@ -346,7 +346,7 @@
     <string name="zone_menu_by_offset" msgid="6538342360925785227">"UTC ઑફસેટ પ્રમાણે પસંદ કરો"</string>
     <string name="date_picker_title" msgid="2563955125757999610">"તારીખ"</string>
     <string name="time_picker_title" msgid="1596400307061268660">"સમય"</string>
-    <string name="lock_after_timeout" msgid="7755520959071097304">"આપમેળે લૉક"</string>
+    <string name="lock_after_timeout" msgid="7755520959071097304">"ઑટોમૅટિક રીતે લૉક"</string>
     <string name="lock_after_timeout_summary" msgid="3160517585613694740">"નિષ્ક્રિયતા પછી <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>"</string>
     <string name="lock_immediately_summary_with_exception" msgid="6442552135409347556">"નિષ્ક્રિયતા પછી તરત, જ્યારે <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> દ્વારા અનલૉક રાખવામાં આવેલ હોય તે સિવાય"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="7218267834086717545">"નિષ્ક્રિયતા પછી <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>, જ્યારે <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> દ્વારા અનલૉક રાખવામાં આવેલ હોય તે સિવાય"</string>
@@ -585,7 +585,7 @@
     <string name="face_unlock_set_unlock_password" msgid="8962344604388383659">"ચહેરા પ્રમાણીકરણ + પાસવર્ડ"</string>
     <string name="face_unlock_skip_face" msgid="7173197040501143880">"ચહેરા ઓળખ વિના ચાલુ રાખો"</string>
     <string name="face_unlock_title" msgid="1298031162909236127">"તમે તમારા ફોનને તમારા ચહેરાની મદદથી અનલૉક કરી શકો છો. સુરક્ષા માટે, આ વિકલ્પ હેતુ બૅકઅપ સ્ક્રીન લૉક આવશ્યક છે."</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="1713159782896140817">"વ્યવસ્થાપક, એન્ક્રિપ્શન નીતિ અથવા ઓળખપત્ર સ્ટોરેજ દ્વારા અક્ષમ કરાયેલ"</string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="1713159782896140817">"વ્યવસ્થાપક, એન્ક્રિપ્શન પૉલિસી કે ઓળખપત્ર સ્ટોરેજ દ્વારા બંધ કરાયેલ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="2950701212659081973">"કોઈ નહીં"</string>
     <string name="unlock_set_unlock_mode_none" msgid="3441605629077912292">"સ્વાઇપ કરો"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="8564909572968419459">"પૅટર્ન"</string>
@@ -848,8 +848,8 @@
     <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">"વાઇ-ફાઇ આપમેળે ચાલુ કરો"</string>
-    <string name="wifi_wakeup_summary" msgid="1152699417411690">"વાઇ-ફાઇ, તમારા હોમ નેટવર્ક જેવા, સાચવેલા ઉચ્ચ ગુણવત્તાવાળા નેટવર્કની નજીકમાં આપમેળે ફરી ચાલુ થશે"</string>
+    <string name="wifi_wakeup" msgid="4963732992164721548">"વાઇ-ફાઇ ઑટોમૅટિક રીતે ચાલુ કરો"</string>
+    <string name="wifi_wakeup_summary" msgid="1152699417411690">"વાઇ-ફાઇ, તમારા હોમ નેટવર્ક જેવા, સાચવેલા ઉચ્ચ ક્વૉલિટીના નેટવર્કની નજીકમાં ઑટોમૅટિક રીતે ફરી ચાલુ થશે"</string>
     <string name="wifi_wakeup_summary_no_location" msgid="3007457288587966962">"અનુપલબ્ધ છે, કારણ કે સ્થાન બંધ છે. "<annotation id="link">"સ્થાન"</annotation>" ચાલુ કરો."</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="6820040651529910914">"અનુપલબ્ધ છે કારણ કે વાઇ-ફાઇ સ્કૅનિંગ બંધ છે"</string>
     <string name="wifi_wakeup_summary_scoring_disabled" msgid="7067018832237903151">"આ સુવિધાનો ઉપયોગ કરવા માટે, નેટવર્ક રેટિંગ પ્રદાતાને પસંદ કરો"</string>
@@ -857,7 +857,7 @@
     <string name="wifi_poor_network_detection_summary" msgid="5539951465985614590">"જ્યાં સુધી વાઇ-ફાઇ સારું ઇન્ટરનેટ કનેક્શન ધરાવતું ન હોય ત્યાં સુધી તેના નેટવર્કનો ઉપયોગ કરશો નહીં"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="1976503191780928104">"ફક્ત સારું ઇન્ટરનેટ કનેક્શન ધરાવતા નેટવર્કનો જ ઉપયોગ કરો"</string>
     <string name="use_open_wifi_automatically_title" msgid="3084513215481454350">"ખુલ્લા નેટવર્કો સાથે કનેક્ટ કરો"</string>
-    <string name="use_open_wifi_automatically_summary" msgid="8338020172673161754">"ઉચ્ચ ગુણવત્તાવાળા સાર્વજનિક નેટવર્ક સાથે આપમેળે કનેક્ટ કરો"</string>
+    <string name="use_open_wifi_automatically_summary" msgid="8338020172673161754">"ઉચ્ચ ક્વૉલિટીના સાર્વજનિક નેટવર્ક સાથે ઑટોમૅટિક રીતે કનેક્ટ કરો"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="1559329344492373028">"આ સુવિધાનો ઉપયોગ કરવા માટે, નેટવર્ક રેટિંગ પ્રદાતાને પસંદ કરો"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="1123080670578756834">"આ સુવિધાનો ઉપયોગ કરવા માટે, સુસંગત નેટવર્ક રેટિંગ પ્રદાતાને પસંદ કરો"</string>
     <string name="wifi_install_credentials" msgid="5650088113710858289">"પ્રમાણપત્રો ઇન્સ્ટૉલ કરો"</string>
@@ -876,8 +876,8 @@
     <string name="wifi_cellular_data_fallback_summary" msgid="2721467405851519769">"જ્યારે વાઇ-ફાઇ પાસે ઇન્ટરનેટનો ઍક્સેસ ન હોય, ત્યારે મોબાઇલ ડેટાનો ઉપયોગ કરો. ડેટા વપરાશ શુલ્ક લાગુ થઈ શકે છે."</string>
     <string name="wifi_add_network" msgid="4094957940791876640">"નેટવર્ક ઉમેરો"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2678534679408777268">"વાઇ-ફાઇ પસંદગીઓ"</string>
-    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="5714892572614655675">"વાઇ-ફાઇ ફરી આપમેળે ચાલુ થાય છે"</string>
-    <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="286904094152909651">"વાઇ-ફાઇ પાછું આપમેળે ચાલુ થતું નથી"</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>
     <string name="wifi_access_points" msgid="1647976498906871869">"વાઇ-ફાઇ નેટવર્ક"</string>
     <string name="wifi_menu_more_options" msgid="8318269834264035524">"વધુ વિકલ્પો"</string>
     <string name="wifi_menu_p2p" msgid="4945665601551289791">"વાઇ-ફાઇ ડાઇરેક્ટ"</string>
@@ -894,7 +894,7 @@
     <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">"વાઇ-ફાઇ સ્કૅનિંગ ચાલુ કરીએ?"</string>
-    <string name="wifi_settings_scanning_required_summary" msgid="7469610959462708782">"આપમેળે વાઇ-ફાઇ ચાલુ કરવા માટે, તમારે પહેલા વાઇ-ફાઇ સ્કૅનિંગ ચાલુ કરવું જરૂરી છે."</string>
+    <string name="wifi_settings_scanning_required_summary" msgid="7469610959462708782">"ઑટોમૅટિક રીતે વાઇ-ફાઇ ચાલુ કરવા માટે, તમારે પહેલા વાઇ-ફાઇ સ્કૅનિંગ ચાલુ કરવું જરૂરી છે."</string>
     <string name="wifi_settings_scanning_required_info" msgid="5913535073390607386">"વાઇ-ફાઇ બંધ હોય, ત્યારે પણ વાઇ-ફાઇ સ્કૅનિંગ ગમે ત્યારે ઍપ અને સેવાઓને વાઇ-ફાઇ નેટવર્ક સ્કૅન કરવાની મંજૂરી આપે છે. ઉદાહરણ તરીકે, આનો ઉપયોગ સ્થાન-આધારિત સુવિધાઓ અને સેવાઓને બહેતર બનાવવા માટે કરી શકાય છે."</string>
     <string name="wifi_settings_scanning_required_turn_on" msgid="4327570180594277049">"ચાલુ કરો"</string>
     <string name="wifi_settings_scanning_required_enabled" msgid="3336102100425307040">"વાઇ-ફાઇ સ્કૅનિંગ ચાલુ કર્યું છે"</string>
@@ -924,7 +924,7 @@
     <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_choose_auto" msgid="7927637960569365785">"આપમેળે"</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>
     <string name="wifi_ap_prefer_5G" msgid="8339172330471170142">"5.0 GHz બૅન્ડ પસંદ કર્યું"</string>
@@ -1168,7 +1168,7 @@
     <string name="accessibility_category_personal" msgid="1423427301759058762">"વ્યક્તિગત પ્રોફાઇલ એકાઉન્ટ્સ"</string>
     <string name="accessibility_work_account_title" msgid="3195468574776888011">"કાર્ય એકાઉન્ટ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_personal_account_title" msgid="7251761883688839354">"વ્યક્તિગત એકાઉન્ટ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
-    <string name="search_settings" msgid="5809250790214921377">"શોધો"</string>
+    <string name="search_settings" msgid="5809250790214921377">"Search"</string>
     <string name="display_settings" msgid="1045535829232307190">"ડિસ્પ્લે"</string>
     <string name="accelerometer_title" msgid="2427487734964971453">"ઑટો રોટેટ સ્ક્રીન"</string>
     <string name="color_mode_title" msgid="8164858320869449142">"રંગો"</string>
@@ -1178,10 +1178,10 @@
     <string name="color_mode_option_automatic" msgid="6572718611315165117">"સુવિધાજનક"</string>
     <string name="color_mode_summary_natural" msgid="1247153893843263340">"માત્ર સચોટ રંગોનો જ ઉપયોગ કરો"</string>
     <string name="color_mode_summary_automatic" msgid="6066740785261330514">"આબેહૂબ અને સચોટ રંગો વચ્ચે સમાયોજિત કરો"</string>
-    <string name="accelerometer_summary_on" product="tablet" msgid="5750977897791656412">"ટેબ્લેટને ફેરવતી વખતે ઓરિએન્ટેશનને આપમેળે સ્વિચ કરો"</string>
-    <string name="accelerometer_summary_on" product="default" msgid="6454733048264875491">"ફોનને ફેરવતી વખતે ઓરિએન્ટેશનને આપમેળે સ્વિચ કરો"</string>
-    <string name="accelerometer_summary_off" product="tablet" msgid="2663240868158338608">"ટેબ્લેટને ફેરવતી વખતે ઓરિએન્ટેશનને આપમેળે સ્વિચ કરો"</string>
-    <string name="accelerometer_summary_off" product="default" msgid="3366996018631557687">"ફોનને ફેરવતી વખતે ઓરિએન્ટેશનને આપમેળે સ્વિચ કરો"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="5750977897791656412">"ટૅબ્લેટને ફેરવતી વખતે ઓરિએન્ટેશનને ઑટોમૅટિક રીતે સ્વિચ કરો"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="6454733048264875491">"ફોનને ફેરવતી વખતે ઓરિએન્ટેશનને ઑટોમૅટિક રીતે સ્વિચ કરો"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="2663240868158338608">"ટૅબ્લેટને ફેરવતી વખતે ઓરિએન્ટેશનને ઑટોમૅટિક રીતે સ્વિચ કરો"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="3366996018631557687">"ફોનને ફેરવતી વખતે ઓરિએન્ટેશનને ઑટોમૅટિક રીતે સ્વિચ કરો"</string>
     <string name="brightness" msgid="7309120144111305275">"સ્ક્રીનની બ્રાઇટનેસનું સ્તર"</string>
     <string name="brightness_title" msgid="5660190946911149690">"તેજ"</string>
     <string name="brightness_summary" msgid="8687101964451818730">"સ્ક્રીનનાં તેજને સમાયોજિત કરો"</string>
@@ -1203,7 +1203,7 @@
     <string name="auto_brightness_off_summary" msgid="6162650416289359104">"ઉપલબ્ધ લાઇટ માટે સમાયોજિત કરશો નહીં"</string>
     <string name="auto_brightness_very_high_summary" msgid="7202032980509583918">"વધારેલ બૅટરી વપરાશ"</string>
     <string name="auto_brightness_disclaimer" msgid="5416696351199148809">"ઉપલબ્ધ પ્રકાશ માટેનાં તેજ સ્તરને ઑપ્ટિમાઇઝ કરો. જ્યારે આ સુવિધા ચાલુ હોય, ત્યારે પણ તમે તેજને અસ્થાયી રૂપે સમાયોજિત કરી શકો છો."</string>
-    <string name="auto_brightness_description" msgid="8209140379089535411">"તમારી સ્ક્રીનનું બ્રાઇટનેસ તમારા પર્યાવરણ અને પ્રવૃત્તિઓ સાથે આપમેળે ઓછું-વધતું થઈને ગોઠવાશે. તમે સ્લાઇડર મેન્યુઅલી ખસેડીને અડૅપ્ટિવ બ્રાઇટનેસને તમારી પસંદગીઓ જાણવામાં સહાય કરી શકો છો."</string>
+    <string name="auto_brightness_description" msgid="8209140379089535411">"તમારી સ્ક્રીનનું બ્રાઇટનેસ તમારા પર્યાવરણ અને પ્રવૃત્તિઓ સાથે ઑટોમૅટિક રીતે ઓછું-વધતું થઈને ગોઠવાશે. તમે સ્લાઇડર મેન્યુઅલી ખસેડીને અડૅપ્ટિવ બ્રાઇટનેસને તમારી પસંદગીઓ જાણવામાં સહાય કરી શકો છો."</string>
     <string name="display_white_balance_title" msgid="5747260735311935143">"વ્હાઇટ બૅલેન્સ ડિસ્પ્લે"</string>
     <string name="adaptive_sleep_title" msgid="3237620948260957018">"Screen aware"</string>
     <string name="adaptive_sleep_summary_on" msgid="6670369739228487082">"ચાલુ / જો તમે સ્ક્રીન તરફ જોતા હો, તો તમારી સ્ક્રીન બંધ થશે નહીં"</string>
@@ -1222,12 +1222,12 @@
     <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>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8386769601369289561">"સૂર્યોદય સમયે આપમેળે બંધ થઈ જશે"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="5461580863060506687">"ઑટોમૅટિક રીતે ક્યારેય બંધ નહીં થાય"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="2200631112239399233">"<xliff:g id="ID_1">%1$s</xliff:g> વાગ્યે ઑટોમૅટિક રીતે બંધ થઈ જશે"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8386769601369289561">"સૂર્યોદય સમયે ઑટોમૅટિક રીતે બંધ થઈ જશે"</string>
     <string name="night_display_activation_on_manual" msgid="8379477527072027346">"હમણાં ચાલુ કરો"</string>
     <string name="night_display_activation_off_manual" msgid="7776082151269794201">"હમણાં બંધ કરો"</string>
     <string name="night_display_activation_on_twilight" msgid="5610294051700287249">"સૂર્યોદય સુધી ચાલુ રાખો"</string>
@@ -1450,7 +1450,7 @@
     <string name="storage_internal_forget_confirm_title" msgid="331032276130605241">"<xliff:g id="NAME">^1</xliff:g> ભૂલી ગયાં?"</string>
     <string name="storage_internal_forget_confirm" msgid="3052483375203727176">"આ <xliff:g id="NAME">^1</xliff:g> પર સંગ્રહિત તમામ ઍપ્લિકેશનો, ફોટો અને ડેટા કાયમ માટે જતો રહેશે."</string>
     <string name="storage_detail_apps" msgid="8154648512504196820">"ઍપ્લિકેશનો"</string>
-    <string name="storage_detail_images" msgid="6996202225684468964">"છબીઓ"</string>
+    <string name="storage_detail_images" msgid="6996202225684468964">"Images"</string>
     <string name="storage_detail_videos" msgid="6030983354721080849">"વિડિઓઝ"</string>
     <string name="storage_detail_audio" msgid="6011098436589663944">"ઑડિઓ"</string>
     <string name="storage_detail_cached" msgid="5761648455067920683">"કેશ્ડ ડેટા"</string>
@@ -1602,7 +1602,7 @@
     <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">"ડાઉનલોડ કરેલી ઍપ અને સિમ સહિતની તમારી બધી વ્યક્તિગત માહિતી ડિલીટ કરવામાં આવશે. તમે આ ક્રિયા માટે કરેલો છેલ્લો ફેરફાર રદ કરી શકશો નહીં."</string>
-    <string name="master_clear_final_button_text" msgid="866772743886027768">"દરેક વસ્તુ કાઢી નાંખો"</string>
+    <string name="master_clear_final_button_text" msgid="866772743886027768">"દરેક વસ્તુ કાઢી નાખો"</string>
     <string name="master_clear_failed" msgid="7588397453984229892">"કોઈ ફરીથી સેટ કરો કરવામાં આવ્યું નથી કારણ કે સિસ્ટમ સાફ સેવા ઉપલબ્ધ નથી."</string>
     <string name="master_clear_confirm_title" msgid="698328669893512402">"બધો ડેટા કાઢી નાખીએ?"</string>
     <string name="master_clear_not_available" msgid="4676613348163652454">"આ વપરાશકર્તા માટે ફેક્ટરી રીસેટ ઉપલબ્ધ નથી"</string>
@@ -1779,26 +1779,26 @@
     <string name="lock_settings_profile_unification_title" msgid="2629698644191935287">"એક લૉકનો ઉપયોગ કરો"</string>
     <string name="lock_settings_profile_unification_summary" msgid="4797188229308317207">"તમારી કાર્યાલયની પ્રોફાઇલ અને ઉપકરણ સ્ક્રીન પર એક લૉકનો ઉપયોગ કરો"</string>
     <string name="lock_settings_profile_unification_dialog_title" msgid="1690211342491067179">"એક લૉકનો ઉપયોગ કરીએ?"</string>
-    <string name="lock_settings_profile_unification_dialog_body" msgid="8629158560032603101">"તમારું ઉપકરણ તમારા કાર્યાલયની પ્રોફાઇલનાં સ્ક્રીન લૉકનો ઉપયોગ કરશે. કાર્ય નીતિઓ બન્ને લૉક પર લાગુ થશે."</string>
-    <string name="lock_settings_profile_unification_dialog_uncompliant_body" msgid="1217609779267643474">"તમારું કાર્યાલયની પ્રોફાઇલનું લૉક તમારી સંસ્થાની સુરક્ષા આવશ્યકતાઓને પૂર્ણ કરતું નથી. તમે તમારી ઉપકરણ સ્ક્રીન અને તમારી કાર્યાલયની પ્રોફાઇલ પર સમાન લૉકનો ઉપયોગ કરી શકો છો, પરંતુ કોઇપણ કાર્ય લૉક નીતિઓ લાગુ પડશે."</string>
+    <string name="lock_settings_profile_unification_dialog_body" msgid="8629158560032603101">"તમારું ડિવાઇસ તમારા ઑફિસની પ્રોફાઇલનાં સ્ક્રીન લૉકનો ઉપયોગ કરશે. કાર્ય પૉલિસીઓ બન્ને લૉક પર લાગુ થશે."</string>
+    <string name="lock_settings_profile_unification_dialog_uncompliant_body" msgid="1217609779267643474">"તમારું ઑફિસની પ્રોફાઇલનું લૉક તમારી સંસ્થાની સુરક્ષા આવશ્યકતાઓને પૂર્ણ કરતું નથી. તમે તમારી ડિવાઇસ સ્ક્રીન અને તમારી ઑફિસની પ્રોફાઇલ પર સમાન લૉકનો ઉપયોગ કરી શકો છો, પરંતુ કોઇપણ કાર્ય લૉક પૉલિસીઓ લાગુ પડશે."</string>
     <string name="lock_settings_profile_unification_dialog_confirm" msgid="888942752619181804">"એક લૉકનો ઉપયોગ કરો"</string>
     <string name="lock_settings_profile_unification_dialog_uncompliant_confirm" msgid="8046452284593057185">"એક લૉકનો ઉપયોગ કરો"</string>
     <string name="lock_settings_profile_unified_summary" msgid="5347244550751740962">"ઉપકરણ સ્ક્રીન લૉકની સમાન"</string>
     <string name="manageapplications_settings_title" msgid="6876782217962262376">"એપ્લિકેશન્સનું સંચાલન કરો"</string>
     <string name="manageapplications_settings_summary" msgid="5092964799412478962">"ઇન્સ્ટોલ કરેલ એપ્લિકેશન્સનું સંચાલન કરો અને દૂર કરો"</string>
-    <string name="applications_settings" msgid="368331725658793179">"ઍપ્લિકેશનની માહિતી"</string>
+    <string name="applications_settings" msgid="368331725658793179">"ઍપની માહિતી"</string>
     <string name="applications_settings_summary" msgid="8888258399577123906">"ઍપ્લિકેશનો સંચાલિત કરો, ઝડપી લોંચ શોર્ટકટ્સ સેટ કરો"</string>
     <string name="applications_settings_header" msgid="3766501606045211098">"ઍપ્લિકેશન સેટિંગ્સ"</string>
     <string name="install_applications" msgid="7745902974984889179">"અજાણ્યા સ્ત્રોતો"</string>
     <string name="install_applications_title" msgid="8164828577588659496">"બધા ઍપ્લિકેશન સ્રોતોને મંજૂરી આપો"</string>
-    <string name="recent_app_category_title" msgid="7688788038277126727">"તાજેતરમાં ખોલેલી ઍપ્લિકેશનો"</string>
+    <string name="recent_app_category_title" msgid="7688788038277126727">"તાજેતરમાં ખોલેલી ઍપ"</string>
     <string name="see_all_apps_title" msgid="6435061912110347474">"બધી <xliff:g id="COUNT">%1$d</xliff:g> ઍપ્લિકેશન જુઓ"</string>
     <string name="install_all_warning" product="tablet" msgid="4580699862358542727">"તમારું ટૅબ્લેટ અને વ્યક્તિગત ડેટા અજાણી ઍપ્લિકેશનોના હુમલા પ્રતિ વધુ સંવેદનશીલ છે. આ સ્રોત પરથી ઍપ્લિકેશનો ઇન્સ્ટૉલ કરીને તમે સંમત થાઓ છો કે તેમનો ઉપયોગ કરવાના પરિણામે તમારા ટૅબ્લેટને થતી કોઈ પણ ક્ષતિ કે ડેટાના નુકસાન માટે તમે જવાબદાર છો."</string>
     <string name="install_all_warning" product="default" msgid="7445839116997296358">"તમારો ફોન અને વ્યક્તિગત ડેટા અજાણી ઍપ્લિકેશનોના હુમલા પ્રતિ વધુ સંવેદનશીલ છે. આ સ્રોત પરથી ઍપ્લિકેશનો ઇન્સ્ટૉલ કરીને તમે સંમત થાઓ છો કે તેમનો ઉપયોગ કરવાના પરિણામે તમારા ફોનને થતી કોઈ પણ ક્ષતિ કે ડેટાના નુકસાન માટે તમે જવાબદાર છો."</string>
     <string name="install_all_warning" product="device" msgid="9141585291103603515">"તમારું ઉપકરણ અને વ્યક્તિગત ડેટા અજાણી ઍપના હુમલા પ્રતિ વધુ સંવેદનશીલ છે. આ સ્રોત પરથી ઍપ ઇન્સ્ટૉલ કરીને, તમે સંમત થાઓ છો કે તેમનો ઉપયોગ કરવાના પરિણામે તમારા ઉપકરણને થતી કોઈ પણ ક્ષતિ કે ડેટાના નુકસાન માટે તમે જવાબદાર છો."</string>
     <string name="advanced_settings" msgid="6282069364060968122">"વિગતવાર સેટિંગ્સ"</string>
     <string name="advanced_settings_summary" msgid="5912237062506771716">"વધુ સેટિંગ્સ વિકલ્પો સક્ષમ કરો"</string>
-    <string name="application_info_label" msgid="3886253474964599105">"ઍપ્લિકેશન માહિતી"</string>
+    <string name="application_info_label" msgid="3886253474964599105">"ઍપની માહિતી"</string>
     <string name="storage_label" msgid="1109537840103290384">"સ્ટોરેજ"</string>
     <string name="auto_launch_label" msgid="47089737922907379">"ડિફોલ્ટ તરીકે ખોલો"</string>
     <string name="auto_launch_label_generic" msgid="7865828543459493308">"ડિફૉલ્ટ્સ"</string>
@@ -1890,7 +1890,7 @@
     <string name="app_disable_dlg_positive" msgid="5508828271100168073">"ઍપ્લિકેશન અક્ષમ કરો"</string>
     <string name="app_disable_dlg_text" msgid="9221864774943530281">"જો તમે આ ઍપ બંધ કરશો, તો Android અને અન્ય ઍપ અપેક્ષા પ્રમાણે કાર્ય કરી શકશે નહીં. યાદ રાખો, તમે આ ઍપને ડિલીટ નહીં કરી શકો, કારણ કે તે તમારા ડિવાઇસમાં પહેલેથી ઇન્સ્ટૉલ થયેલી હતી. બંધ કરીને, તમે આ ઍપને માત્ર બંધ કરો છો અને તમારા ડિવાઇસમાં છુપાવો છો."</string>
     <string name="app_disable_notifications_dlg_title" msgid="699530661413553928">"સૂચનાઓ બંધ કરીએ?"</string>
-    <string name="app_install_details_group_title" msgid="2909597319422976921">"દુકાન"</string>
+    <string name="app_install_details_group_title" msgid="2909597319422976921">"Store"</string>
     <string name="app_install_details_title" msgid="6954953384372934881">"ઍપ્લિકેશનની વિગતો"</string>
     <string name="app_install_details_summary" msgid="6612222941121363940">"<xliff:g id="APP_STORE">%1$s</xliff:g> માંથી ઇન્સ્ટૉલ કરેલ ઍપ્લિકેશન"</string>
     <string name="instant_app_details_summary" msgid="6384264315914966114">"વધુ માહિતી <xliff:g id="APP_STORE">%1$s</xliff:g> પર મળશે"</string>
@@ -2066,7 +2066,7 @@
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="1279441617927949980">"લૉક સ્ક્રીન પરથી મંજૂરી આપો"</string>
     <string name="accessibility_shortcut_description" msgid="1427049334225166395">"જ્યારે શૉર્ટકટ ચાલુ હોય, ત્યારે ઍક્સેસિબિલિટી સુવિધા શરૂ કરવા માટે તમે બન્ને વૉલ્યૂમ કીને 3 સેકન્ડ સુધી દબાવી રાખી શકો છો."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="5652244684961877255">"ઉચ્ચ કોન્ટ્રાસ્ટ ટેક્સ્ટ"</string>
-    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="2466317284195934003">"સ્ક્રીન વિસ્તૃતીકરણ આપમેળે અપડેટ કરો"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="2466317284195934003">"સ્ક્રીન વિસ્તૃતીકરણ ઑટોમૅટિક રીતે અપડેટ કરો"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="6625473745911276917">"ઍપ્લિકેશન સંક્રમણો પર સ્ક્રીન વિસ્તૃતીકરણને અપડેટ કરો"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6172987104538172869">"પાવર બટન કૉલને સમાપ્ત કરે છે"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="9127905775116570565">"મોટું માઉસ પોઇન્ટર"</string>
@@ -2089,7 +2089,7 @@
     <string name="accessibility_display_inversion_preference_title" msgid="3852635518618938998">"વિપરીત રંગમાં બદલવું"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="69291255322175323">"કાર્યપ્રદર્શનને અસર થઈ શકે છે"</string>
     <string name="accessibility_autoclick_preference_title" msgid="9164599088410340405">"જોવાયાનો સમયગાળો"</string>
-    <string name="accessibility_autoclick_description" msgid="5492414927846407499">"જો તમે માઉસનો ઉપયોગ કરી રહ્યાં હોય, તો જ્યારે કર્સર અમુક ચોક્કસ સમય માટે કાર્ય કરતું રોકાઈ જાય ત્યારે તમે તેને આપમેળે ક્રિયા કરવા માટે સેટ કરી શકો છો."</string>
+    <string name="accessibility_autoclick_description" msgid="5492414927846407499">"જો તમે માઉસનો ઉપયોગ કરી રહ્યાં હોય, તો જ્યારે કર્સર અમુક ચોક્કસ સમય માટે કાર્ય કરતું રોકાઈ જાય ત્યારે તમે તેને ઑટોમૅટિક રીતે ક્રિયા કરવા માટે સેટ કરી શકો છો."</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="8303022510942147049">"ક્લિક કરતાં પહેલાં વિલંબ"</string>
     <string name="accessibility_vibration_settings_title" msgid="1902649657883159406">"વાઇબ્રેશન"</string>
     <string name="accessibility_notification_vibration_title" msgid="1005799039440510298">"નોટિફિકેશન વાઇબ્રેશન"</string>
@@ -2321,7 +2321,7 @@
     <string name="battery_tip_dialog_summary_message" product="tablet" msgid="1721081030632329647">"તમારી બધી ઍપ બૅટરીનો વપરાશ સામાન્ય પ્રમાણમાં કરી રહી છે. જો તે બૅટરીનો ઘણો વધુ વપરાશ કરવા માંડશે, તો તમારું ટૅબ્લેટ તમે શું ઍક્શન લઈ શકો તે સૂચવશે.\n\nજો તમારી પાસે બૅટરીમાં ચાર્જ ઓછો રહ્યો હોય, તો તમે કોઈપણ સમયે બૅટરી સેવર ચાલુ કરી શકો છો."</string>
     <string name="battery_tip_dialog_summary_message" product="device" msgid="146872407040848465">"તમારી બધી ઍપ બૅટરીનો વપરાશ સામાન્ય પ્રમાણમાં કરી રહી છે. જો તે બૅટરીનો ઘણો વધુ વપરાશ કરવા માંડશે, તો તમારું ઉપકરણ તમે શું ઍક્શન લઈ શકો તે સૂચવશે.\n\nજો તમારી પાસે બૅટરીમાં ચાર્જ ઓછો રહ્યો હોય, તો તમે કોઈપણ સમયે બૅટરી સેવર ચાલુ કરી શકો છો."</string>
     <string name="smart_battery_manager_title" msgid="5744035036663849515">"બૅટરી મેનેજર"</string>
-    <string name="smart_battery_title" msgid="4919670408532804351">"ઍપને આપમેળે મેનેજ કરો"</string>
+    <string name="smart_battery_title" msgid="4919670408532804351">"ઍપને ઑટોમૅટિક રીતે મેનેજ કરો"</string>
     <string name="smart_battery_summary" msgid="640027046471198174">"જે ઍપનો તમે ઓછો ઉપયોગ કરતા હો, તેના માટે બૅટરી મર્યાદિત કરો"</string>
     <string name="smart_battery_footer" product="default" msgid="3971715848890205632">"જ્યારે બૅટરી મેનેજર શોધે છે કે ઍપ બૅટરીનો અતિશય ઉપયોગ કરી રહી છે, ત્યારે તમારી પાસે આ ઍપને પ્રતિબંધિત કરવાનો વિકલ્પ હશે. પ્રતિબંધિત ઍપ યોગ્ય રીતે કાર્ય નહીં કરી શકે અને નોટિફિકેશન વિલંબિત થઈ શકે છે."</string>
     <string name="smart_battery_footer" product="tablet" msgid="3971715848890205632">"જ્યારે બૅટરી મેનેજર શોધે છે કે ઍપ બૅટરીનો અતિશય ઉપયોગ કરી રહી છે, ત્યારે તમારી પાસે આ ઍપને પ્રતિબંધિત કરવાનો વિકલ્પ હશે. પ્રતિબંધિત ઍપ યોગ્ય રીતે કાર્ય નહીં કરી શકે અને નોટિફિકેશન વિલંબિત થઈ શકે છે."</string>
@@ -2393,7 +2393,7 @@
     <string name="usage_type_computed_power" msgid="2594890316149868151">"ગણતરી કારયેલ પાવર ઉપયોગ"</string>
     <string name="usage_type_actual_power" msgid="8067253427718526111">"નિરીક્ષિત પાવર ઉપયોગ"</string>
     <string name="battery_action_stop" msgid="1866624019460630143">"ફરજિયાત બંધ કરો"</string>
-    <string name="battery_action_app_details" msgid="1077011181969550402">"ઍપ્લિકેશન માહિતી"</string>
+    <string name="battery_action_app_details" msgid="1077011181969550402">"ઍપની માહિતી"</string>
     <string name="battery_action_app_settings" msgid="587998773852488539">"ઍપ્લિકેશન સેટિંગ્સ"</string>
     <string name="battery_action_display" msgid="4887913003634317465">"સ્ક્રીન સેટિંગ્સ"</string>
     <string name="battery_action_wifi" msgid="7123520587925323824">"વાઇ-ફાઇ સેટિંગ્સ"</string>
@@ -2447,7 +2447,7 @@
     <string name="process_mediaserver_label" msgid="8591722404282619153">"Mediaserver"</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>
@@ -2462,7 +2462,7 @@
     <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>
@@ -2563,7 +2563,7 @@
     <string name="backup_erase_dialog_title" msgid="8178424339104463014"></string>
     <string name="backup_erase_dialog_message" msgid="8767843355330070902">"વાઇ-ફાઇ પાસવર્ડ્સ, બુકમાર્ક્સ, અન્ય સેટિંગ્સ અને ઍપ્લિકેશન ડેટાનો બેકઅપ લેવાનું રોકીએ, તેમજ Google સર્વર્સ પરની બધી કૉપિઝને કાઢી નાખીએ?"</string>
     <string name="fullbackup_erase_dialog_message" msgid="2588536036471144070">"ઉપકરણ ડેટા (જેમ કે વાઇ-ફાઇ પાસવર્ડ્સ અને કૉલ ઇતિહાસ) અને ઍપ્લિકેશન ડેટા (જેમ કે સેટિંગ્સ અને ઍપ્લિકેશનો દ્વારા સંગ્રહિત ફાઇલો) નું બેકઅપ લેવાનું રોકીએ, ઉપરાંત રિમોટ સર્વર્સ પરની તમામ કૉપિઝ કાઢી નાખીએ?"</string>
-    <string name="fullbackup_data_summary" msgid="406274198094268556">"ઉપકરણ ડેટા (જેમ કે વાઇ-ફાઇ પાસવર્ડ્સ અને કૉલ ઇતિહાસ) અને ઍપ્લિકેશન ડેટા (જેમ કે સેટિંગ્સ અને ઍપ્લિકેશનો દ્વારા સંગ્રહિત ફાઇલો)નો રિમોટલી આપમેળે બેક અપ લો.\n\nજ્યારે તમે સ્વચલિત બેકઅપ ચાલુ કરો છો, ત્યારે ઉપકરણ અને ઍપ્લિકેશન ડેટા સમયાંતરે રિમોટલી સચવાય છે. ઍપ્લિકેશન ડેટા એવો કોઈપણ ડેટા હોઈ શકે જેને કોઈ ઍપ્લિકેશને સાચવ્યો હોય (વિકાસકર્તા સેટિંગ્સનાં આધારે) જેમાં સંપર્કો, સંદેશા અને ફોટો જેવા સંભવિતપણે સંવેદનશીલ ડેટાનો સમાવેશ થાય છે."</string>
+    <string name="fullbackup_data_summary" msgid="406274198094268556">"ડિવાઇસ ડેટા (જેમ કે વાઇ-ફાઇ પાસવર્ડ અને કૉલ ઇતિહાસ) અને ઍપ ડેટા (જેમ કે સેટિંગ અને ઍપ દ્વારા સંગ્રહિત ફાઇલો)નો રિમોટલી ઑટોમૅટિક રીતે બૅકઅપ લો.\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>
@@ -2606,7 +2606,7 @@
     <string name="background_data_summary" msgid="799640633948841990">"ઍપ્લિકેશનો કોઈપણ સમયે ડેટાને સમન્વયિત, મોકલી અને પ્રાપ્ત કરી શકે છે"</string>
     <string name="background_data_dialog_title" msgid="8306650658158895976">"બૅકગ્રાઉન્ડ ડેટાને અક્ષમ કરીએ?"</string>
     <string name="background_data_dialog_message" msgid="8126774244911656527">"બૅકગ્રાઉન્ડ ડેટાને અક્ષમ કરવું બૅટરીની આવરદા વધારે છે અને ડેટા ઉપયોગને ઓછો કરે છે. કેટલીક ઍપ્લિકેશનો હજી પણ બૅકગ્રાઉન્ડ ડેટા કનેક્શનનો ઉપયોગ કરતી હોઈ શકે છે."</string>
-    <string name="sync_automatically" msgid="5746117156896468099">"ઍપ્લિકેશન ડેટાને આપમેળે સિંક કરો"</string>
+    <string name="sync_automatically" msgid="5746117156896468099">"ઍપ ડેટાને ઑટોમૅટિક રીતે સિંક કરો"</string>
     <string name="sync_enabled" msgid="535172627223336983">"સમન્વયન ચાલુ છે"</string>
     <string name="sync_disabled" msgid="713721807204805062">"સમન્વયન બંધ છે"</string>
     <string name="sync_error" msgid="988155155932442765">"સમન્વયન ભૂલ"</string>
@@ -2634,7 +2634,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>
@@ -2652,7 +2652,7 @@
     <string name="data_usage_app_summary_title" msgid="8277327968906074983">"મોબાઇલ ડેટા અને Wi‑Fi"</string>
     <string name="data_usage_accounting" msgid="4681642832010140640">"કેરિઅર ડેટા એકાઉન્ટિંગ તમારા ઉપકરણથી અલગ હોઈ શકે છે."</string>
     <string name="data_usage_app" msgid="4995297799363021198">"ઍપ્લિકેશન વપરાશ"</string>
-    <string name="data_usage_app_info_label" msgid="5358288895158910477">"ઍપ્લિકેશન માહિતી"</string>
+    <string name="data_usage_app_info_label" msgid="5358288895158910477">"ઍપની માહિતી"</string>
     <string name="data_usage_cellular_data" msgid="3509117353455285808">"મોબાઇલ ડેટા"</string>
     <string name="data_usage_data_limit" msgid="4070740691087063670">"ડેટા મર્યાદા સેટ કરો"</string>
     <string name="data_usage_cycle" msgid="1877235461828192940">"ડેટા વપરાશ ચક્ર"</string>
@@ -2666,10 +2666,10 @@
     <string name="data_usage_menu_show_ethernet" msgid="2130574690318410238">"ઇથરનેટ વપરાશ બતાવો"</string>
     <string name="data_usage_menu_hide_ethernet" msgid="1191233197312414533">"ઇથરનેટ વપરાશ છુપાવો"</string>
     <string name="data_usage_menu_metered" msgid="3087525150259956831">"નેટવર્ક પ્રતિબંધ"</string>
-    <string name="data_usage_menu_auto_sync" msgid="3350154877737572146">"ડેટાને આપમેળે સિંક કરો"</string>
+    <string name="data_usage_menu_auto_sync" msgid="3350154877737572146">"ડેટાને ઑટોમૅટિક રીતે સિંક કરો"</string>
     <string name="data_usage_menu_sim_cards" msgid="8508154611676507088">"સિમ કાર્ડ"</string>
     <string name="data_usage_cellular_data_summary" msgid="9162777397135709280">"થોભાવવાની મર્યાદા"</string>
-    <string name="account_settings_menu_auto_sync" msgid="2673669556006027506">"ડેટાને આપમેળે સિંક કરો"</string>
+    <string name="account_settings_menu_auto_sync" msgid="2673669556006027506">"ડેટાને ઑટોમૅટિક રીતે સિંક કરો"</string>
     <string name="account_settings_menu_auto_sync_personal" msgid="3235831897309033754">"વ્યક્તિગત ડેટાને ઑટો સિંક કરો"</string>
     <string name="account_settings_menu_auto_sync_work" msgid="5721442464286552815">"ઑફિસના ડેટાને ઑટો સિંક કરો"</string>
     <string name="data_usage_change_cycle" msgid="447761920472170031">"ચક્ર બદલો…"</string>
@@ -2704,8 +2704,8 @@
     <string name="data_usage_app_restrict_dialog" msgid="4022530391896478031">"આ સુવિધાને કારણે બૅકગ્રાઉન્ડ ડેટા પર આધારિત હોય તે ઍપ્લિકેશન ફક્ત મોબાઇલ નેટવર્કો ઉપલબ્ધ હોય ત્યારે કામ કરતી બંધ થઈ શકે છે.\n\nતમે ઍપ્લિકેશનમાં ઉપલબ્ધ સેટિગ્સમાં વધુ ઉચિત ડેટા વપરાશ નિયંત્રણો મેળવી શકો છો."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="18928292832775805">"તમે મોબાઇલ ડેટા મર્યાદા સેટ કરી હોય, માત્ર ત્યારે જ બૅકગ્રાઉન્ડ ડેટાને મર્યાદિત કરવું સંભવ છે."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2342323408229702005">"ડેટા સ્વતઃસમન્વયિત કરો ચાલુ કરીએ?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="4935430284683238901">"તમે વેબ પર તમારા એકાઉન્ટ્સમાં કરો તે કોઈપણ ફેરફારોને આપમેળે તમારા ફોન પર કૉપિ કરાશે.\n\nકેટલાક એકાઉન્ટ્સ પણ તમે ટેબ્લેટ પર કરો તે ફેરફારોની વેબ પર આપમેળે કૉપિ કરશે. Google એકાઉન્ટ આ પ્રમાણે કાર્ય કરે છે."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="5004823486046340090">"તમે વેબ પર તમારા એકાઉન્ટ્સમાં કરો તે કોઈપણ ફેરફારોને આપમેળે તમારા ફોન પર કૉપિ કરાશે.\n\nકેટલાક એકાઉન્ટ્સ પણ તમે ફોન પર કરો તે ફેરફારોની વેબ પર આપમેળે કૉપિ કરશે. Google એકાઉન્ટ આ પ્રમાણે કાર્ય કરે છે."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="4935430284683238901">"તમે વેબ પર તમારા એકાઉન્ટમાં કરો તે કોઈપણ ફેરફારોને ઑટોમૅટિક રીતે તમારા ફોન પર કૉપિ કરાશે.\n\nકેટલાક એકાઉન્ટ પણ તમે ટૅબ્લેટ પર કરો તે ફેરફારોની વેબ પર ઑટોમૅટિક રીતે કૉપિ કરશે. Google એકાઉન્ટ આ પ્રમાણે કાર્ય કરે છે."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="5004823486046340090">"તમે વેબ પર તમારા એકાઉન્ટમાં કરો તે કોઈપણ ફેરફારોને ઑટોમૅટિક રીતે તમારા ફોન પર કૉપિ કરાશે.\n\nકેટલાક એકાઉન્ટ પણ તમે ફોન પર કરો તે ફેરફારોની વેબ પર ઑટોમૅટિક રીતે કૉપિ કરશે. Google એકાઉન્ટ આ પ્રમાણે કાર્ય કરે છે."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="7105334544291643305">"ડેટા ઑટો-સિંક કરો બંધ કરીએ?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4057984234450947964">"આમ કરવું તે ડેટા અને બૅટરી વપરાશ બચાવશે, પરંતુ તમારે તાજેતરની માહિતી એકત્રિત કરવા માટે દરેક એકાઉન્ટને મેન્યુઅલી સિંક કરવાની જરૂર પડશે. અને જ્યારે અપડેટ આવશે ત્યારે તમે નોટિફિકેશન પ્રાપ્ત કરી શકશો નહીં."</string>
     <string name="data_usage_cycle_editor_title" msgid="4967309390043599889">"વપરાશ સાયકલ ફરીથી સેટ કરવાની તારીખ"</string>
@@ -2733,11 +2733,11 @@
     <string name="data_usage_metered_mobile" msgid="3675591449158207593">"મોબાઇલ નેટવર્ક્સ"</string>
     <string name="data_usage_metered_wifi" msgid="2955256408132426720">"મીટર કરેલ વાઇ-ફાઇ નેટવર્ક્સ"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="5771083253782103415">"મીટર કરેલ નેટવર્ક્સ પસંદ કરવા માટે, વાઇ-ફાઇ ચાલુ કરો."</string>
-    <string name="data_usage_metered_auto" msgid="7924116401382629319">"આપમેળે"</string>
+    <string name="data_usage_metered_auto" msgid="7924116401382629319">"ઑટોમૅટિક રીતે"</string>
     <string name="data_usage_metered_yes" msgid="7333744880035386073">"મીટર કરેલ"</string>
     <string name="data_usage_metered_no" msgid="1961524615778610008">"મીટર કરેલ નથી"</string>
     <string name="data_usage_disclaimer" msgid="4683321532922590425">"કેરિઅર ડેટા એકાઉન્ટિંગ તમારા ઉપકરણથી અલગ હોઈ શકે છે."</string>
-    <string name="cryptkeeper_emergency_call" msgid="4625420047524693116">"કટોકટીમાં કૉલ જોડો"</string>
+    <string name="cryptkeeper_emergency_call" msgid="4625420047524693116">"ઇમર્જન્સી કૉલ"</string>
     <string name="cryptkeeper_return_to_call" msgid="4433942821196822815">"કૉલ પર પાછા ફરો"</string>
     <string name="vpn_name" msgid="3538818658670774080">"નામ"</string>
     <string name="vpn_type" msgid="6389116710008658550">"પ્રકાર"</string>
@@ -2900,7 +2900,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>
@@ -3040,12 +3040,12 @@
     <string name="connected_devices_dashboard_no_nfc_summary" msgid="2610085597733526722">"બ્લૂટૂથ, ડ્રાઇવિંગ મોડ"</string>
     <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="3524409078596318803">"બ્લૂટૂથ, NFC"</string>
     <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="7881286613528299400">"બ્લૂટૂથ"</string>
-    <string name="app_and_notification_dashboard_title" msgid="8448096608058843730">"ઍપ્લિકેશનો અને નોટિફિકેશન"</string>
+    <string name="app_and_notification_dashboard_title" msgid="8448096608058843730">"ઍપ અને નોટિફિકેશન"</string>
     <string name="app_and_notification_dashboard_summary" msgid="4165181440955038145">"Assistant, તાજેતરની ઍપ, ડિફૉલ્ટ ઍપ"</string>
     <string name="notification_settings_work_profile" msgid="7190550347842400029">"કાર્યાલયની પ્રોફાઇલમાં ઍપ માટે નોટિફિકેશન ઍક્સેસ ઉપલબ્ધ નથી."</string>
     <string name="account_dashboard_title" msgid="4734300939532555885">"એકાઉન્ટ"</string>
     <string name="account_dashboard_default_summary" msgid="6822549669771936206">"કોઈ એકાઉન્ટ ઉમેરવામાં આવ્યાં નથી"</string>
-    <string name="app_default_dashboard_title" msgid="6575301028225232193">"ડિફૉલ્ટ ઍપ્લિકેશનો"</string>
+    <string name="app_default_dashboard_title" msgid="6575301028225232193">"ડિફૉલ્ટ ઍપ"</string>
     <string name="system_dashboard_summary" msgid="6582464466735779394">"ભાષાઓ, જેશ્ચર સમય, બૅકઅપ"</string>
     <string name="search_results_title" msgid="4160717656435503940">"સેટિંગ્સ"</string>
     <string name="keywords_wifi" msgid="8477688080895466846">"વાઇફાઇ, વાઇ-ફાઇ, નેટવર્ક કનેક્શન, ઇન્ટરનેટ, વાયરલેસ, ડેટા, વાઇ-ફાઇ"</string>
@@ -3137,7 +3137,7 @@
     <string name="media_volume_option_title" msgid="3553411883305505682">"મીડિયા વૉલ્યૂમ"</string>
     <string name="remote_media_volume_option_title" msgid="6355710054191873836">"કાસ્ટનું વૉલ્યૂમ"</string>
     <string name="call_volume_option_title" msgid="5028003296631037334">"કૉલ વૉલ્યૂમ"</string>
-    <string name="alarm_volume_option_title" msgid="3184076022438477047">"એલાર્મ વૉલ્યૂમ"</string>
+    <string name="alarm_volume_option_title" msgid="3184076022438477047">"અલાર્મ વૉલ્યૂમ"</string>
     <string name="ring_volume_option_title" msgid="2038924918468372264">"રિંગ વૉલ્યૂમ"</string>
     <string name="notification_volume_option_title" msgid="1358512611511348260">"નોટિફિકેશન વૉલ્યૂમ"</string>
     <string name="ringtone_title" msgid="1409086028485922583">"ફોન રિંગટોન"</string>
@@ -3151,7 +3151,7 @@
     <string name="screen_locking_sounds_title" msgid="4407110895465866809">"સ્ક્રીન લૉકિંગ ધ્વનિઓ"</string>
     <string name="charging_sounds_title" msgid="5070437987230894287">"ચાર્જિંગ સાઉન્ડ અને વાઇબ્રેશન"</string>
     <string name="docking_sounds_title" msgid="2573137471605541366">"ડૉકિંગ સાઉન્ડ્સ"</string>
-    <string name="touch_sounds_title" msgid="165237488496165652">"ટચ સાઉન્ડ્સ"</string>
+    <string name="touch_sounds_title" msgid="165237488496165652">"ટચ સાઉન્ડ"</string>
     <string name="vibrate_on_touch_title" msgid="6360155469279157684">"સ્પર્શ વાઇબ્રેશન"</string>
     <string name="vibrate_on_touch_summary" msgid="5504424764028676043">"ટૅપ, કીબોર્ડ અને વધુ માટે સ્પર્શ દ્વારા આપેલ અભિપ્રાય"</string>
     <string name="dock_audio_media_title" msgid="1859521680502040781">"ડૉક સ્પીકર ચલાવે છે"</string>
@@ -3162,7 +3162,7 @@
     <string name="emergency_tone_vibrate" msgid="5020068066905681181">"વાઇબ્રેશન"</string>
     <string name="boot_sounds_title" msgid="7583926202411353620">"ચાલુ થવા પર વાગનાર ધ્વનિ"</string>
     <string name="live_caption_title" msgid="7926591158657997051">"લાઇવ કૅપ્શન"</string>
-    <string name="live_caption_summary" msgid="9064771862352393125">"મીડિયામાં કૅપ્શન આપમેળે ઉમેરો"</string>
+    <string name="live_caption_summary" msgid="9064771862352393125">"મીડિયામાં કૅપ્શન ઑટોમૅટિક રીતે ઉમેરો"</string>
     <string name="zen_mode_settings_summary_off" msgid="6929319200478424962">"ક્યારેય નહીં"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="6061723291126091396">
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> શેડ્યૂલ ઑટોમૅટિક રીતે ચાલુ કર્યું</item>
@@ -3234,8 +3234,8 @@
     <string name="zen_mode_button_turn_off" msgid="3990967728457149454">"હમણાં બંધ કરો"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="4307574188962071429">"ખલેલ પાડશો નહીં મોડ <xliff:g id="FORMATTED_TIME">%s</xliff:g> સુધી ચાલુ છે"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="3701005376825238752">"ખલેલ પાડશો નહીં મોડને તમે જ્યાં સુધી બંધ નહીં કરો ત્યાં સુધી તે ચાલુ રહેશે."</string>
-    <string name="zen_mode_settings_dnd_automatic_rule" msgid="2843297614114625408">"ખલેલ પાડશો નહીં મોડ શેડ્યૂલ (<xliff:g id="RULE_NAME">%s</xliff:g>) નિયમ દ્વારા આપમેળે ચાલુ કરવામાં આવ્યો હતો"</string>
-    <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="5103454923160912313">"ખલેલ પાડશો નહીં મોડ એક <xliff:g id="APP_NAME">%s</xliff:g> ઍપ દ્વારા આપમેળે ચાલુ કરવામાં આવ્યું હતું"</string>
+    <string name="zen_mode_settings_dnd_automatic_rule" msgid="2843297614114625408">"ખલેલ પાડશો નહીં મોડ શેડ્યૂલ (<xliff:g id="RULE_NAME">%s</xliff:g>) નિયમ દ્વારા ઑટોમૅટિક રીતે ચાલુ કરવામાં આવ્યો હતો"</string>
+    <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="5103454923160912313">"ખલેલ પાડશો નહીં મોડ એક <xliff:g id="APP_NAME">%s</xliff:g> ઍપ દ્વારા ઑટોમૅટિક રીતે ચાલુ કરવામાં આવ્યું હતું"</string>
     <string name="zen_mode_settings_dnd_custom_settings_footer" msgid="6335108298640066560">"કસ્ટમ સેટિંગ સાથે ખલેલ પાડશો નહીંની સુવિધા <xliff:g id="RULE_NAMES">%s</xliff:g> માટે ચાલુ છે."</string>
     <string name="zen_mode_settings_dnd_custom_settings_footer_link" msgid="4007974052885089379"><annotation id="link">" કસ્ટમ સેટિંગ જુઓ"</annotation></string>
     <string name="zen_interruption_level_priority" msgid="9178419297408319234">"માત્ર પ્રાધાન્યતા"</string>
@@ -3244,13 +3244,13 @@
     <string name="zen_mode_sound_summary_off_with_info" msgid="3910718455243440265">"બંધ કરો / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_off" msgid="2800265178411749309">"બંધ કરો"</string>
     <string name="zen_mode_sound_summary_on" msgid="6964666541479146310">"ચાલુ"</string>
-    <string name="zen_mode_duration_summary_always_prompt" msgid="7642321938427056823">"દર વખતે પૂછો (જો આપમેળે ચાલુ નહીં થાય તો)"</string>
-    <string name="zen_mode_duration_summary_forever" msgid="4563938129424903030">"તમે બંધ કરો ત્યાં સુધી (જો આપમેળે ચાલુ નહીં થાય તો)"</string>
+    <string name="zen_mode_duration_summary_always_prompt" msgid="7642321938427056823">"દર વખતે પૂછો (જો ઑટોમૅટિક રીતે ચાલુ ન થાય તો)"</string>
+    <string name="zen_mode_duration_summary_forever" msgid="4563938129424903030">"તમે બંધ કરો ત્યાં સુધી (જો ઑટોમૅટિક રીતે ચાલુ ન થાય તો)"</string>
     <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="8872000022033647725">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> કલાક (જો આપમેળે ચાલુ નહીં થાય તો)</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> કલાક (જો આપમેળે ચાલુ નહીં થાય તો)</item>
+      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> કલાક (જો ઑટોમૅટિક રીતે ચાલુ ન થાય તો)</item>
+      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> કલાક (જો ઑટોમૅટિક રીતે ચાલુ ન થાય તો)</item>
     </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="6988728116715208859">"<xliff:g id="NUM_MINUTES">%d</xliff:g> મિનિટ (જો આપમેળે ચાલુ નહીં થાય તો)"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="6988728116715208859">"<xliff:g id="NUM_MINUTES">%d</xliff:g> મિનિટ (જો ઑટોમૅટિક રીતે ચાલુ ન થાય તો)"</string>
     <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="8527428833487709278">
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> શેડ્યૂલ ઑટોમૅટિક રીતે ચાલુ થઈ શકશે</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> શેડ્યૂલ ઑટોમૅટિક રીતે ચાલુ થઈ શકશે</item>
@@ -3280,12 +3280,12 @@
     <string name="zen_onboarding_new_setting_summary" msgid="8264430315983860075">"તમે કોઈ નોટિફિકેશન જોઈ અથવા સાંભળી શકશો નહીં. સ્ટાર આપેલા સંપર્કો અને રિપીટ કૉલરના કૉલને પરવાનગી આપવામાં આવે છે."</string>
     <string name="zen_onboarding_current_setting_summary" msgid="3569246708507270821">"(વર્તમાન સેટિંગ)"</string>
     <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="7584229011611927613">"ખલેલ પાડશો નહીં નોટિફિકેશનની સેટિંગમાં ફેરફાર કરીએ?"</string>
-    <string name="sound_work_settings" msgid="4140215240360927923">"કાર્યાલયની પ્રોફાઇલની ધ્વનિઓ"</string>
-    <string name="work_use_personal_sounds_title" msgid="531727195073003599">"વ્યક્તિગત પ્રોફાઇલ ધ્વનિઓ વાપરો"</string>
-    <string name="work_use_personal_sounds_summary" msgid="2886871383995187441">"કાર્ય અને વ્યક્તિગત પ્રોફાઇલો માટે ધ્વનિ સમાન રહે છે"</string>
-    <string name="work_ringtone_title" msgid="5499360583947410224">"કાર્ય ફોન રિંગટોન"</string>
-    <string name="work_notification_ringtone_title" msgid="8059159087214025757">"કાર્યાલયના નોટિફિકેશન માટે ડિફૉલ્ટ ધ્વનિ"</string>
-    <string name="work_alarm_ringtone_title" msgid="5328487181385375130">"ડિફૉલ્ટ કાર્ય એલાર્મ માટે સાઉન્ડ"</string>
+    <string name="sound_work_settings" msgid="4140215240360927923">"ઑફિસની પ્રોફાઇલના સાઉન્ડ"</string>
+    <string name="work_use_personal_sounds_title" msgid="531727195073003599">"વ્યક્તિગત પ્રોફાઇલ સાઉન્ડ વાપરો"</string>
+    <string name="work_use_personal_sounds_summary" msgid="2886871383995187441">"ઑફિસ અને વ્યક્તિગત પ્રોફાઇલો માટે સાઉન્ડ સમાન રહે છે"</string>
+    <string name="work_ringtone_title" msgid="5499360583947410224">"ઑફિસ ફોન રિંગટોન"</string>
+    <string name="work_notification_ringtone_title" msgid="8059159087214025757">"ઑફિસના નોટિફિકેશન માટે ડિફૉલ્ટ સાઉન્ડ"</string>
+    <string name="work_alarm_ringtone_title" msgid="5328487181385375130">"ઑફિસના અલાર્મ માટે ડિફૉલ્ટ સાઉન્ડ"</string>
     <string name="work_sound_same_as_personal" msgid="7728560881697159758">"વ્યક્તિગત પ્રોફાઇલની જેમ જ"</string>
     <string name="work_sync_dialog_title" msgid="4799120971202956837">"ધ્વનિ બદલીએ?"</string>
     <string name="work_sync_dialog_yes" msgid="2110726233746476066">"બદલો"</string>
@@ -3446,13 +3446,13 @@
     <string name="zen_mode_delete_rule_confirmation" msgid="2646596466259025978">"<xliff:g id="RULE">%1$s</xliff:g> નિયમ કાઢી નાખીએ?"</string>
     <string name="zen_mode_delete_rule_button" msgid="611058106279881991">"ડિલીટ કરો"</string>
     <string name="zen_mode_rule_type_unknown" msgid="2819480113355191421">"અજાણ્યું"</string>
-    <string name="zen_mode_app_set_behavior" msgid="8597398780262575571">"આ સેટિંગ હમણાં જ બદલી શકાશે નહીં. આ (<xliff:g id="APP_NAME">%1$s</xliff:g>) ઍપએ આપમેળે ખલેલ પાડશો નહીં મોડ કસ્ટમ વર્તન સાથે ચાલુ કર્યું છે."</string>
-    <string name="zen_mode_unknown_app_set_behavior" msgid="5666462954329932302">"આ સેટિંગ હમણાં જ બદલી શકાશે નહીં. એક ઍપએ આપમેળે ખલેલ પાડશો નહીં મોડ કસ્ટમ વર્તન સાથે ચાલુ કર્યું છે."</string>
+    <string name="zen_mode_app_set_behavior" msgid="8597398780262575571">"આ સેટિંગ હમણાં બદલી શકાશે નહીં. આ (<xliff:g id="APP_NAME">%1$s</xliff:g>) ઍપએ ઑટોમૅટિક રીતે ખલેલ પાડશો નહીં મોડ કસ્ટમ વર્તન સાથે ચાલુ કર્યું છે."</string>
+    <string name="zen_mode_unknown_app_set_behavior" msgid="5666462954329932302">"આ સેટિંગ હમણાં બદલી શકાશે નહીં. એક ઍપએ ઑટોમૅટિક રીતે ખલેલ પાડશો નહીં મોડ કસ્ટમ વર્તન સાથે ચાલુ કર્યું છે."</string>
     <string name="zen_mode_qs_set_behavior" msgid="788646569296973998">"આ સેટિંગ હમણાં જ બદલી શકાશે નહીં. ખલેલ પાડશો નહીં મોડ કસ્ટમ વર્તન સાથે મેન્યુઅલી ચાલુ કરવામાં આવ્યું હતું."</string>
     <string name="zen_schedule_rule_type_name" msgid="4516851728113801329">"સમય"</string>
-    <string name="zen_schedule_rule_enabled_toast" msgid="1742354493045049048">"ઉલ્લેખિત સમય દરમિયાન ખલેલ પાડશો નહીં ચાલુ કરવા માટે આપમેળે નિયમ સેટ કર્યો"</string>
+    <string name="zen_schedule_rule_enabled_toast" msgid="1742354493045049048">"ઉલ્લેખિત સમય દરમિયાન ખલેલ પાડશો નહીં ચાલુ કરવા માટે ઑટોમૅટિક રીતે નિયમ સેટ કર્યો"</string>
     <string name="zen_event_rule_type_name" msgid="7467729997336583342">"ઇવેન્ટ"</string>
-    <string name="zen_event_rule_enabled_toast" msgid="7087368268966855976">"ઉલ્લેખિત ઇવેન્ટ્સ દરમિયાન ખલેલ પાડશો નહીં ચાલુ કરવા માટે આપમેળે નિયમ સેટ કર્યો"</string>
+    <string name="zen_event_rule_enabled_toast" msgid="7087368268966855976">"ઉલ્લેખિત ઇવેન્ટ દરમિયાન \'ખલેલ પાડશો નહીં\' ચાલુ કરવા માટે ઑટોમૅટિક રીતે નિયમ સેટ કર્યો"</string>
     <string name="zen_mode_event_rule_calendar" msgid="6088077103908487442">"આ માટેની ઇવેન્ટ્સ દરમિયાન"</string>
     <string name="zen_mode_event_rule_summary_calendar_template" msgid="4027207992040792657">"<xliff:g id="CALENDAR">%1$s</xliff:g> માટેની ઇવેન્ટ્સ દરમિયાન"</string>
     <string name="zen_mode_event_rule_summary_any_calendar" msgid="7590085295784895885">"કોઈપણ કૅલેન્ડર"</string>
@@ -3525,7 +3525,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>
@@ -3728,7 +3728,7 @@
     <string name="decline_remote_bugreport_action" msgid="706319275774199033">"નકારો"</string>
     <string name="usb_use_charging_only" msgid="2344625733377110164">"કોઈ ડેટા ટ્રાન્સફર નથી"</string>
     <string name="usb_use_charging_only_desc" msgid="3283518562582478950">"બસ આ ઉપકરણને ચાર્જ કરો"</string>
-    <string name="usb_use_power_only" msgid="6595783381323810697">"કનેક્ટ થયેલ ઉપકરણને ચાર્જ કરો"</string>
+    <string name="usb_use_power_only" msgid="6595783381323810697">"કનેક્ટ થયેલ ડિવાઇસને ચાર્જ કરો"</string>
     <string name="usb_use_file_transfers" msgid="6153021302176151884">"ફાઇલ ટ્રાન્સફર"</string>
     <string name="usb_use_file_transfers_desc" msgid="6953866660041189580">"ફાઇલોને બીજા ઉપકરણ પર ટ્રાન્સફર કરો"</string>
     <string name="usb_use_photo_transfers" msgid="5974236250197451257">"PTP"</string>
@@ -3792,7 +3792,7 @@
     <string name="zen_access_revoke_warning_dialog_title" msgid="6850994585577513299">"<xliff:g id="APP">%1$s</xliff:g> માટે ખલેલ પહોંચાડશો નહિ ની એક્સેસ રદબાતલ કરીએ?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="3487422193181311403">"આ ઍપ્લિકેશન દ્વારા બનાવાયેલ તમામ ખલેલ પહોંચાડશો નહિ નિયમો દૂર કરવામાં આવશે."</string>
     <string name="ignore_optimizations_on" msgid="4373971641328943551">"ઓપ્ટિમાઇઝ કરશો નહીં"</string>
-    <string name="ignore_optimizations_off" msgid="4372289432580282870">"ઓપ્ટિમાઇઝ કરો"</string>
+    <string name="ignore_optimizations_off" msgid="4372289432580282870">"Optimize"</string>
     <string name="ignore_optimizations_on_desc" msgid="2904484569799521559">"તમારી બૅટરી વધુ ઝડપથી ખાલી થઈ શકે છે. ઍપ હવે બૅકગ્રાઉન્ડ બૅટરીનો ઉપયોગ કરવાથી પ્રતિબંધિત રહેશે નહીં."</string>
     <string name="ignore_optimizations_off_desc" msgid="5598702251817814289">"બહેતર બૅટરી આવરદા માટે ભલામણ કરેલ"</string>
     <string name="ignore_optimizations_title" msgid="7924345545276166305">"બૅટરી ઓપ્ટિમાઇઝેશન્સને અવગણવા માટે <xliff:g id="APP">%s</xliff:g> ને મંજૂરી આપીએ?"</string>
@@ -3907,7 +3907,7 @@
     <string name="condition_device_vibrate_title" msgid="5712659354868872338">"માત્ર વાઇબ્રેશન"</string>
     <string name="condition_device_vibrate_summary" msgid="9073880731894828604">"કૉલ અને નોટિફિકેશન માટે"</string>
     <string name="night_display_suggestion_title" msgid="4222839610992282188">"રાત્રિ પ્રકાશ માટે શેડ્યૂલ સેટ કરો"</string>
-    <string name="night_display_suggestion_summary" msgid="1754361016383576916">"દરરોજ રાત્રે સ્ક્રીનની રંગછટા આપમેળે ઓછીવધતી કરો"</string>
+    <string name="night_display_suggestion_summary" msgid="1754361016383576916">"દરરોજ રાત્રે સ્ક્રીનની રંગછટા ઑટોમૅટિક રીતે ઓછીવધતી કરો"</string>
     <string name="condition_night_display_title" msgid="9171491784857160135">"રાત્રિ પ્રકાશ ચાલુ છે"</string>
     <string name="condition_night_display_summary" msgid="7885776986937527558">"સ્ક્રીન પર પીળાશ પડતી નારંગી રંગની છટા"</string>
     <string name="condition_grayscale_title" msgid="1226351649203551299">"ગ્રેસ્કેલ"</string>
@@ -4158,8 +4158,8 @@
     <string name="account_for_section_header" msgid="5975241715840642563">"<xliff:g id="USER_NAME">%1$s</xliff:g> માટેના એકાઉન્ટ"</string>
     <string name="configure_section_header" msgid="6988981883075615136">"ગોઠવો"</string>
     <string name="auto_sync_account_title" msgid="2394463123733529506">"ડેટાને ઑટોમૅટિક રીતે સિંક કરો"</string>
-    <string name="auto_sync_personal_account_title" msgid="6844465157916100655">"વ્યક્તિગત ડેટાનું આપમેળે સમન્વયન કરો"</string>
-    <string name="auto_sync_work_account_title" msgid="2403222633447522376">"કાર્ય ડેટાનું આપમેળે સમન્વયન કરો"</string>
+    <string name="auto_sync_personal_account_title" msgid="6844465157916100655">"વ્યક્તિગત ડેટાને ઑટોમૅટિક રીતે સિંક કરો"</string>
+    <string name="auto_sync_work_account_title" msgid="2403222633447522376">"કાર્ય ડેટાને ઑટોમૅટિક રીતે સિંક કરો"</string>
     <string name="auto_sync_account_summary" msgid="6316230976974033772">"ઍપને ઑટોમૅટિક રીતે ડેટાને રિફ્રેશ કરવા દો"</string>
     <string name="account_sync_title" msgid="1570164819114297154">"એકાઉન્ટ સિંક"</string>
     <string name="account_sync_summary_some_on" msgid="1934556869158274053">"<xliff:g id="ID_2">%2$d</xliff:g> માંથી <xliff:g id="ID_1">%1$d</xliff:g> આઇટમ માટે સમન્વયન ચાલુ છે"</string>
@@ -4188,7 +4188,7 @@
     <string name="enterprise_privacy_location_access" msgid="110406267468274216">"સ્થાન માટેની પરવાનગીઓ"</string>
     <string name="enterprise_privacy_microphone_access" msgid="4586428105675460207">"માઇક્રોફોન માટેની પરવાનગીઓ"</string>
     <string name="enterprise_privacy_camera_access" msgid="2366392786153103482">"કૅમેરા માટેની પરવાનગીઓ"</string>
-    <string name="enterprise_privacy_enterprise_set_default_apps" msgid="6142937923758931242">"ડિફૉલ્ટ ઍપ્લિકેશનો"</string>
+    <string name="enterprise_privacy_enterprise_set_default_apps" msgid="6142937923758931242">"ડિફૉલ્ટ ઍપ"</string>
     <plurals name="enterprise_privacy_number_packages" formatted="false" msgid="1480745164313890415">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ઍપ્લિકેશન</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ઍપ્લિકેશન</item>
@@ -4253,13 +4253,13 @@
     <string name="webview_disabled_for_user" msgid="8057805373224993504">"(વપરાશકર્તા <xliff:g id="USER">%s</xliff:g> માટે અક્ષમ કરેલ)"</string>
     <string name="autofill_app" msgid="3990765434980280073">"સ્વતઃભરણ સેવા"</string>
     <string name="autofill_keywords" msgid="7717726766232862218">"સ્વતઃ, ભરો, સ્વતઃભરણ"</string>
-    <string name="autofill_confirmation_message" msgid="1385894598730361304">"&lt;b&gt;ખાતરી કરો કે તમે આ ઍપ્લિકેશનનો વિશ્વાસ કરો છો&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google આપમેળે&gt;%1$s&lt;/xliff:g&gt; તમારી સ્ક્રીન પર શું છે તેનો ઉપયોગ એ નક્કી કરવા કરે છે કે આપમેળે શું દાખલ થશે."</string>
-    <string name="debug_autofill_category" msgid="6262526615416295645">"આપમેળે ભરવાની સેટિંગ"</string>
+    <string name="autofill_confirmation_message" msgid="1385894598730361304">"&lt;b&gt;ખાતરી કરો કે તમે આ ઍપનો વિશ્વાસ કરો છો&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google ઑટોમૅટિક રીતે ભરવાની સુવિધા&gt;%1$s&lt;/xliff:g&gt; તમારી સ્ક્રીન પર શું છે તેનો ઉપયોગ એ નક્કી કરવા કરે છે કે ઑટોમૅટિક રીતે શું દાખલ થશે."</string>
+    <string name="debug_autofill_category" msgid="6262526615416295645">"ઑટોમૅટિક રીતે ભરવાની સુવિધા"</string>
     <string name="autofill_logging_level_title" msgid="2577340324541102626">"લૉગિંગનું સ્તર"</string>
     <string name="autofill_max_partitions" msgid="125269645910590057">"સત્ર દીઠ મહત્તમ વિનંતીઓ"</string>
     <string name="autofill_max_visible_datasets" msgid="2791081640248423492">"જોઈ શકાતા મહત્તમ ડેટાસેટની સંખ્યા"</string>
     <string name="autofill_reset_developer_options" msgid="7208417230269613101">"ડિફૉલ્ટ મૂલ્યો પર રીસેટ કરો"</string>
-    <string name="autofill_reset_developer_options_complete" msgid="5686061993002179524">"આપમેળે ભરવાના ડેવલપરના વિકલ્પો રીસેટ કરવામાં આવ્યા છે"</string>
+    <string name="autofill_reset_developer_options_complete" msgid="5686061993002179524">"ઑટોમૅટિક રીતે ભરવાના ડેવલપરના વિકલ્પો રીસેટ કરવામાં આવ્યા છે"</string>
     <string name="device_theme" msgid="8992291311481135893">"ઉપકરણની થીમ"</string>
     <string name="default_theme" msgid="5986996377385956138">"ડિફૉલ્ટ"</string>
     <string name="show_operator_name_title" msgid="5056163028128447308">"નેટવર્કનું નામ"</string>
diff --git a/tests/CarDeveloperOptions/res/values-hi/strings.xml b/tests/CarDeveloperOptions/res/values-hi/strings.xml
index b0006dc..a0dbe53 100644
--- a/tests/CarDeveloperOptions/res/values-hi/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-hi/strings.xml
@@ -729,7 +729,7 @@
     <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_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">"दूसरे डिवाइस से जोड़ना वाला कोड लिखें और फिर Return या Enter दबाएं"</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="9138308197078115672">"पिन में अक्षर या प्रतीक शामिल होते हैं"</string>
@@ -1168,7 +1168,7 @@
     <string name="accessibility_category_personal" msgid="1423427301759058762">"व्‍यक्‍तिगत प्रोफ़ाइल खाते"</string>
     <string name="accessibility_work_account_title" msgid="3195468574776888011">"कार्यस्‍थल खाता - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_personal_account_title" msgid="7251761883688839354">"व्‍यक्‍तिगत खाता - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
-    <string name="search_settings" msgid="5809250790214921377">"सर्च"</string>
+    <string name="search_settings" msgid="5809250790214921377">"खोज"</string>
     <string name="display_settings" msgid="1045535829232307190">"डिसप्ले"</string>
     <string name="accelerometer_title" msgid="2427487734964971453">"स्‍क्रीन अपने आप घूमने की सुविधा चालू करें"</string>
     <string name="color_mode_title" msgid="8164858320869449142">"रंग"</string>
@@ -1450,7 +1450,7 @@
     <string name="storage_internal_forget_confirm_title" msgid="331032276130605241">"<xliff:g id="NAME">^1</xliff:g> को भूल जाएं?"</string>
     <string name="storage_internal_forget_confirm" msgid="3052483375203727176">"इस <xliff:g id="NAME">^1</xliff:g> पर संग्रहित सभी ऐप्‍स, फ़ोटो और डेटा हमेशा के लिए खो जाएंगे."</string>
     <string name="storage_detail_apps" msgid="8154648512504196820">"ऐप्लिकेशन"</string>
-    <string name="storage_detail_images" msgid="6996202225684468964">"इमेज"</string>
+    <string name="storage_detail_images" msgid="6996202225684468964">"Images"</string>
     <string name="storage_detail_videos" msgid="6030983354721080849">"वीडियो"</string>
     <string name="storage_detail_audio" msgid="6011098436589663944">"ऑडियो"</string>
     <string name="storage_detail_cached" msgid="5761648455067920683">"संग्रहित डेटा"</string>
@@ -2528,7 +2528,7 @@
     <string name="credentials_install_summary" product="nosdcard" msgid="3426661965567059596">"मेमोरी से प्रमाणपत्र इंस्‍टॉल करें"</string>
     <string name="credentials_install_summary" product="default" msgid="4943897416156671633">"SD कार्ड से प्रमाणपत्र इंस्‍टॉल करें"</string>
     <string name="credentials_reset" msgid="355080737664731678">"क्रेडेंशियल मिटाएं"</string>
-    <string name="credentials_reset_summary" msgid="7622528359699428555">"सभी प्रमाणपत्र मिटाएं"</string>
+    <string name="credentials_reset_summary" msgid="7622528359699428555">"सभी सर्टिफ़िकेट मिटाएं"</string>
     <string name="trusted_credentials" msgid="6989242522455395200">"भरोसेमंद क्रेडेंशियल"</string>
     <string name="trusted_credentials_summary" msgid="7411781319056251582">"भरोसेमंद सीए प्रमाणपत्र दिखाएं"</string>
     <string name="user_credentials" msgid="8365731467650306757">"यूज़र क्रेडेंशियल"</string>
@@ -2899,7 +2899,7 @@
     <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_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>
@@ -2946,9 +2946,9 @@
     <string name="amber_alerts_title" msgid="8274651933750533271">"AMBER अलर्ट"</string>
     <string name="amber_alerts_summary" msgid="7570943549000256418">"बाल अपहरणों के बारे में बुलेटिन पाएं"</string>
     <string name="repeat_title" msgid="507090203366188931">"दोहराएं"</string>
-    <string name="call_manager_enable_title" msgid="6345443572463650308">"कॉल प्रबंधक चालू करें"</string>
+    <string name="call_manager_enable_title" msgid="6345443572463650308">"कॉल मैनेजर चालू करें"</string>
     <string name="call_manager_enable_summary" msgid="6998536841827752058">"इस सेवा को कॉल करने का आपका तरीका प्रबंधित करने दें."</string>
-    <string name="call_manager_title" msgid="1118074011469650421">"कॉल प्रबंधक"</string>
+    <string name="call_manager_title" msgid="1118074011469650421">"कॉल मैनेजर"</string>
     <!-- no translation found for call_manager_summary (1232655174841493040) -->
     <skip />
     <string name="cell_broadcast_settings" msgid="5750066270993255966">"इमरजेंसी के समय सूचनाएं"</string>
@@ -2976,7 +2976,7 @@
     <string name="restriction_nfc_enable_summary_config" msgid="405349698260328073">"जब यह <xliff:g id="DEVICE_NAME">%1$s</xliff:g> किसी अन्य NFC डिवाइस को छुए तब डेटा का लेन-देन होने दें"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3292205836938064931">"जब टैबलेट अन्य डिवाइस को स्पर्श करे तो डेटा ट्रांसफर करने दें"</string>
     <string name="restriction_nfc_enable_summary" product="default" msgid="226439584043333608">"जब फ़ोन दूसरे डिवाइस को टच करे तो डेटा ट्रांसफर करने दें"</string>
-    <string name="restriction_location_enable_title" msgid="358506740636434856">"जगह"</string>
+    <string name="restriction_location_enable_title" msgid="358506740636434856">"जगह की जानकारी"</string>
     <string name="restriction_location_enable_summary" msgid="4159500201124004463">"ऐप को आपकी जगह की जानकारी का इस्तेमाल करने दें"</string>
     <string name="wizard_back" msgid="223654213898117594">"वापस जाएं"</string>
     <string name="wizard_next" msgid="5239664512608113542">"आगे बढ़ें"</string>
@@ -3136,7 +3136,7 @@
     <string name="sound_settings_example_summary" msgid="2091822107298841827">"रिंग की आवाज़ 80% है"</string>
     <string name="media_volume_option_title" msgid="3553411883305505682">"मीडिया की आवाज़"</string>
     <string name="remote_media_volume_option_title" msgid="6355710054191873836">"आवाज़ कास्ट करें"</string>
-    <string name="call_volume_option_title" msgid="5028003296631037334">"कॉल की आवाज़"</string>
+    <string name="call_volume_option_title" msgid="5028003296631037334">"कॉल वॉल्‍यूम"</string>
     <string name="alarm_volume_option_title" msgid="3184076022438477047">"अलार्म की आवाज़"</string>
     <string name="ring_volume_option_title" msgid="2038924918468372264">"रिंग की आवाज़"</string>
     <string name="notification_volume_option_title" msgid="1358512611511348260">"सूचना की आवाज़"</string>
@@ -3792,7 +3792,7 @@
     <string name="zen_access_revoke_warning_dialog_title" msgid="6850994585577513299">"<xliff:g id="APP">%1$s</xliff:g> के लिए परेशान न करें की पहुंच रद्द करें?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="3487422193181311403">"इस ऐप के द्वारा, परेशान न करें के लिए बनाए गए सभी नियम निकाल दिए जाएंगे."</string>
     <string name="ignore_optimizations_on" msgid="4373971641328943551">"ऑप्‍टिमाइज़ ना करें"</string>
-    <string name="ignore_optimizations_off" msgid="4372289432580282870">"ऑप्‍टिमाइज़ करें"</string>
+    <string name="ignore_optimizations_off" msgid="4372289432580282870">"ऑप्टिमाइज़ करें"</string>
     <string name="ignore_optimizations_on_desc" msgid="2904484569799521559">"इससे आपके डिवाइस की बैटरी तेज़ी से खर्च हो सकती है. यह सेटिंग चालू करने के बाद, ऐप्लिकेशन को बैकग्राउंड में बैटरी इस्तेमाल करने से नहीं रोका जाएगा."</string>
     <string name="ignore_optimizations_off_desc" msgid="5598702251817814289">"बेहतर बैटरी जीवनकाल के लिए सुझाया गया"</string>
     <string name="ignore_optimizations_title" msgid="7924345545276166305">"<xliff:g id="APP">%s</xliff:g> को बैटरी ऑप्टिमाइज़ेशन को अनदेखा करने की अनुमति दें?"</string>
@@ -4100,9 +4100,9 @@
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> सेकंड</item>
     </plurals>
     <string name="automatic_storage_manager_settings" msgid="2403621409625820182">"जगह प्रबंधित करें"</string>
-    <string name="automatic_storage_manager_text" msgid="4270379105066667493">"मेमोरी में जगह खाली करने में मदद करने के लिए, मेमोरी प्रबंधक आपके डिवाइस से बैकअप ली गई फ़ोटो और वीडियो निकाल देता है."</string>
+    <string name="automatic_storage_manager_text" msgid="4270379105066667493">"मेमोरी में जगह खाली करने में मदद करने के लिए, मेमोरी मैनेजर आपके डिवाइस से बैकअप ली गई फ़ोटो और वीडियो निकाल देता है."</string>
     <string name="automatic_storage_manager_days_title" msgid="1783767804707813799">"फ़ोटो और वीडियो निकालें"</string>
-    <string name="automatic_storage_manager_preference_title" msgid="4668642150512639466">"मेमोरी प्रबंधक"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="4668642150512639466">"मेमोरी मैनेजर"</string>
     <string name="automatic_storage_manager_master_switch_title" msgid="1456978117739582562">"मेमोरी मैनेजर इस्तेमाल करें"</string>
     <string name="deletion_helper_automatic_title" msgid="4370975149425263205">"ऑटोमैटिक"</string>
     <string name="deletion_helper_manual_title" msgid="1011785013431162078">"मैन्युअल"</string>
@@ -4154,10 +4154,10 @@
     <string name="web_action_section_title" msgid="5563229447734734662">"झटपट ऐप्लिकेशन"</string>
     <string name="instant_apps_settings" msgid="879003203555847537">"झटपट ऐप्लिकेशन से जुड़ी पसंद की सेटिंग"</string>
     <string name="domain_url_section_title" msgid="206403507921518321">"इंस्‍टॉल किए गए ऐप्‍लिकेशन"</string>
-    <string name="automatic_storage_manager_activation_warning" msgid="2630083316417707308">"आपकी जगह का प्रबंधन अब जगह प्रबंधक द्वारा किया जा रहा है"</string>
+    <string name="automatic_storage_manager_activation_warning" msgid="2630083316417707308">"आपकी जगह का प्रबंधन अब जगह मैनेजर द्वारा किया जा रहा है"</string>
     <string name="account_for_section_header" msgid="5975241715840642563">"<xliff:g id="USER_NAME">%1$s</xliff:g> के खाते"</string>
     <string name="configure_section_header" msgid="6988981883075615136">"कॉन्फ़िगर करें"</string>
-    <string name="auto_sync_account_title" msgid="2394463123733529506">"डेटा को अपने आप सिंक करें"</string>
+    <string name="auto_sync_account_title" msgid="2394463123733529506">"डेटा को अपने-आप सिंक होने दें"</string>
     <string name="auto_sync_personal_account_title" msgid="6844465157916100655">"व्यक्तिगत डेटा अपने आप सिंक करें"</string>
     <string name="auto_sync_work_account_title" msgid="2403222633447522376">"दफ़्तर डेटा अपने आप सिंक करें"</string>
     <string name="auto_sync_account_summary" msgid="6316230976974033772">"ऐप्लिकेशन को डेटा अपने-आप रीफ्रे़श करने दें"</string>
@@ -4264,11 +4264,11 @@
     <string name="default_theme" msgid="5986996377385956138">"डिफ़ॉल्ट"</string>
     <string name="show_operator_name_title" msgid="5056163028128447308">"नेटवर्क का नाम"</string>
     <string name="show_operator_name_summary" msgid="6352180285743777497">"स्टेटस बार में नेटवर्क का नाम दिखाएं"</string>
-    <string name="storage_manager_indicator" msgid="4255140732848476875">"जगह प्रबंधक: <xliff:g id="STATUS">^1</xliff:g>"</string>
+    <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="automatic_storage_manager_deactivation_warning" msgid="7867793739491286374">"जगह प्रबंधक को बंद करना चाहते हैं?"</string>
+    <string name="automatic_storage_manager_deactivation_warning" msgid="7867793739491286374">"जगह मैनेजर को बंद करना चाहते हैं?"</string>
     <string name="storage_movies_tv" msgid="7282484273991655296">"फ़िल्में और टीवी ऐप्लिकेशन"</string>
     <string name="carrier_provisioning" msgid="3309125279191534469">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी की नेटवर्क से जुड़ी जानकारी"</string>
     <string name="trigger_carrier_provisioning" msgid="6284005970057901477">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी का नेटवर्क ट्रिगर करें"</string>
diff --git a/tests/CarDeveloperOptions/res/values-hr/strings.xml b/tests/CarDeveloperOptions/res/values-hr/strings.xml
index be961be..c6d1e9d 100644
--- a/tests/CarDeveloperOptions/res/values-hr/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-hr/strings.xml
@@ -3327,9 +3327,9 @@
     <string name="sound_work_settings" msgid="4140215240360927923">"Zvukovi radnog profila"</string>
     <string name="work_use_personal_sounds_title" msgid="531727195073003599">"Upotreba zvuka osobnog profila"</string>
     <string name="work_use_personal_sounds_summary" msgid="2886871383995187441">"Zvukovi su isti za radni i osobni profil"</string>
-    <string name="work_ringtone_title" msgid="5499360583947410224">"Melodija zvona radnog telefona"</string>
-    <string name="work_notification_ringtone_title" msgid="8059159087214025757">"Zadani zvuk radne obavijesti"</string>
-    <string name="work_alarm_ringtone_title" msgid="5328487181385375130">"Zadani zvuk radnog alarma"</string>
+    <string name="work_ringtone_title" msgid="5499360583947410224">"Melodija zvona poslovnog telefona"</string>
+    <string name="work_notification_ringtone_title" msgid="8059159087214025757">"Zadani zvuk poslovne obavijesti"</string>
+    <string name="work_alarm_ringtone_title" msgid="5328487181385375130">"Zadani zvuk poslovnog alarma"</string>
     <string name="work_sound_same_as_personal" msgid="7728560881697159758">"Isto kao osobni profil"</string>
     <string name="work_sync_dialog_title" msgid="4799120971202956837">"Zamijeniti zvukove?"</string>
     <string name="work_sync_dialog_yes" msgid="2110726233746476066">"Zamijeni"</string>
diff --git a/tests/CarDeveloperOptions/res/values-hu/strings.xml b/tests/CarDeveloperOptions/res/values-hu/strings.xml
index eec3eb8..5856393 100644
--- a/tests/CarDeveloperOptions/res/values-hu/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-hu/strings.xml
@@ -916,7 +916,7 @@
     <string name="passpoint_content" msgid="340527524510304327">"A(z) <xliff:g id="NAME">%1$s</xliff:g> hitelesítési adatai"</string>
     <string name="wifi_eap_method" msgid="3752116941487485859">"EAP módszer"</string>
     <string name="please_select_phase2" msgid="5848080896810435677">"Hitelesítés 2. fázisa"</string>
-    <string name="wifi_eap_ca_cert" msgid="1496395241849383785">"CA tanúsítvány"</string>
+    <string name="wifi_eap_ca_cert" msgid="1496395241849383785">"CA-tanúsítvány"</string>
     <string name="wifi_eap_domain" msgid="3298302320003640130">"Domain"</string>
     <string name="wifi_eap_user_cert" msgid="6786839531765719173">"Felhasználói tanúsítvány"</string>
     <string name="wifi_eap_identity" msgid="5280457017705738773">"Azonosság"</string>
@@ -1458,7 +1458,7 @@
     <string name="storage_detail_system" msgid="6784247618772153283">"Rendszer"</string>
     <string name="storage_detail_explore" msgid="8206900269596580264">"<xliff:g id="NAME">^1</xliff:g> felfedezése"</string>
     <string name="storage_detail_dialog_other" msgid="5073511663616043370">"Az Egyéb kategóriába tartoznak az alkalmazások által mentett megosztott fájlok, az internetről, illetve Bluetooth-kapcsolaton keresztül letöltött fájlok, az androidos fájlok stb. \n\nA(z) <xliff:g id="NAME">^1</xliff:g> látható tartalmainak megtekintéséhez koppintson a Felfedezés lehetőségre."</string>
-    <string name="storage_detail_dialog_system" msgid="1472572861360014226">"A rendszer tartalmaz <xliff:g id="VERSION">%s</xliff:g> verziójú Android futtatásához használt fájlokat"</string>
+    <string name="storage_detail_dialog_system" msgid="1472572861360014226">"A rendszer az Android <xliff:g id="VERSION">%s</xliff:g>. verziójának futtatásához használt fájlokat tartalmaz"</string>
     <string name="storage_detail_dialog_user" msgid="1663117417635010371">"Lehetséges, hogy <xliff:g id="USER_0">^1</xliff:g> felhasználó fotókat, zenét, alkalmazásokat vagy más adatokat mentett, amihez <xliff:g id="SIZE">^2</xliff:g> tárhelyet használt fel.\n\nA részleteket megtekintheti, ha átvált a következő felhasználóra: <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="3407283236421089014">"<xliff:g id="NAME">^1</xliff:g> – beállítás"</string>
     <string name="storage_wizard_init_external_title" msgid="6853250619674645478">"Használat hordozható tárolóként"</string>
@@ -2620,7 +2620,7 @@
 %1$s</xliff:g>"</string>
     <string name="sync_gmail" msgid="4457967084840001296">"Gmail"</string>
     <string name="sync_calendar" msgid="6573708019827519372">"Naptár"</string>
-    <string name="sync_contacts" msgid="5687434785723746534">"Címtár"</string>
+    <string name="sync_contacts" msgid="5687434785723746534">"Névjegyek"</string>
     <string name="sync_plug" msgid="6703804441408427257"><font fgcolor="#ffffffff">"Üdvözli a Google Sync!"</font>" \nAz adatok Google-féle szinkronizálása lehetővé teszi, hogy bárhonnan hozzáférjen címtárához, találkozóihoz stb."</string>
     <string name="header_application_sync_settings" msgid="4581847153669774489">"Alkalmazás-szinkronizálási beállítások"</string>
     <string name="header_data_and_synchronization" msgid="400831816068697286">"Adatok és szinkronizálás"</string>
@@ -2747,7 +2747,7 @@
     <string name="vpn_ipsec_identifier" msgid="1230238784830362888">"IPSec-azonosító"</string>
     <string name="vpn_ipsec_secret" msgid="1531503910441962752">"Megosztott IPSec-kulcs"</string>
     <string name="vpn_ipsec_user_cert" msgid="2762078384595366852">"IPSec felhasználói tanúsítvány"</string>
-    <string name="vpn_ipsec_ca_cert" msgid="5537567128766402789">"IPSec CA tanúsítvány"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="5537567128766402789">"IPSec CA-tanúsítvány"</string>
     <string name="vpn_ipsec_server_cert" msgid="3066696943831527934">"IPSec-szervertanúsítvány"</string>
     <string name="vpn_show_options" msgid="7672984921872882859">"Speciális beállítások megjelenítése"</string>
     <string name="vpn_search_domains" msgid="8469394307693909080">"DNS-keresési domainek"</string>
@@ -2815,8 +2815,8 @@
     <string name="credential_contains" msgid="483346955378412119">"A bejegyzés a következőket tartalmazza:"</string>
     <string name="one_userkey" msgid="5349738921509013845">"egy felhasználói kulcs"</string>
     <string name="one_usercrt" msgid="856282310586987313">"egy felhasználói tanúsítvány"</string>
-    <string name="one_cacrt" msgid="4757720453112732485">"egy CA tanúsítvány"</string>
-    <string name="n_cacrts" msgid="7539893176217891549">"%d CA tanúsítvány"</string>
+    <string name="one_cacrt" msgid="4757720453112732485">"egy CA-tanúsítvány"</string>
+    <string name="n_cacrts" msgid="7539893176217891549">"%d CA-tanúsítvány"</string>
     <string name="user_credential_title" msgid="6237611303219831419">"Hitelesítési adatok"</string>
     <string name="user_credential_removed" msgid="6243576567538844852">"A következő hitelesítési adatot törölte a rendszer: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
     <string name="user_credential_none_installed" msgid="4129252817676332368">"Nincsenek telepített felhasználói hitelesítési adatok"</string>
@@ -4203,8 +4203,8 @@
     <string name="enterprise_privacy_ca_certs_personal" msgid="1356447417193483802">"Megbízható hitelesítési adatok a személyes profilban"</string>
     <string name="enterprise_privacy_ca_certs_work" msgid="836419648894546893">"Megbízható hitelesítési adatok a munkaprofilban"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="7953528945502561752">
-      <item quantity="other">Legalább <xliff:g id="COUNT_1">%d</xliff:g> CA tanúsítvány</item>
-      <item quantity="one">Legalább <xliff:g id="COUNT_0">%d</xliff:g> CA tanúsítvány</item>
+      <item quantity="other">Legalább <xliff:g id="COUNT_1">%d</xliff:g> CA-tanúsítvány</item>
+      <item quantity="one">Legalább <xliff:g id="COUNT_0">%d</xliff:g> CA-tanúsítvány</item>
     </plurals>
     <string name="enterprise_privacy_lock_device" msgid="1533125067038409945">"A rendszergazda zárolhatja az eszközt, és új jelszót állíthat be"</string>
     <string name="enterprise_privacy_wipe_device" msgid="7555287990273929922">"A rendszergazda törölheti az összes adatot az eszközről"</string>
diff --git a/tests/CarDeveloperOptions/res/values-hy/strings.xml b/tests/CarDeveloperOptions/res/values-hy/strings.xml
index 5d6c540..0580cae 100644
--- a/tests/CarDeveloperOptions/res/values-hy/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-hy/strings.xml
@@ -474,12 +474,12 @@
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="1473280156532146933">"Ավելի ուշ"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="2816424026528101690">"Բաց թողնե՞լ մատնահետքի կարգավորումը:"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="8139299964344809780">"Դուք ընտրել եք մատնահետքի օգտագործումը որպես հեռախոսն ապակողպելու եղանակներից մեկը: Եթե բաց թողնեք հիմա, ապա ձեզ անհրաժեշտ կլինի կատարել կարգավորումն ավելի ուշ: Կարգավորումը տևում է ընդամենը մոտ մեկ րոպե:"</string>
-    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="tablet" msgid="1384438077720821127">"Պաշտպանեք ձեր պլանշետը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե կորցնեք պլանշետը կամ այն գողանան: Էկրանի կողպումն անհրաժեշտ է նաև մատնահետքը կարգավորելու համար։ Հպեք «Չեղարկել» կոճակին, ապա ավելացրեք PIN կոդ կամ ընտրեք էկրանի կողպման այլ տարբերակ։"</string>
-    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="device" msgid="7207112623501771824">"Պաշտպանեք ձեր սարքը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե կորցնեք սարքը կամ այն գողանան: Էկրանի կողպումն անհրաժեշտ է նաև մատնահետքը կարգավորելու համար։ Հպեք «Չեղարկել» կոճակին, ապա ավելացրեք PIN կոդ կամ ընտրեք էկրանի կողպման այլ տարբերակ։"</string>
-    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="default" msgid="7623975730623531606">"Պաշտպանեք ձեր հեռախոսը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե կորցնեք հեռախոսը կամ այն գողանան: Էկրանի կողպումն անհրաժեշտ է նաև մատնահետքը կարգավորելու համար։ Հպեք «Չեղարկել» կոճակին, ապա ավելացրեք PIN կոդ կամ ընտրեք էկրանի կողպման այլ տարբերակ։"</string>
-    <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Պաշտպանեք ձեր պլանշետը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե կորցնեք պլանշետը կամ այն գողանան: Էկրանի կողպումն անհրաժեշտ է նաև դեմքի ճանաչումը կարգավորելու համար։ Հպեք «Չեղարկել» կոճակին, ապա ավելացրեք PIN կոդ կամ ընտրեք էկրանի կողպման այլ տարբերակ։"</string>
-    <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Պաշտպանեք ձեր սարքը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե կորցնեք սարքը կամ այն գողանան: Էկրանի կողպումն անհրաժեշտ է նաև դեմքի ճանաչումը կարգավորելու համար։ Հպեք «Չեղարկել» կոճակին, ապա ավելացրեք PIN կոդ կամ ընտրեք էկրանի կողպման այլ տարբերակ։"</string>
-    <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Պաշտպանեք ձեր հեռախոսը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե կորցնեք հեռախոսը կամ այն գողանան: Էկրանի կողպումն անհրաժեշտ է նաև դեմքի ճանաչումը կարգավորելու համար։ Հպեք «Չեղարկել» կոճակին, ապա ավելացրեք PIN կոդ կամ ընտրեք էկրանի կողպման այլ տարբերակ։"</string>
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="tablet" msgid="1384438077720821127">"Պաշտպանեք ձեր պլանշետը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե այն կորցնեք կամ գողանան: Էկրանի կողպումն անհրաժեշտ է նաև մատնահետքը կարգավորելու համար։ Հպեք «Չեղարկել» կոճակին, ապա ավելացրեք PIN կոդ կամ ընտրեք էկրանի կողպման այլ տարբերակ։"</string>
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="device" msgid="7207112623501771824">"Պաշտպանեք ձեր սարքը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե այն կորցնեք կամ գողանան: Էկրանի կողպումն անհրաժեշտ է նաև մատնահետքը կարգավորելու համար։ Հպեք «Չեղարկել» կոճակին, ապա ավելացրեք PIN կոդ կամ ընտրեք էկրանի կողպման այլ տարբերակ։"</string>
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="default" msgid="7623975730623531606">"Պաշտպանեք ձեր հեռախոսը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե այն կորցնեք կամ գողանան: Էկրանի կողպումն անհրաժեշտ է նաև մատնահետքը կարգավորելու համար։ Հպեք «Չեղարկել» կոճակին, ապա ավելացրեք PIN կոդ կամ ընտրեք էկրանի կողպման այլ տարբերակ։"</string>
+    <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Պաշտպանեք ձեր պլանշետը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե այն կորցնեք կամ գողանան: Էկրանի կողպումն անհրաժեշտ է նաև դեմքի ճանաչումը կարգավորելու համար։ Հպեք «Չեղարկել» կոճակին, ապա ավելացրեք PIN կոդ կամ ընտրեք էկրանի կողպման այլ տարբերակ։"</string>
+    <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Պաշտպանեք ձեր սարքը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե այն կորցնեք կամ գողանան: Էկրանի կողպումն անհրաժեշտ է նաև դեմքի ճանաչումը կարգավորելու համար։ Հպեք «Չեղարկել» կոճակին, ապա ավելացրեք PIN կոդ կամ ընտրեք էկրանի կողպման այլ տարբերակ։"</string>
+    <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Պաշտպանեք ձեր հեռախոսը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե այն կորցնեք կամ գողանան: Էկրանի կողպումն անհրաժեշտ է նաև դեմքի ճանաչումը կարգավորելու համար։ Հպեք «Չեղարկել» կոճակին, ապա ավելացրեք PIN կոդ կամ ընտրեք էկրանի կողպման այլ տարբերակ։"</string>
     <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Բաց թողնե՞լ PIN-ի կարգավորումը"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Չավելացնե՞լ գաղտնաբառ"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Բաց թողնե՞լ նախշի կարգավորումը"</string>
@@ -674,27 +674,27 @@
     <string name="lockpassword_password_requires_digit" msgid="6856775151626646011">"Պետք է պարունակի առնվազն մեկ թվանշան"</string>
     <string name="lockpassword_password_requires_symbol" msgid="5859035635265756172">"Պետք է պարունակի առնվազն մեկ նշան"</string>
     <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="7383825189441790620">
-      <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> letters</item>
+      <item quantity="one">Պետք է պարունակի առնվազն <xliff:g id="COUNT">%d</xliff:g> տառ</item>
       <item quantity="other">Պետք է պարունակի առնվազն <xliff:g id="COUNT">%d</xliff:g> տառ</item>
     </plurals>
     <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="477315194231617994">
-      <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> lowercase letters</item>
+      <item quantity="one">Պետք է պարունակի առնվազն <xliff:g id="COUNT">%d</xliff:g> փոքրատառ</item>
       <item quantity="other">Պետք է պարունակի առնվազն <xliff:g id="COUNT">%d</xliff:g> փոքրատառ</item>
     </plurals>
     <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="6026476732572657588">
-      <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> uppercase letters</item>
+      <item quantity="one">Պետք է պարունակի առնվազն <xliff:g id="COUNT">%d</xliff:g> մեծատառ</item>
       <item quantity="other">Պետք է պարունակի առնվազն <xliff:g id="COUNT">%d</xliff:g> մեծատառ</item>
     </plurals>
     <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="5072581827825645338">
-      <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> numerical digits</item>
+      <item quantity="one">Պետք է պարունակի առնվազն <xliff:g id="COUNT">%d</xliff:g> թվանշան</item>
       <item quantity="other">Պետք է պարունակի առնվազն <xliff:g id="COUNT">%d</xliff:g> թվանշան</item>
     </plurals>
     <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="8393058207948961650">
-      <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> special symbols</item>
+      <item quantity="one">Պետք է պարունակի առնվազն <xliff:g id="COUNT">%d</xliff:g> հատուկ նշան</item>
       <item quantity="other">Պետք է պարունակի առնվազն <xliff:g id="COUNT">%d</xliff:g> հատուկ նշան</item>
     </plurals>
     <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="3692485784007607387">
-      <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> non-letter characters</item>
+      <item quantity="one">Պետք է պարունակի առնվազն <xliff:g id="COUNT">%d</xliff:g> ոչ-տառային գրանշան</item>
       <item quantity="other">Պետք է պարունակի առնվազն <xliff:g id="COUNT">%d</xliff:g> ոչ-տառային գրանշան</item>
     </plurals>
     <plurals name="lockpassword_password_requires_nonnumerical" formatted="false" msgid="6943707011152180150">
@@ -852,14 +852,14 @@
     <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_wakeup_summary_scoring_disabled" msgid="7067018832237903151">"Օգտագործելու համար ընտրեք ցանցերի վարկանիշի մատակարարին"</string>
     <string name="wifi_poor_network_detection" msgid="7193423327400703073">"Չօգտագործել թույլ կապ"</string>
     <string name="wifi_poor_network_detection_summary" msgid="5539951465985614590">"Չօգտագործել Wi-Fi ցանցը, եթե դրա ինտերնետային կապը թույլ է"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="1976503191780928104">"Օգտագործել միայն լավ ինտերնետային կապ ունեցող ցանցերը"</string>
     <string name="use_open_wifi_automatically_title" msgid="3084513215481454350">"Միանալ բաց ցանցերին"</string>
     <string name="use_open_wifi_automatically_summary" msgid="8338020172673161754">"Ավտոմատ միանալ լավ ազդանշանով բաց ցանցերին"</string>
-    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="1559329344492373028">"Օգտագործելու համար ընտրեք ցանցի վարկանիշի մատակարարը"</string>
-    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="1123080670578756834">"Օգտագործելու համար ընտրեք համատեղելի ցանցի վարկանիշի մատակարարը"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="1559329344492373028">"Օգտագործելու համար ընտրեք ցանցերի վարկանիշի մատակարարին"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="1123080670578756834">"Օգտագործելու համար ընտրեք ցանցերի վարկանիշի համատեղելի մատակարարի"</string>
     <string name="wifi_install_credentials" msgid="5650088113710858289">"Հավաստագրերի տեղադրում"</string>
     <string name="wifi_scan_notify_text" msgid="7614101215028336927">"Տեղորոշման ճշգրտությունը բարելավելու նպատակով հավելվածներն ու ծառայությունները կորոնեն Wi‑Fi ցանցեր՝ նույնիսկ, երբ 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_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>
@@ -980,7 +980,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>
@@ -1287,9 +1287,9 @@
     <string name="sim_change_pin" msgid="1674620855223900785">"SIM PIN"</string>
     <string name="sim_bad_pin" msgid="2409776007569751629">"Սխալ PIN"</string>
     <string name="sim_pins_dont_match" msgid="1076283313667637902">"PIN-երը չեն համընկնում"</string>
-    <string name="sim_change_failed" msgid="8874765697694275459">"Չհաջողվեց փոխել PIN-ը:\nՀնարավոր է` PIN-ը սխալ է:"</string>
+    <string name="sim_change_failed" msgid="8874765697694275459">"Չհաջողվեց փոխել PIN-ը:\nՀնարավոր է՝ PIN-ը սխալ է:"</string>
     <string name="sim_change_succeeded" msgid="8802418023120614533">"SIM քարտի PIN կոդը հաջողությամբ փոխվել է"</string>
-    <string name="sim_lock_failed" msgid="7949781515066772755">"Հնարավոր չէ բացել SIM քարտի կողպված կարգավիճակը:\nՀնարավոր է` սխալ PIN է մուտքագրվել:"</string>
+    <string name="sim_lock_failed" msgid="7949781515066772755">"Հնարավոր չէ բացել SIM քարտի կողպված կարգավիճակը:\nՀնարավոր է՝ սխալ PIN է մուտքագրվել:"</string>
     <string name="sim_pin_disable_failed" msgid="6780973900290546751">"Չհաջողվեց անջատել PIN կոդը"</string>
     <string name="sim_pin_enable_failed" msgid="804897359922298792">"Չհաջողվեց միացնել PIN կոդը"</string>
     <string name="sim_enter_ok" msgid="5103626479976731229">"Հաստատել"</string>
@@ -1593,7 +1593,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>
@@ -1621,11 +1621,11 @@
     <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>
+    <string name="usb_tethering_subtext" product="default" msgid="1573513260339548671">"Տարածել հեռախոսի ինտերնետ կապը USB-ով"</string>
     <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>
@@ -1633,11 +1633,11 @@
     <string name="tethering_help_button_text" msgid="7653022000284543996">"Օգնություն"</string>
     <string name="network_settings_title" msgid="8516526011407061679">"Բջջային ցանց"</string>
     <string name="manage_mobile_plan_title" msgid="3312016665522553062">"Բջջային փաթեթ"</string>
-    <string name="sms_application_title" msgid="7815840568119334679">"SMS-ի հավելված"</string>
-    <string name="sms_change_default_dialog_title" msgid="6301260161969667578">"Փոխե՞լ SMS հավելվածը"</string>
-    <string name="sms_change_default_dialog_text" msgid="8275088077930942680">"Որպես SMS ծրագիր` <xliff:g id="CURRENT_APP">%2$s</xliff:g>-ի փոխարեն օգտագործե՞լ <xliff:g id="NEW_APP">%1$s</xliff:g>-ը:"</string>
-    <string name="sms_change_default_no_previous_dialog_text" msgid="4680224695080527907">"Որպես SMS ծրագիր` օգտագործե՞լ <xliff:g id="NEW_APP">%s</xliff:g>-ը:"</string>
-    <string name="network_scorer_picker_title" msgid="1691073966560952916">"Ցանցերի վարկանիշի աղբյուրը"</string>
+    <string name="sms_application_title" msgid="7815840568119334679">"SMS-ների փոխանակման հավելված"</string>
+    <string name="sms_change_default_dialog_title" msgid="6301260161969667578">"Փոխե՞լ SMS-ների փոխանակման հավելվածը"</string>
+    <string name="sms_change_default_dialog_text" msgid="8275088077930942680">"Որպես SMS-ների փոխանակման հավելված <xliff:g id="CURRENT_APP">%2$s</xliff:g>-ի փոխարեն օգտագործե՞լ <xliff:g id="NEW_APP">%1$s</xliff:g>-ը:"</string>
+    <string name="sms_change_default_no_previous_dialog_text" msgid="4680224695080527907">"Որպես SMS-ների փոխանակման հավելված օգտագործե՞լ <xliff:g id="NEW_APP">%s</xliff:g>-ը:"</string>
+    <string name="network_scorer_picker_title" msgid="1691073966560952916">"Ցանցերի վարկանիշի մատակարար"</string>
     <string name="network_scorer_picker_none_preference" msgid="6448280557733231737">"Չկա"</string>
     <string name="network_scorer_change_active_dialog_title" msgid="4274159562371475090">"Փոխե՞լ Wi-Fi օգնականին:"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="4264089809189760730">"Օգտագործե՞լ <xliff:g id="NEW_APP">%1$s</xliff:g> ծրագիրը <xliff:g id="CURRENT_APP">%2$s</xliff:g>-ի փոխարեն՝ ձեր ցանցային կապերը կառավարելու համար:"</string>
@@ -1670,8 +1670,8 @@
     <string name="location_neighborhood_level" msgid="8459352741296587916">"Թույլատրել ծրագրերին օգտագործել Google-ի տեղակայման ծառայությունները` ձեր տեղադրությունը ավելի արագ որոշելու համար: Անանուն տեղակայման տվյալները կհավաքագրվեն և կուղարկվեն Google-ին:"</string>
     <string name="location_neighborhood_level_wifi" msgid="6120133551482003840">"Տեղադրությունը որոշված է Wi‑Fi-ի օգնությամբ"</string>
     <string name="location_gps" msgid="688049341158297763">"GPS արբանյակներ"</string>
-    <string name="location_street_level" product="tablet" msgid="4459804798444296650">"Թույլատրել հավելվածին օգտագործել GPS-ը` ձեր տեղադրությունը պլանշետում ամրագրելու համար"</string>
-    <string name="location_street_level" product="default" msgid="7407688345675450051">"Թույլատրել հավելվածին օգտագործել GPS-ը` ձեր տեղադրությունը հեռախոսում  ամրագրելու համար"</string>
+    <string name="location_street_level" product="tablet" msgid="4459804798444296650">"Թույլատրել հավելվածին օգտագործել GPS-ը՝ ձեր տեղադրությունը պլանշետում ամրագրելու համար"</string>
+    <string name="location_street_level" product="default" msgid="7407688345675450051">"Թույլատրել հավելվածին օգտագործել GPS-ը՝ ձեր տեղադրությունը հեռախոսում  ամրագրելու համար"</string>
     <string name="assisted_gps" msgid="5411780261117055175">"Օգատգործեք աջակցող GPS-ը"</string>
     <string name="assisted_gps_enabled" msgid="2561022181775725369">"Օգտագործեք սերվերը` GPS-ին միանալու համար (ապագնշեք` ցանցի օգտագործումը նվազեցնելու համար)"</string>
     <string name="assisted_gps_disabled" msgid="6448758788217415937">"Օգտագործել սերվերը GPS աջակցման համար (ապընտրել` GPS-ի արդյունավետությունը բարելավելու համար)"</string>
@@ -1831,12 +1831,12 @@
     <string name="always_allow_bind_appwidgets_text" msgid="2286211654774611037">"Դուք ընտրել եք թույտարել այս ծրագրին ստեղծել վիջեթներ և մուտք գործել իրենց տվյալներ:"</string>
     <string name="auto_launch_disable_text" msgid="8560921288036801416">"Լռելյայները կարգավորված չեն:"</string>
     <string name="clear_activities" msgid="2068014972549235347">"Մաքրել լռելյայնները"</string>
-    <string name="screen_compatibility_text" msgid="1768064020294301496">"Հնարավոր է` այս ծրագիրը մշակված չէ ձեր էկրանի համար: Դուք կարող եք վերահսկել դրա` ձեր էկրանին հարմարեցումը:"</string>
+    <string name="screen_compatibility_text" msgid="1768064020294301496">"Հնարավոր է՝ այս ծրագիրը մշակված չէ ձեր էկրանի համար: Դուք կարող եք վերահսկել դրա` ձեր էկրանին հարմարեցումը:"</string>
     <string name="ask_compatibility" msgid="6687958195768084807">"Հարցնել մեկնարկելիս"</string>
     <string name="enable_compatibility" msgid="1754177974320410195">"Աստիճանակարգել հավելվածները"</string>
     <string name="unknown" msgid="2780743426415501227">"Անհայտ"</string>
     <string name="sort_order_alpha" msgid="6689698854460261212">"Դասակարգել ըստ անունների"</string>
-    <string name="sort_order_size" msgid="3167376197248713027">"Տեսակավորել ըստ չափի"</string>
+    <string name="sort_order_size" msgid="3167376197248713027">"Դասավորել ըստ չափի"</string>
     <string name="sort_order_recent_notification" msgid="5592496977404445941">"Վերջինները"</string>
     <string name="sort_order_frequent_notification" msgid="5640245013098010347">"Առավել հաճախ"</string>
     <string name="show_running_services" msgid="1895994322704667543">"Ցույց տալ ընթացիկ ծառայությունները"</string>
@@ -1888,7 +1888,7 @@
     <string name="app_install_location_title" msgid="5121617802063021720">"Տեղադրման նախընտրած վայրը"</string>
     <string name="app_install_location_summary" msgid="109719780117187797">"Փոխել նոր ծրագրերի համար նախընտրած տեղադրման վայրը"</string>
     <string name="app_disable_dlg_positive" msgid="5508828271100168073">"Անջատել հավելվածը"</string>
-    <string name="app_disable_dlg_text" msgid="9221864774943530281">"Եթե անջատեք այս հավելվածը, համակարգը և այլ հավելվածներ հնարավոր է՝ սխալներով աշխատեն: Դուք չեք կարող ջնջել այս հավելվածը, քանի որ այն նախապես տեղադրված է եղել ձեր սարքում։ Անջատելու դեպքում հավելվածը կդադարի աշխատել և կթաքցվի։"</string>
+    <string name="app_disable_dlg_text" msgid="9221864774943530281">"Եթե անջատեք այս հավելվածը, համակարգը և այլ հավելվածներ հնարավոր է սխալներով աշխատեն: Դուք չեք կարող ջնջել այս հավելվածը, քանի որ այն նախապես տեղադրված է եղել ձեր սարքում։ Անջատելու դեպքում հավելվածը կդադարի աշխատել և կթաքցվի։"</string>
     <string name="app_disable_notifications_dlg_title" msgid="699530661413553928">"Անջատե՞լ ծանուցումները:"</string>
     <string name="app_install_details_group_title" msgid="2909597319422976921">"Խանութ"</string>
     <string name="app_install_details_title" msgid="6954953384372934881">"Հավելվածի մասին"</string>
@@ -2199,7 +2199,7 @@
       <item quantity="other">Միացված է <xliff:g id="COUNT">%1$d</xliff:g> տպման ծառայություն</item>
     </plurals>
     <plurals name="print_jobs_summary" formatted="false" msgid="6180308415569432845">
-      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> print jobs</item>
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> տպելու առաջադրանք</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> տպելու առաջադրանք</item>
     </plurals>
     <string name="print_settings_title" msgid="2886445296786932763">"Տպման ծառայություններ"</string>
@@ -2673,7 +2673,7 @@
     <string name="account_settings_menu_auto_sync_personal" msgid="3235831897309033754">"Ինքնահամաժամացնել անձնական տվյալները"</string>
     <string name="account_settings_menu_auto_sync_work" msgid="5721442464286552815">"Ինքնահամաժամացնել աշխատանքային տվյալները"</string>
     <string name="data_usage_change_cycle" msgid="447761920472170031">"Ցիկլի փոփոխում…"</string>
-    <string name="data_usage_pick_cycle_day" msgid="6319750879145917066">"Ամսվա մի օր` տվյալների օգտագործման աշխատաշրջանը սահմանելու համար`"</string>
+    <string name="data_usage_pick_cycle_day" msgid="6319750879145917066">"Ամսվա մի օր` տվյալների օգտագործման աշխատաշրջանը սահմանելու համար՝"</string>
     <string name="data_usage_empty" msgid="7981405723435034032">"Այս ընթացքում հավելվածները տվյալներ չեն օգտագործել:"</string>
     <string name="data_usage_label_foreground" msgid="2471091128648754601">"Ակտիվ ռեժիմ"</string>
     <string name="data_usage_label_background" msgid="1618794447370396845">"Ֆոնային ռեժիմ"</string>
@@ -2751,8 +2751,8 @@
     <string name="vpn_ipsec_server_cert" msgid="3066696943831527934">"IPSec սերվերի վկայական"</string>
     <string name="vpn_show_options" msgid="7672984921872882859">"Ցույց տալ լրացուցիչ ընտրանքները"</string>
     <string name="vpn_search_domains" msgid="8469394307693909080">"DNS որոնման տիրույթներ"</string>
-    <string name="vpn_dns_servers" msgid="3017453300909321239">"DNS սերվերներ (օրինակ` 8.8.8.8)"</string>
-    <string name="vpn_routes" msgid="3393989650778663742">"Փոխանցման երթուղիներ (օրինակ` 10.0.0.0/8)"</string>
+    <string name="vpn_dns_servers" msgid="3017453300909321239">"DNS սերվերներ (օրինակ՝ 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3393989650778663742">"Փոխանցման երթուղիներ (օրինակ՝ 10.0.0.0/8)"</string>
     <string name="vpn_username" msgid="5357878823189445042">"Օգտանուն"</string>
     <string name="vpn_password" msgid="5325943601523662246">"Գաղտնաբառ"</string>
     <string name="vpn_save_login" msgid="6215503139606646915">"Պահել հաշվի տեղեկությունները"</string>
@@ -2899,7 +2899,7 @@
     <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_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>
@@ -3028,7 +3028,7 @@
     <string name="sim_selection_channel_title" msgid="5671915549529226023">"SIM քարտի ընտրություն"</string>
     <string name="dashboard_title" msgid="3343056553551876215">"Կարգավորումներ"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="4475734332610696843">
-      <item quantity="one">Show %d hidden items</item>
+      <item quantity="one">Ցույց տալ %d թաքնված տարրեր</item>
       <item quantity="other">Ցույց տալ %d թաքնված տարրեր</item>
     </plurals>
     <string name="network_dashboard_title" msgid="8288134139584687806">"Ցանց և ինտերնետ"</string>
@@ -3113,7 +3113,7 @@
     <string name="keywords_fingerprint_settings" msgid="902902368701134163">"մատնահետք, ավելացնել մատնահետք"</string>
     <string name="keywords_display_auto_brightness" msgid="1810596220466483996">"խամրեցված էկրան, հպէկրան, մարտկոց, խելացի պայծառություն, դինամիկ պայծառություն"</string>
     <string name="keywords_display_adaptive_sleep" msgid="1695357782432822811">"խամրած էկրան, քնելու ռեժիմ, մարտկոց, ժամանակի սպառում, ուշադրություն, էկրան, ցուցադրել, անգործուն ռեժիմ"</string>
-    <string name="keywords_auto_rotate" msgid="4320791369951647513">"պտտել, շրջել, պտույտ, ուղղահայաց, հորիզոնական, դիրք, դիմանկար, բնանկար"</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_screen_timeout" msgid="4328381362313993666">"էկրան, կողպման ժամանակը, դադար, կողպէկրան"</string>
@@ -3411,14 +3411,14 @@
       <item quantity="other">Անջատված է <xliff:g id="COUNT_1">%d</xliff:g> հավելվածի համար</item>
     </plurals>
     <plurals name="deleted_channels" formatted="false" msgid="7741359084299446208">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> categories deleted</item>
+      <item quantity="one">Ջնջվել է <xliff:g id="COUNT_1">%d</xliff:g> կատեգորիա</item>
       <item quantity="other">Ջնջվել է <xliff:g id="COUNT_1">%d</xliff:g> կատեգորիա</item>
     </plurals>
     <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="notification_content_block_title" msgid="2805138591864484587">"Ցուցադրել ծանուցումները"</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>
     <string name="notification_channel_badge_title" msgid="8228215248332054612">"Ցույց տալ ծանուցման կետիկը"</string>
@@ -3534,11 +3534,11 @@
     <string name="zen_mode_end_time_next_day_summary_format" msgid="1598612215612648214">"Հաջորդ օրը <xliff:g id="FORMATTED_TIME">%s</xliff:g>-ին"</string>
     <string name="zen_mode_summary_alarms_only_indefinite" msgid="2470936648971337656">"Անորոշ ժամանակով ակտիվացնել «Միայն զարթուցիչը» ռեժիմը"</string>
     <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="7192429395424304796">
-      <item quantity="one">Change to alarms only for <xliff:g id="DURATION">%1$d</xliff:g> minutes (until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Ակտիվացնել «Միայն զարթուցիչը» ռեժիմը <xliff:g id="DURATION">%1$d</xliff:g> րոպեով (մինչև <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
       <item quantity="other">Ակտիվացնել «Միայն զարթուցիչը» ռեժիմը <xliff:g id="DURATION">%1$d</xliff:g> րոպեով (մինչև <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
     </plurals>
     <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="4198430986970707666">
-      <item quantity="one">Change to alarms only for <xliff:g id="DURATION">%1$d</xliff:g> hours until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Ակտիվացնել «Միայն զարթուցիչը» ռեժիմը <xliff:g id="DURATION">%1$d</xliff:g> ժամով մինչև <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
       <item quantity="other">Ակտիվացնել «Միայն զարթուցիչը» ռեժիմը <xliff:g id="DURATION">%1$d</xliff:g> ժամով մինչև <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="2462898862757904560">"Ակտիվացնել «Միայն զարթուցիչը» ռեժիմը մինչև <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>-ը"</string>
@@ -3622,7 +3622,7 @@
       <item quantity="other">Տրամադրվել է <xliff:g id="COUNT_1">%d</xliff:g> թույլտվություն</item>
     </plurals>
     <plurals name="runtime_permissions_summary" formatted="false" msgid="3166036683687471356">
-      <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> of <xliff:g id="COUNT_3">%d</xliff:g> permissions granted</item>
+      <item quantity="one">Տրվել է <xliff:g id="COUNT_3">%d</xliff:g>-ից <xliff:g id="COUNT_2">%d</xliff:g> թույլտվություն</item>
       <item quantity="other">Տրվել է <xliff:g id="COUNT_3">%d</xliff:g>-ից <xliff:g id="COUNT_2">%d</xliff:g> թույլտվություն</item>
     </plurals>
     <plurals name="runtime_permissions_additional_count" formatted="false" msgid="2068102378805218668">
@@ -3637,7 +3637,7 @@
     <string name="filter_personal_apps" msgid="3473268022652904457">"Անձնական"</string>
     <string name="filter_work_apps" msgid="4202483998339465542">"Աշխատանքային"</string>
     <string name="filter_notif_all_apps" msgid="1862666327228804896">"Հավելվածներ՝ բոլորը"</string>
-    <string name="filter_notif_blocked_apps" msgid="5694956954776028202">"Ծանուցումներն անջատած են"</string>
+    <string name="filter_notif_blocked_apps" msgid="5694956954776028202">"Ծանուցումներն անջատված են"</string>
     <string name="filter_notif_urgent_channels" msgid="5000735867167027148">"Կատեգորիաներ՝ հրատապ կարևորություն"</string>
     <string name="filter_notif_low_channels" msgid="6859599463135775287">"Կատեգորիաներ՝ ցածր կարևորություն"</string>
     <string name="filter_notif_blocked_channels" msgid="6110799550327612670">"Կատեգորիաներ՝ անջատված"</string>
@@ -3655,7 +3655,7 @@
     <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>
     <plurals name="domain_urls_apps_summary_on" formatted="false" msgid="3571309605151815405">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> apps opening supported links</item>
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> հավելված կարող է աջակցվող հղումներ բացել</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> հավելված կարող է աջակցվող հղումներ բացել</item>
     </plurals>
     <string name="app_link_open_always" msgid="7723587434377688415">"Բացել այս հավելվածով"</string>
@@ -3699,11 +3699,11 @@
     <string name="show_all_apps" msgid="5442552004569634846">"Սարքի ամբողջ օգտագործումը"</string>
     <string name="hide_extra_apps" msgid="6798261081113299441">"Ցույց տալ հավելվածների օգտագործումը"</string>
     <plurals name="power_high_usage_summary" formatted="false" msgid="4658343710126205199">
-      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> apps behaving abnormally</item>
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> հավելված սխալ է աշխատում</item>
       <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> հավելված սխալ է աշխատում</item>
     </plurals>
     <plurals name="power_high_usage_title" formatted="false" msgid="63134064262760835">
-      <item quantity="one">Apps draining battery</item>
+      <item quantity="one">Հավելվածն արագ սպառում է մարտկոցի լիցքը</item>
       <item quantity="other">Մարտկոցի լիցքն արագ սպառող հավելվածներ</item>
     </plurals>
     <string name="high_power_filter_on" msgid="5294209328473386403">"Առանց օպտիմալացման"</string>
@@ -3772,15 +3772,15 @@
     <string name="memory_details" msgid="5165105904103664110">"Մանրամասներ"</string>
     <string name="memory_use_summary" msgid="7676311343819965850">"Վերջին 3 ժամվա մեջ օգտագործվել է միջինը <xliff:g id="SIZE">%1$s</xliff:g> հիշողություն"</string>
     <string name="no_memory_use_summary" msgid="3966550113388917978">"Վերջին 3 ժամվա մեջ հիշողություն չի օգտագործվել"</string>
-    <string name="sort_avg_use" msgid="78428601253054298">"Տեսակավորել ըստ միջին օգտագործման"</string>
-    <string name="sort_max_use" msgid="322772647893307413">"Տեսակավորել ըստ առավելագույն օգտագործման"</string>
+    <string name="sort_avg_use" msgid="78428601253054298">"Դասավորել ըստ միջին օգտագործման"</string>
+    <string name="sort_max_use" msgid="322772647893307413">"Դասավորել ըստ առավելագույն օգտագործման"</string>
     <string name="memory_performance" msgid="3506743771947250453">"Արդյունավետություն"</string>
     <string name="total_memory" msgid="7352192982476976453">"Ընդհանուր հիշողությունը"</string>
     <string name="average_used" msgid="3022736210190754669">"Միջին օգագործում (%)"</string>
     <string name="free_memory" msgid="4758919141048544927">"Ազատ է"</string>
     <string name="memory_usage_apps" msgid="2839241373381152354">"Հավելվածների օգտագործած հիշողությունը"</string>
     <plurals name="memory_usage_apps_summary" formatted="false" msgid="1235024908546944704">
-      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> apps used memory in the last <xliff:g id="DURATION_1">%2$s</xliff:g></item>
+      <item quantity="one">Վերջին <xliff:g id="DURATION_1">%2$s</xliff:g>ում հիշողությունն օգտագործել է <xliff:g id="COUNT">%1$d</xliff:g> հավելված</item>
       <item quantity="other">Վերջին <xliff:g id="DURATION_1">%2$s</xliff:g>ում հիշողությունն օգտագործել է <xliff:g id="COUNT">%1$d</xliff:g> հավելված</item>
     </plurals>
     <string name="running_frequency" msgid="7545170806968474449">"Հաճախականություն"</string>
@@ -3852,7 +3852,7 @@
     <string name="data_usage_summary_format" msgid="7788095271598602797">"Օգտագործված տվյալներ՝ <xliff:g id="AMOUNT">%1$s</xliff:g>"</string>
     <string name="data_usage_wifi_format" msgid="9028934101966264710">"<xliff:g id="AMOUNT">^1</xliff:g>-ը փոխանցվել է Wi-Fi-ի միջոցով"</string>
     <plurals name="notification_summary" formatted="false" msgid="761061343339229103">
-      <item quantity="one">Off for <xliff:g id="COUNT">%d</xliff:g> apps</item>
+      <item quantity="one">Անջատված է <xliff:g id="COUNT">%d</xliff:g> հավելվածի համար</item>
       <item quantity="other">Անջատված է <xliff:g id="COUNT">%d</xliff:g> հավելվածի համար</item>
     </plurals>
     <string name="notification_summary_none" msgid="5003043219430054784">"Միացված է բոլոր հավելվածների համար"</string>
@@ -4182,7 +4182,7 @@
     <string name="enterprise_privacy_enterprise_installed_packages" msgid="6575025134782391212">"Տեղադրված հավելվածներ"</string>
     <string name="enterprise_privacy_apps_count_estimation_info" msgid="5020730108878608500">"Հավելվածների թիվը մոտավոր է: Հնարավոր է, որ այն չի ներառում Play Խանութից դուրս տեղադրված հավելվածները:"</string>
     <plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="5161417161943060602">
-      <item quantity="one">Minimum <xliff:g id="COUNT_1">%d</xliff:g> apps</item>
+      <item quantity="one">Նվազագույնը <xliff:g id="COUNT_1">%d</xliff:g> հավելված</item>
       <item quantity="other">Նվազագույնը <xliff:g id="COUNT_1">%d</xliff:g> հավելված</item>
     </plurals>
     <string name="enterprise_privacy_location_access" msgid="110406267468274216">"Տեղորոշման թույլտվությունները"</string>
@@ -4190,7 +4190,7 @@
     <string name="enterprise_privacy_camera_access" msgid="2366392786153103482">"Տեսախցիկի թույլտվությունները"</string>
     <string name="enterprise_privacy_enterprise_set_default_apps" msgid="6142937923758931242">"Կանխադրված հավելվածները"</string>
     <plurals name="enterprise_privacy_number_packages" formatted="false" msgid="1480745164313890415">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> apps</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> հավելված</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> հավելված</item>
     </plurals>
     <string name="enterprise_privacy_input_method" msgid="5885916325874284011">"Կանխադրված ստեղնաշար"</string>
@@ -4211,7 +4211,7 @@
     <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="one"><xliff:g id="COUNT_1">%d</xliff:g> attempts</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> փորձ</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> փորձ</item>
     </plurals>
     <string name="do_disclosure_generic" msgid="2925786401209052566">"Այս սարքի կառավարիչը ձեր կազմակերպությունն է։"</string>
@@ -4219,18 +4219,18 @@
     <string name="do_disclosure_learn_more_separator" msgid="702345537118848010">" "</string>
     <string name="learn_more" msgid="6844160787130206258">"Մանրամասն"</string>
     <plurals name="default_camera_app_title" formatted="false" msgid="8762954032197483848">
-      <item quantity="one">Camera apps</item>
+      <item quantity="one">Տեսախցիկի հավելված</item>
       <item quantity="other">Տեսախցիկի հավելվածներ</item>
     </plurals>
     <string name="default_calendar_app_title" msgid="6484001237347739255">"Օրացույցի հավելված"</string>
     <string name="default_contacts_app_title" msgid="1050372162465746272">"Կոնտակտների հավելված"</string>
     <plurals name="default_email_app_title" formatted="false" msgid="6875559046625447168">
-      <item quantity="one">Email client apps</item>
+      <item quantity="one">Էլփոստի սպասառու հավելված</item>
       <item quantity="other">Էլփոստի սպասառու հավելվածներ</item>
     </plurals>
     <string name="default_map_app_title" msgid="6919751358166607185">"Քարտեզի հավելված"</string>
     <plurals name="default_phone_app_title" formatted="false" msgid="7593838689002912108">
-      <item quantity="one">Phone apps</item>
+      <item quantity="one">Հեռախոսի հավելված</item>
       <item quantity="other">Հեռախոսի հավելվածներ</item>
     </plurals>
     <string name="app_names_concatenation_template_2" msgid="8267577900046506189">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
@@ -4259,7 +4259,7 @@
     <string name="autofill_max_partitions" msgid="125269645910590057">"Առավելագույն հարցումների թիվը աշխատաշրջանի համար"</string>
     <string name="autofill_max_visible_datasets" msgid="2791081640248423492">"Տեսանելի տվյալակազմերի առավելագույն քանակը"</string>
     <string name="autofill_reset_developer_options" msgid="7208417230269613101">"Վերականգնել կանխադրված արժեքները"</string>
-    <string name="autofill_reset_developer_options_complete" msgid="5686061993002179524">"Ինքնալրացման կարգավորումները վերակայվեցին"</string>
+    <string name="autofill_reset_developer_options_complete" msgid="5686061993002179524">"Ինքնալրացման կարգավորումները զրոյացվեցին"</string>
     <string name="device_theme" msgid="8992291311481135893">"Սարքի թեման"</string>
     <string name="default_theme" msgid="5986996377385956138">"Կանխադրված"</string>
     <string name="show_operator_name_title" msgid="5056163028128447308">"Ցանցի անունը"</string>
diff --git a/tests/CarDeveloperOptions/res/values-in/strings.xml b/tests/CarDeveloperOptions/res/values-in/strings.xml
index b522fe4..4b87d41 100644
--- a/tests/CarDeveloperOptions/res/values-in/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-in/strings.xml
@@ -107,13 +107,13 @@
     <string name="bluetooth_scan_for_devices" msgid="3215740768422735880">"Memindai perangkat"</string>
     <string name="bluetooth_rename_device" msgid="7862992396452800566">"Ganti nama perangkat ini"</string>
     <string name="bluetooth_rename_button" msgid="8946904845821073267">"Ganti nama"</string>
-    <string name="bluetooth_disconnect_title" msgid="2689706557852333780">"Putuskan sambungan perangkat?"</string>
+    <string name="bluetooth_disconnect_title" msgid="2689706557852333780">"Putuskan hubungan perangkat?"</string>
     <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8920448151607060442">"Sambungan ponsel Anda ke <xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan terputus."</string>
     <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="7322773998151831579">"Sambungan tablet Anda ke <xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan terputus."</string>
-    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="4707569949253450208">"Sambungan perangkat Anda ke <xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan terputus."</string>
-    <string name="bluetooth_disconnect_dialog_ok" msgid="4183522987246110145">"Putuskan sambungan"</string>
+    <string name="bluetooth_disconnect_all_profiles" product="device" msgid="4707569949253450208">"Hubungan perangkat Anda ke <xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan terputus."</string>
+    <string name="bluetooth_disconnect_dialog_ok" msgid="4183522987246110145">"Putuskan hubungan"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="3616298363281495777">"Anda tidak memiliki izin untuk mengubah setelan Bluetooth."</string>
-    <string name="bluetooth_pairing_pref_title" msgid="2904954138013884029">"Sambungkan perangkat baru"</string>
+    <string name="bluetooth_pairing_pref_title" msgid="2904954138013884029">"Hubungkan perangkat baru"</string>
     <string name="bluetooth_is_visible_message" msgid="6341088682252805612">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> dapat dilihat oleh perangkat lain di sekitar saat Setelan Bluetooth dibuka."</string>
     <string name="bluetooth_footer_mac_message" product="default" msgid="335341476746836260">"Alamat Bluetooth ponsel: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_footer_mac_message" product="tablet" msgid="6033609611245782463">"Alamat Bluetooth tablet: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
@@ -152,8 +152,8 @@
     <string name="bluetooth_turning_on" msgid="6935183036449748493">"Menyalakan Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="9214026723789756620">"Mematikan Bluetooth…"</string>
     <string name="bluetooth_connection_permission_request" msgid="2382506002340643398">"Permintaan sambungan bluetooth"</string>
-    <string name="bluetooth_connection_notif_message" msgid="6824654400460127108">"Ketuk untuk menyambung ke \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
-    <string name="bluetooth_connection_dialog_text" msgid="5454660775522235951">"Sambungkan ke \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
+    <string name="bluetooth_connection_notif_message" msgid="6824654400460127108">"Ketuk untuk menghubungkan ke \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
+    <string name="bluetooth_connection_dialog_text" msgid="5454660775522235951">"Hubungkan ke \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="bluetooth_phonebook_request" msgid="3728325388092719230">"Permintaan akses buku telepon"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="2880630715123354820">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ingin mengakses kontak dan histori panggilan. Berikan akses ke <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>?"</string>
     <string name="bluetooth_remember_choice" msgid="5557832673688613557">"Jangan tanya lagi"</string>
@@ -165,7 +165,7 @@
     <string name="bluetooth_device_name_summary" msgid="8661066392056595005">"Terlihat sebagai “<xliff:g id="DEVICE_NAME">^1</xliff:g>” oleh perangkat lain"</string>
     <string name="bluetooth_off_footer" msgid="7658444560543730571">"Aktifkan Bluetooth untuk menghubungkan ke perangkat lain."</string>
     <string name="bluetooth_paired_device_title" msgid="8361860197780425286">"Perangkat Anda"</string>
-    <string name="bluetooth_pairing_page_title" msgid="9053463656712597709">"Sambungkan perangkat baru"</string>
+    <string name="bluetooth_pairing_page_title" msgid="9053463656712597709">"Hubungkan perangkat baru"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3601662966604648212">"Memungkinkan tablet Anda berkomunikasi dengan perangkat Bluetooth di sekitar"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2286727776570956969">"Memungkinkan perangkat Anda berkomunikasi dengan perangkat Bluetooth di sekitar"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="863659221858781186">"Memungkinkan ponsel Anda berkomunikasi dengan perangkat Bluetooth di sekitar"</string>
@@ -178,7 +178,7 @@
     <string name="connected_device_available_call_title" msgid="6774859446815858428">"Perangkat panggilan yang tersedia"</string>
     <string name="connected_device_connected_title" msgid="6255107326608785482">"Tersambung saat ini"</string>
     <string name="connected_device_saved_title" msgid="8270136893488475163">"Perangkat yang tersimpan"</string>
-    <string name="connected_device_add_device_summary" msgid="7960491471270158891">"Bluetooth akan diaktifkan untuk menyambungkan"</string>
+    <string name="connected_device_add_device_summary" msgid="7960491471270158891">"Bluetooth akan diaktifkan untuk menghubungkan"</string>
     <string name="connected_device_connections_title" msgid="9205000271382018428">"Preferensi koneksi"</string>
     <string name="connected_device_previously_connected_title" msgid="225918223397410428">"Perangkat yang sebelumnya tersambung"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="2018789662358162716">"Perangkat yang terhubung sebelumnya"</string>
@@ -219,7 +219,7 @@
     <string name="radio_info_roaming_label" msgid="3131949337031835485">"Roaming:"</string>
     <string name="radio_info_imei_label" msgid="7300156592358133405">"IMEI"</string>
     <string name="radio_info_call_redirect_label" msgid="2679891718182753061">"Pengalihan Panggilan:"</string>
-    <string name="radio_info_ppp_resets_label" msgid="2785162965440312941">"Nomor Setel Ulang PPP Sejak Boot:"</string>
+    <string name="radio_info_ppp_resets_label" msgid="2785162965440312941">"Nomor Reset PPP Sejak Boot:"</string>
     <string name="radio_info_current_network_label" msgid="5785805819312999094">"Jaringan Saat Ini:"</string>
     <string name="radio_info_ppp_received_label" msgid="5217391494757374330">"Data Diterima:"</string>
     <string name="radio_info_gsm_service_label" msgid="7488842563230281026">"Layanan Suara:"</string>
@@ -309,8 +309,8 @@
     <string name="cellular_data_summary" msgid="8817717603450318646">"Izinkan penggunaan data via jaringan seluler"</string>
     <string name="allow_data_usage_title" msgid="5381624105803294315">"Gunakan data saat roaming"</string>
     <string name="roaming" msgid="8860308342135146004">"Roaming"</string>
-    <string name="roaming_enable" msgid="2108142024297441116">"Sambungkan ke layanan data ketika roaming"</string>
-    <string name="roaming_disable" msgid="1915440242079953809">"Sambungkan ke layanan data ketika roaming"</string>
+    <string name="roaming_enable" msgid="2108142024297441116">"Hubungkan ke layanan data ketika roaming"</string>
+    <string name="roaming_disable" msgid="1915440242079953809">"Hubungkan ke layanan data ketika roaming"</string>
     <string name="roaming_reenable_message" msgid="8388505868655113258">"Anda telah kehilangan konektivitas data karena Anda meninggalkan jaringan asal dalam keadaan roaming data dimatikan."</string>
     <string name="roaming_turn_it_on_button" msgid="4370846458830537578">"Hidupkan"</string>
     <string name="roaming_warning" msgid="5488050911277592868">"Anda dapat dikenai biaya yang cukup besar."</string>
@@ -355,7 +355,7 @@
     <string name="security_enable_widgets_title" msgid="1701510007926738088">"Aktifkan widget"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="4408176087132339331">"Dinonaktifkan oleh admin"</string>
     <string name="lockdown_settings_title" msgid="4534779922580115990">"Tampilkan opsi kunci total"</string>
-    <string name="lockdown_settings_summary" msgid="7270756909878256174">"Tampilkan opsi tombol power yang menonaktifkan Smart Lock, buka kunci dengan sidik jari, dan notifikasi di layar kunci"</string>
+    <string name="lockdown_settings_summary" msgid="7270756909878256174">"Tampilkan opsi tombol daya yang menonaktifkan Smart Lock, buka kunci dengan sidik jari, dan notifikasi di layar kunci"</string>
     <string name="trust_agents_extend_unlock_title" msgid="3582017561316089951">"Perangkat dipercaya memperpanjang buka kunci"</string>
     <string name="trust_agents_extend_unlock_summary" msgid="3543997596586078084">"Jika diaktifkan, perangkat dipercaya akan membuat perangkat tetap tidak terkunci untuk waktu yang lebih lama, namun tidak dapat lagi membuka perangkat yang terkunci."</string>
     <string name="trust_lost_locks_screen_title" msgid="3094736590690459372">"Kunci layar saat kepercayaan hilang"</string>
@@ -449,9 +449,9 @@
     <string name="setup_fingerprint_enroll_skip_title" msgid="763018850721691594">"Lewati sidik jari?"</string>
     <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="8849928362049018680">"Penyiapan sidik jari hanya memerlukan waktu 1 atau 2 menit. Jika langkah ini dilewati, selanjutnya Anda dapat menambahkan sidik jari di setelan."</string>
     <string name="lock_screen_intro_skip_title" msgid="5307431665496346914">"Lewati kunci layar?"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7553945981266845264">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak akan dapat mencegah orang lain menggunakan tablet ini jika hilang, dicuri, atau disetel ulang."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="1378243257238015603">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak akan dapat mencegah orang lain menggunakan perangkat ini jika hilang, dicuri, atau disetel ulang."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="8395540117461339748">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak akan dapat mencegah orang lain ponsel perangkat ini jika hilang, dicuri, atau disetel ulang."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7553945981266845264">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak akan dapat mencegah orang lain menggunakan tablet ini jika hilang, dicuri, atau direset."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="1378243257238015603">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak akan dapat mencegah orang lain menggunakan perangkat ini jika hilang, dicuri, atau direset."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="8395540117461339748">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak akan dapat mencegah orang lain ponsel perangkat ini jika hilang, dicuri, atau direset."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="7572334562915795226">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak akan dapat mencegah orang lain menggunakan tablet ini jika hilang atau dicuri."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3819285334459763813">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak akan dapat mencegah orang lain menggunakan perangkat ini jika hilang atau dicuri."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="5361573789585652826">"Fitur perlindungan perangkat tidak akan diaktifkan. Anda tidak akan dapat mencegah orang lain menggunakan ponsel ini jika hilang atau dicuri."</string>
@@ -490,7 +490,7 @@
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="1415709674142168770">"Pendaftaran tidak selesai"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="498951203761192366">"Waktu pendaftaran sidik jari habis. Coba lagi."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="7896295829530444810">"Pendaftaran sidik jari tidak berhasil. Coba lagi atau gunakan jari lain."</string>
-    <string name="fingerprint_enroll_button_add" msgid="6335782936874996629">"Tambahkan yang lain"</string>
+    <string name="fingerprint_enroll_button_add" msgid="6335782936874996629">"Tambahkan lainnya"</string>
     <string name="fingerprint_enroll_button_next" msgid="6419214079104413695">"Berikutnya"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="5831834311961551423">"Selain membuka kunci ponsel, Anda juga dapat menggunakan sidik jari untuk mengotorisasi pembelian dan akses aplikasi. "<annotation id="url">"Pelajari lebih lanjut"</annotation></string>
     <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7954742554236652690">" Opsi layar kunci dinonaktifkan. Untuk mempelajari lebih lanjut, hubungi admin organisasi Anda. "<annotation id="admin_details">"Detail selengkapnya"</annotation>\n\n"Anda tetap dapat menggunakan sidik jari untuk mengotorisasi pembelian dan akses aplikasi. "<annotation id="url">"Pelajari lebih lanjut"</annotation></string>
@@ -508,8 +508,8 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="2292129135369853167">"Enkripsi tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="3110852053238357832">"Enkripsi ponsel"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="2438498691741626642">"Dienkripsi"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="9142792050252407734">"Anda dapat mengenkripsi akun, setelan, aplikasi yang didownload serta datanya, media, dan file lainnya. Setelah mengenkripsi tablet, anggaplah Anda telah menyiapkan kunci layar (pola, PIN numerik, atau sandi), Anda perlu membuka layar untuk mendekripsi tablet setiap kali menyalakannya. Satu-satunya cara lain untuk mendekripsi adalah mengembalikannya ke setelan pabrik yang akan menghapus semua data Anda.\n\nProses enkripsi membutuhkan waktu satu jam atau lebih. Anda perlu memulainya dengan baterai yang terisi penuh dan mencolokkan tablet ke sumber listrik selama proses berlangsung. Jika Anda menghentikannya, semua atau beberapa data Anda akan hilang."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="1996334685607444282">"Anda dapat mengenkripsi akun, setelan, aplikasi yang didownload serta datanya, media, dan file lainnya. Setelah mengenkripsi ponsel, anggaplah Anda telah menyiapkan kunci layar (pola, PIN numerik, atau sandi), Anda perlu membuka layar untuk mendekripsi ponsel setiap kali menyalakannya. Satu-satunya cara lain untuk mendekripsi adalah mengembalikannya ke setelan pabrik yang akan menghapus semua data Anda.\n\nProses enkripsi membutuhkan waktu satu jam atau lebih. Anda perlu memulainya dengan baterai yang terisi penuh dan mencolokkan ponsel ke sumber listrik selama proses berlangsung. Jika Anda menghentikannya, semua atau beberapa data Anda akan hilang."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="9142792050252407734">"Anda dapat mengenkripsi akun, setelan, aplikasi yang didownload serta datanya, media, dan file lainnya. Setelah mengenkripsi tablet dan menyiapkan kunci layar (pola, PIN numerik, atau sandi), Anda harus membuka layar untuk mendekripsi tablet setiap kali menyalakannya. Satu-satunya cara lain untuk mendekripsi adalah mengembalikannya ke setelan pabrik yang akan menghapus semua data.\n\nProses enkripsi membutuhkan waktu satu jam atau lebih. Anda harus memulainya dengan baterai yang terisi penuh dan mencolokkan tablet ke sumber listrik selama proses berlangsung. Jika Anda menghentikannya, semua atau sebagian data akan hilang."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="1996334685607444282">"Anda dapat mengenkripsi akun, setelan, aplikasi yang didownload serta datanya, media, dan file lainnya. Setelah mengenkripsi ponsel dan menyiapkan kunci layar (pola, PIN numerik, atau sandi), Anda harus membuka layar untuk mendekripsi ponsel setiap kali menyalakannya. Satu-satunya cara lain untuk mendekripsi adalah mengembalikannya ke setelan pabrik yang akan menghapus semua data.\n\nProses enkripsi membutuhkan waktu satu jam atau lebih. Anda harus memulainya dengan baterai yang terisi penuh dan mencolokkan ponsel ke sumber listrik selama proses berlangsung. Jika Anda menghentikannya, semua atau sebagian data akan hilang."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="7918671468758813824">"Enkripsi tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="8737394386627318489">"Enkripsi ponsel"</string>
     <string name="crypt_keeper_low_charge_text" msgid="1422879728632636311">"Isi daya baterai Anda dan coba lagi."</string>
@@ -529,11 +529,11 @@
     <string name="crypt_keeper_warn_wipe" msgid="700814581500057050">"Peringatan: Perangkat Anda akan dihapus setelah <xliff:g id="COUNT">^1</xliff:g> percobaan gagal lagi dalam pembukaan kunci!"</string>
     <string name="crypt_keeper_enter_password" msgid="726933635335219421">"Ketikkan sandi Anda"</string>
     <string name="crypt_keeper_failed_title" msgid="1906382607060855782">"Enkripsi gagal"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="7844833877734529625">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data pada tablet Anda tidak dapat diakses lagi. \n\n Untuk terus menggunakan tablet, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan tablet setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="2895589681839090312">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data di ponsel Anda tidak dapat diakses lagi. \n\n Untuk terus menggunakan ponsel, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan ponsel setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="7844833877734529625">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data pada tablet tidak dapat diakses lagi. \n\n Untuk terus menggunakan tablet, Anda harus mengembalikannya ke setelan pabrik. Saat menyiapkan tablet setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google Anda."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="2895589681839090312">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data di ponsel tidak dapat diakses lagi. \n\n Untuk terus menggunakan ponsel, Anda harus mengembalikannya ke setelan pabrik. Saat menyiapkan ponsel setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google Anda."</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="6561535293845985713">"Dekripsi gagal"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="7018748502706237323">"Sandi yang Anda masukkan benar, namun sayangnya data rusak. \n\nUntuk melanjutkan dengan tablet, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan tablet setelah disetel ulang, akan ada kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="5798580588985326937">"Sandi yang Anda masukkan benar, namun sayangnya data rusak. \n\nUntuk melanjutkan dengan ponsel, Anda perlu mengembalikannya ke setelan pabrik. Jika Anda menyiapkan ponsel setelah setel ulang, akan ada kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="7018748502706237323">"Sandi yang Anda masukkan benar, namun sayangnya data rusak. \n\nUntuk melanjutkan dengan tablet, Anda harus mengembalikannya ke setelan pabrik. Saat menyiapkan tablet setelah direset, akan ada kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google Anda."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="5798580588985326937">"Sandi yang Anda masukkan benar, namun sayangnya data rusak. \n\nUntuk melanjutkan dengan ponsel, Anda harus mengembalikannya ke setelan pabrik. Jika Anda menyiapkan ponsel setelah reset, akan ada kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google Anda."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4744137470890459582">"Beralih metode masukan"</string>
     <string name="suggested_lock_settings_title" msgid="1518155558803371661">"Amankan ponsel Anda"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="1861066918594412519">"Setel kunci layar untuk melindungi tablet"</string>
@@ -742,7 +742,7 @@
     <string name="bluetooth_display_passkey_pin_msg" msgid="5909423849232791647">"Untuk menyandingkan dengan:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Ketikkan:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, kemudian tekan Kembali atau Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="7474404818877079813">"Izinkan akses ke kontak dan histori panggilan Anda"</string>
     <string name="bluetooth_error_title" msgid="5718761586633101960"></string>
-    <string name="bluetooth_connecting_error_message" msgid="8473359363469518478">"Tidak dapat tersambung ke <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_connecting_error_message" msgid="8473359363469518478">"Tidak dapat terhubung ke <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="457781003962324807">"Memindai perangkat"</string>
     <string name="bluetooth_search_for_devices" msgid="6796307228261078451">"Segarkan"</string>
     <string name="bluetooth_searching_for_devices" msgid="7820814625522702494">"Menelusuri..."</string>
@@ -751,15 +751,15 @@
     <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>
+    <string name="bluetooth_pairing_dialog_title" msgid="7900515495932064945">"Sambungkan dengan perangkat ini?"</string>
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7395493311980018460">"Bagikan buku telepon?"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="2103132762434487717">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ingin mengakses kontak dan histori panggilan Anda."</string>
-    <string name="bluetooth_pairing_dialog_paring_request" msgid="5513953935086446387">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ingin menyandingkan dengan Bluetooth. Saat tersambung, perangkat dapat mengakses kontak &amp; histori panggilan Anda."</string>
+    <string name="bluetooth_pairing_dialog_paring_request" msgid="5513953935086446387">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ingin terhubung dengan Bluetooth. Saat terhubung, perangkat dapat mengakses kontak &amp; histori panggilan."</string>
     <string name="bluetooth_preference_found_media_devices" msgid="5748539613567836379">"Perangkat yang tersedia"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="4190090666412408576">"Perangkat tak tersedia"</string>
-    <string name="bluetooth_device_context_connect" msgid="1812090541371432890">"Sambungkan"</string>
+    <string name="bluetooth_device_context_connect" msgid="1812090541371432890">"Hubungkan"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8085015949275771802">"Putuskan"</string>
-    <string name="bluetooth_device_context_pair_connect" msgid="1503322591778810032">"Sandingkan &amp; sambungkan"</string>
+    <string name="bluetooth_device_context_pair_connect" msgid="1503322591778810032">"Sandingkan &amp; hubungkan"</string>
     <string name="bluetooth_device_context_unpair" msgid="250588431708253041">"Menghapus penyandingan"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="4519151805677280077">"Putuskan &amp; lepaskan pasangan"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="423463405499392444">"Opsi…"</string>
@@ -768,7 +768,7 @@
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6255367297830430459">"Saat Bluetooth aktif, perangkat dapat berkomunikasi dengan perangkat Bluetooth terdekat lainnya."</string>
     <string name="bluetooth_scanning_on_info_message" msgid="5460370815156050550">"Jika Bluetooth diaktifkan, perangkat Anda dapat berkomunikasi dengan perangkat Bluetooth di sekitar.\n\nUntuk menyempurnakan pengalaman menggunakan perangkat, aplikasi dan layanan tetap dapat memindai perangkat di sekitar kapan saja, meski Bluetooth nonaktif. Ini dapat digunakan, misalnya, untuk menyempurnakan fitur dan layanan berbasis lokasi. Anda dapat mengubahnya di "<annotation id="link">"setelan pemindaian"</annotation>"."</string>
     <string name="ble_scan_notify_text" msgid="6290170236546386932">"Untuk meningkatkan akurasi lokasi, aplikasi dan layanan sistem tetap dapat mendeteksi perangkat Bluetooth. Anda dapat mengubahnya di <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>setelan pemindaian<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
-    <string name="bluetooth_connect_failed" msgid="1151234676456333786">"Tidak dapat tersambung. Coba lagi."</string>
+    <string name="bluetooth_connect_failed" msgid="1151234676456333786">"Tidak dapat terhubung. Coba lagi."</string>
     <string name="device_details_title" msgid="726517818032923222">"Detail perangkat"</string>
     <string name="bluetooth_device_mac_address" msgid="5328203122581150405">"Alamat Bluetooth perangkat: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="3669848977755142047">"Lupakan perangkat?"</string>
@@ -776,7 +776,7 @@
     <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="4696157463230518866">"Tablet Anda tidak akan disambungkan lagi dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_body" product="device" msgid="6385091489719875730">"Perangkat Anda tidak akan disambungkan lagi dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="8485211340349958886">"Lupakan perangkat"</string>
-    <string name="bluetooth_connect_specific_profiles_title" msgid="2381509181266180406">"Sambungkan ke…"</string>
+    <string name="bluetooth_connect_specific_profiles_title" msgid="2381509181266180406">"Hubungkan ke…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="8072503764470451567">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dilepas sambungannya dari audio media."</string>
     <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>
@@ -784,8 +784,8 @@
     <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>
+    <string name="bluetooth_device_advanced_online_mode_title" msgid="7665622268007450665">"Hubungkan"</string>
+    <string name="bluetooth_device_advanced_online_mode_summary" msgid="4180673788239241086">"Hubungkan ke perangkat Bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="1414487572426490659">"Gunakan untuk"</string>
     <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>
@@ -856,8 +856,8 @@
     <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 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_title" msgid="3084513215481454350">"Hubungkan ke jaringan terbuka"</string>
+    <string name="use_open_wifi_automatically_summary" msgid="8338020172673161754">"Otomatis hubungkan ke jaringan publik berkualitas tinggi"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="1559329344492373028">"Untuk menggunakan, pilih penyedia rating jaringan"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="1123080670578756834">"Untuk menggunakan, pilih penyedia rating jaringan yang kompatibel"</string>
     <string name="wifi_install_credentials" msgid="5650088113710858289">"Instal sertifikat"</string>
@@ -905,7 +905,7 @@
     <string name="wifi_ssid_hint" msgid="5010024648106585165">"Masukkan SSID"</string>
     <string name="wifi_security" msgid="9136702039496152831">"Keamanan"</string>
     <string name="wifi_hidden_network" msgid="6647772204699776833">"Jaringan tersembunyi"</string>
-    <string name="wifi_hidden_network_warning" msgid="8182333050353796473">"Jika router tidak menyiarkan ID jaringan, namun Anda ingin menyambungkannya di masa mendatang, Anda dapat menyetel jaringan sebagai tersembunyi.\n\nTindakan ini dapat menyebabkan risiko keamanan karena ponsel secara berkala akan menyiarkan sinyal untuk menemukan jaringan.\n\nMenyetel jaringan sebagai tersembunyi tidak akan mengubah setelan router."</string>
+    <string name="wifi_hidden_network_warning" msgid="8182333050353796473">"Jika router tidak menyiarkan ID jaringan, namun Anda ingin menghubungkannya di masa mendatang, Anda dapat menyetel jaringan sebagai tersembunyi.\n\nTindakan ini dapat menyebabkan risiko keamanan karena ponsel secara berkala akan menyiarkan sinyal untuk menemukan jaringan.\n\nMenyetel jaringan sebagai tersembunyi tidak akan mengubah setelan router."</string>
     <string name="wifi_signal" msgid="696548364467704808">"Kekuatan sinyal"</string>
     <string name="wifi_status" msgid="3439931558930689940">"Status"</string>
     <string name="tx_wifi_speed" msgid="2571810085003261073">"Kecepatan pengiriman link"</string>
@@ -937,7 +937,7 @@
     <string name="wifi_dpp_add_device_to_network" msgid="8871041525483253430">"Tambahkan perangkat"</string>
     <string name="wifi_dpp_center_qr_code" msgid="3826108361797476758">"Posisikan kode QR di tengah jendela kamera untuk menambahkan perangkat ke “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code" msgid="6021600592661235546">"Pindai kode QR"</string>
-    <string name="wifi_dpp_scan_qr_code_join_network" msgid="3085162928804379545">"Posisikan kode QR di tengah jendela kamera untuk menyambungkan ke “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
+    <string name="wifi_dpp_scan_qr_code_join_network" msgid="3085162928804379545">"Posisikan kode QR di tengah jendela kamera untuk menghubungkan ke “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="5682308317067290738">"Hubungkan ke Wi‑Fi dengan memindai kode QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="1724161216219646284">"Bagikan Wi‑Fi"</string>
     <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4357387474444884759">"Pindai kode QR ini untuk terhubung ke “<xliff:g id="SSID">%1$s</xliff:g>” dan membagikan sandi"</string>
@@ -950,7 +950,7 @@
     <string name="wifi_dpp_failure_not_supported" msgid="111779621766171626">"Penambahan “<xliff:g id="SSID">%1$s</xliff:g>” tidak didukung oleh perangkat ini"</string>
     <string name="wifi_dpp_check_connection_try_again" msgid="7144663015219170999">"Periksa koneksi dan coba lagi"</string>
     <string name="wifi_dpp_choose_network" msgid="6251424431594491691">"Pilih jaringan"</string>
-    <string name="wifi_dpp_choose_network_to_connect_device" msgid="6385259857886784285">"Untuk menyambungkan perangkat Anda, pilih jaringan"</string>
+    <string name="wifi_dpp_choose_network_to_connect_device" msgid="6385259857886784285">"Untuk menghubungkan perangkat, pilih jaringan"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="6454198064645462446">"Tambahkan perangkat ini ke “<xliff:g id="SSID">%1$s</xliff:g>”?"</string>
     <string name="wifi_dpp_wifi_shared_with_device" msgid="5713765471758272471">"Wi‑Fi dibagikan dengan perangkat"</string>
     <string name="wifi_dpp_add_another_device" msgid="3698441567235301565">"Tambahkan perangkat lain"</string>
@@ -964,7 +964,7 @@
     <string name="wifi_dpp_wifi_password" msgid="8007558344032612455">"Sandi Wi‑Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="6172326289042241924">"Sandi hotspot: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_add_device" msgid="1347056725253936358">"Tambahkan perangkat"</string>
-    <string name="wifi_dpp_connect_network_using_qr_code" msgid="115993715600532357">"Sambungkan ke jaringan ini menggunakan kode QR"</string>
+    <string name="wifi_dpp_connect_network_using_qr_code" msgid="115993715600532357">"Hubungkan ke jaringan ini menggunakan kode QR"</string>
     <string name="retry" msgid="8500839563577344702">"Coba lagi"</string>
     <string name="wifi_shared" msgid="5054256778276524960">"Berbagi dengan pengguna perangkat lain"</string>
     <string name="wifi_unchanged" msgid="6804964646942333992">"(tidak diubah)"</string>
@@ -979,14 +979,14 @@
     <string name="wifi_wps_available_first_item" msgid="3221671453930485243">"WPS tersedia"</string>
     <string name="wifi_wps_available_second_item" msgid="5703265526619705185">" (WPS tersedia)"</string>
     <string name="wifi_carrier_connect" msgid="7202618367339982884">"Jaringan Wi‑Fi operator"</string>
-    <string name="wifi_carrier_content" msgid="3467402515071949783">"Sambungkan melalui <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_carrier_content" msgid="3467402515071949783">"Hubungkan melalui <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="7811846312032594248">"Untuk meningkatkan ketepatan lokasi dan untuk tujuan lainnya, <xliff:g id="APP_NAME">%1$s</xliff:g> ingin mengaktifkan pemindaian jaringan, bahkan saat Wi-Fi sedang tidak aktif.\n\nIzinkan ini untuk semua aplikasi yang ingin memindai?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="556993843641750002">"Untuk menonaktifkannya, buka Lanjutan di menu luapan."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="8857664849515496237">"Izinkan"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="6190909841125369403">"Tolak"</string>
-    <string name="wifi_hotspot_title" msgid="2631956539767069385">"Login untuk menyambungkan?"</string>
-    <string name="wifi_hotspot_message" msgid="6762452611090766607">"<xliff:g id="APP_NAME">%1$s</xliff:g> mewajibkan Anda login secara online sebelum menyambung ke jaringan."</string>
-    <string name="wifi_hotspot_connect" msgid="409079339360849653">"SAMBUNGKAN"</string>
+    <string name="wifi_hotspot_title" msgid="2631956539767069385">"Login agar terhubung?"</string>
+    <string name="wifi_hotspot_message" msgid="6762452611090766607">"<xliff:g id="APP_NAME">%1$s</xliff:g> mewajibkan Anda login secara online sebelum menghubungkan ke jaringan."</string>
+    <string name="wifi_hotspot_connect" msgid="409079339360849653">"HUBUNGKAN"</string>
     <string name="no_internet_access_text" msgid="7093326244145734504">"Jaringan ini tidak memiliki akses internet. Tetap hubungkan?"</string>
     <string name="partial_connectivity_text" msgid="2142157808079235684">"Beberapa aplikasi dan layanan mungkin tidak berfungsi karena konektivitas terbatas. Tetap gunakan?"</string>
     <string name="no_internet_access_remember" msgid="1368137189939004202">"Jangan tanya lagi untuk jaringan ini"</string>
@@ -995,14 +995,14 @@
     <string name="lost_internet_access_switch" msgid="9218006455779873700">"Beralih ke seluler"</string>
     <string name="lost_internet_access_cancel" msgid="6577871064062518744">"Tetap di Wi-Fi"</string>
     <string name="lost_internet_access_persist" msgid="6368659013482055611">"Jangan tampilkan lagi"</string>
-    <string name="wifi_connect" msgid="5653612760223533650">"Sambungkan"</string>
+    <string name="wifi_connect" msgid="5653612760223533650">"Hubungkan"</string>
     <string name="wifi_turned_on_message" msgid="3377779146238242894">"Wi-Fi diaktifkan"</string>
     <!-- no translation found for wifi_connected_to_message (2875589636437599620) -->
     <skip />
     <string name="wifi_connecting" msgid="384192498836395892">"Menyambungkan…"</string>
     <!-- no translation found for wifi_disconnect (4633284839749161400) -->
     <skip />
-    <string name="wifi_failed_connect_message" msgid="1911393291965160995">"Gagal menyambung ke jaringan"</string>
+    <string name="wifi_failed_connect_message" msgid="1911393291965160995">"Gagal menghubungkan ke jaringan"</string>
     <string name="wifi_not_in_range_message" msgid="7619742052777530971">"Jaringan di luar jangkauan"</string>
     <string name="wifi_forget" msgid="8257999175003213594">"Lupakan"</string>
     <string name="wifi_modify" msgid="4709189827578923892">"Ubah"</string>
@@ -1048,13 +1048,13 @@
     <string name="wifi_p2p_menu_rename" msgid="2129974878377065488">"Ganti nama perangkat"</string>
     <string name="wifi_p2p_peer_devices" msgid="8232126067045093382">"Perangkat P2P"</string>
     <string name="wifi_p2p_remembered_groups" msgid="1356458238836730346">"Grup yang diingat"</string>
-    <string name="wifi_p2p_failed_connect_message" msgid="6103436959132424093">"Tidak dapat menyambung."</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="6103436959132424093">"Tidak dapat menghubungkan."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="638656605352538706">"Gagal mengubah nama perangkat."</string>
     <string name="wifi_p2p_disconnect_title" msgid="915880461655863812">"Putuskan sambungan?"</string>
     <string name="wifi_p2p_disconnect_message" msgid="3745286932812740784">"Jika diputuskan, sambungan Anda dengan <xliff:g id="PEER_NAME">%1$s</xliff:g> akan berakhir."</string>
     <string name="wifi_p2p_disconnect_multiple_message" msgid="6051173422663731688">"Jika diputuskan, sambungan Anda dengan <xliff:g id="PEER_NAME">%1$s</xliff:g> dan <xliff:g id="PEER_COUNT">%2$s</xliff:g> perangkat lain akan berakhir."</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="2465200999145769427">"Batalkan undangan?"</string>
-    <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_cancel_connect_message" msgid="3752679335020392154">"Apakah Anda ingin membatalkan undangan untuk terhubung 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 koneksi internet atau konten dengan perangkat lain"</string>
@@ -1069,7 +1069,7 @@
     <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 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_title" msgid="7416022590415189590">"Otomatis nonaktifkan hotspot"</string>
     <string name="wifi_hotspot_auto_off_summary" msgid="3866769400624802105">"Hotspot Wi-Fi akan dinonaktifkan jika tidak ada perangkat yang terhubung"</string>
     <string name="wifi_tether_starting" msgid="7676952148471297900">"Menyalakan hotspot..."</string>
     <string name="wifi_tether_stopping" msgid="7478561853791953349">"Mematikan hotspot..."</string>
@@ -1420,7 +1420,7 @@
     <string name="storage_menu_free" msgid="6586253660759145508">"Kosongkan ruang"</string>
     <string name="storage_menu_manage" msgid="461380717863926516">"Kelola penyimpanan"</string>
     <string name="storage_title_usb" msgid="2015671467177303099">"Koneksi komputer USB"</string>
-    <string name="usb_connection_category" msgid="2888975803638116041">"Sambungkan sebagai"</string>
+    <string name="usb_connection_category" msgid="2888975803638116041">"Hubungkan sebagai"</string>
     <string name="usb_mtp_title" msgid="6893938968831995500">"Perangkat media (MTP)"</string>
     <string name="usb_mtp_summary" msgid="4427354560399094322">"Memungkinkan Anda mentransfer file media di Windows, atau menggunakan Transfer File Android di Mac (lihat www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="6629335976394685361">"Kamera (PTP)"</string>
@@ -1457,7 +1457,7 @@
     <string name="storage_detail_other" msgid="9164851767437306618">"Lainnya"</string>
     <string name="storage_detail_system" msgid="6784247618772153283">"Sistem"</string>
     <string name="storage_detail_explore" msgid="8206900269596580264">"Jelajahi <xliff:g id="NAME">^1</xliff:g>"</string>
-    <string name="storage_detail_dialog_other" msgid="5073511663616043370">"Lainnya meliputi file bersama yang disimpan oleh aplikasi, file yang didownload dari internet atau Bluetooth, file Android, dan sebagainya. \n\nUntuk melihat konten <xliff:g id="NAME">^1</xliff:g> yang ditampilkan, ketuk Jelajahi."</string>
+    <string name="storage_detail_dialog_other" msgid="5073511663616043370">"Lainnya meliputi file bersama yang disimpan aplikasi, file yang didownload dari internet atau Bluetooth, file Android, dan sebagainya. \n\nUntuk melihat konten <xliff:g id="NAME">^1</xliff:g> yang ditampilkan, ketuk Jelajahi."</string>
     <string name="storage_detail_dialog_system" msgid="1472572861360014226">"Sistem menyertakan file yang digunakan untuk menjalankan Android versi <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="storage_detail_dialog_user" msgid="1663117417635010371">"<xliff:g id="USER_0">^1</xliff:g> mungkin telah menyimpan foto, musik, aplikasi, atau data lain, menggunakan penyimpanan <xliff:g id="SIZE">^2</xliff:g>. \n\nUntuk melihat detailnya, beralih ke <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="3407283236421089014">"Siapkan <xliff:g id="NAME">^1</xliff:g>"</string>
@@ -1566,25 +1566,25 @@
     <string name="error_mnc_not23" msgid="6738398924368729180">"Bidang MNC harus 2 atau 3 digit."</string>
     <string name="error_adding_apn_type" msgid="671634520340569678">"Operator tidak mengizinkan penambahan APN jenis %s."</string>
     <string name="restore_default_apn" msgid="7195266404077471007">"Memulihkan setelan APN default."</string>
-    <string name="menu_restore" msgid="3799288817317293115">"Setel ulang ke default"</string>
-    <string name="restore_default_apn_completed" msgid="5671734152740058937">"Penyetelan ulang setelan APN default selesai."</string>
+    <string name="menu_restore" msgid="3799288817317293115">"Reset ke default"</string>
+    <string name="restore_default_apn_completed" msgid="5671734152740058937">"Peresetan setelan APN default selesai."</string>
     <string name="reset_dashboard_title" msgid="7084966342252178530">"Opsi reset"</string>
-    <string name="reset_dashboard_summary" msgid="8778383341461126642">"Jaringan, aplikasi, atau perangkat dapat disetel ulang"</string>
-    <string name="reset_network_title" msgid="8944059136930806211">"Setel ulang Wi-Fi, kuota seluler &amp; Bluetooth"</string>
+    <string name="reset_dashboard_summary" msgid="8778383341461126642">"Jaringan, aplikasi, atau perangkat dapat direset"</string>
+    <string name="reset_network_title" msgid="8944059136930806211">"Reset Wi-Fi, kuota seluler &amp; Bluetooth"</string>
     <string name="reset_network_desc" msgid="4982633363916261109">"Tindakan ini akan menyetel ulang semua setelan jaringan, termasuk:\n\n"<li>"Wi‑Fi"</li>\n<li>"Kuota seluler"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_esim_title" msgid="7630781767040831893">"Hapus SIM hasil download"</string>
     <string name="reset_esim_desc" msgid="433226911566802">"Untuk mendownload SIM pengganti, hubungi operator Anda. Tindakan ini tidak akan membatalkan paket pembelian layanan seluler apa pun."</string>
-    <string name="reset_network_button_text" msgid="4293271046867912819">"Setel ulang setelan"</string>
-    <string name="reset_network_final_desc" msgid="2463817067048751373">"Setel ulang semua setelan jaringan? Anda tidak dapat mengurungkan tindakan ini."</string>
-    <string name="reset_network_final_desc_esim" msgid="4676436976372555750">"Setel ulang semua setelan jaringan dan hapus SIM yang didownload? Anda tidak dapat mengurungkan tindakan ini."</string>
-    <string name="reset_network_final_button_text" msgid="345255333127794393">"Setel ulang setelan"</string>
-    <string name="reset_network_confirm_title" msgid="2432145031070536008">"Setel ulang?"</string>
-    <string name="network_reset_not_available" msgid="6146655531868016281">"Setel ulang jaringan tidak tersedia untuk pengguna ini"</string>
-    <string name="reset_network_complete_toast" msgid="128225929536005495">"Setelan jaringan telah disetel ulang"</string>
+    <string name="reset_network_button_text" msgid="4293271046867912819">"Reset setelan"</string>
+    <string name="reset_network_final_desc" msgid="2463817067048751373">"Reset semua setelan jaringan? Anda tidak dapat mengurungkan tindakan ini."</string>
+    <string name="reset_network_final_desc_esim" msgid="4676436976372555750">"Reset semua setelan jaringan dan hapus SIM yang didownload? Anda tidak dapat mengurungkan tindakan ini."</string>
+    <string name="reset_network_final_button_text" msgid="345255333127794393">"Reset setelan"</string>
+    <string name="reset_network_confirm_title" msgid="2432145031070536008">"Reset?"</string>
+    <string name="network_reset_not_available" msgid="6146655531868016281">"Reset jaringan tidak tersedia untuk pengguna ini"</string>
+    <string name="reset_network_complete_toast" msgid="128225929536005495">"Setelan jaringan telah direset"</string>
     <string name="reset_esim_error_title" msgid="4728931209471875632">"Tidak dapat menghapus SIM"</string>
     <string name="reset_esim_error_msg" msgid="4716366079119742235">"SIM hasil download tidak dapat dihapus karena terjadi error.\n\nMulai ulang perangkat Anda, lalu coba lagi."</string>
-    <string name="master_clear_title" msgid="1560712943955904673">"Reset ke setelan pabrik"</string>
-    <string name="master_clear_short_title" msgid="919098101581335101">"Reset ke setelan pabrik"</string>
+    <string name="master_clear_title" msgid="1560712943955904673">"Hapus semua (kembali ke setelan pabrik)"</string>
+    <string name="master_clear_short_title" msgid="919098101581335101">"Kembalikan ke setelan pabrik"</string>
     <string name="master_clear_desc" product="tablet" msgid="3432373610755760899">"Tindakan ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" tablet Anda, termasuk:\n\n"<li>"Akun Google Anda"</li>\n<li>"Data sistem dan aplikasi serta setelan"</li>\n<li>"Aplikasi yang didownload"</li></string>
     <string name="master_clear_desc" product="default" msgid="8765543541962866697">"Tindakan ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" ponsel Anda, termasuk:\n\n"<li>"Akun Google Anda"</li>\n<li>"Data sistem dan aplikasi serta setelan"</li>\n<li>"Aplikasi yang didownload"</li></string>
     <string name="master_clear_accounts" product="default" msgid="3432884235445405376">\n\n"Saat ini Anda telah login ke akun berikut:\n"</string>
@@ -1601,11 +1601,11 @@
     <string name="master_clear_button_text" product="tablet" msgid="8000547818499182920">"Hapus semua data"</string>
     <string name="master_clear_button_text" product="default" msgid="8000547818499182920">"Hapus semua data"</string>
     <string name="master_clear_final_desc" msgid="5189365498015339294">"Semua informasi pribadi dan aplikasi yang didownload akan dihapus. Anda tidak dapat mengurungkan tindakan ini."</string>
-    <string name="master_clear_final_desc_esim" msgid="3058919823436953662">"Semua informasi pribadi, termasuk aplikasi &amp; SIM yang telah download, akan dihapus. Anda tidak dapat mengurungkan tindakan ini."</string>
+    <string name="master_clear_final_desc_esim" msgid="3058919823436953662">"Semua informasi pribadi, termasuk aplikasi &amp; SIM yang didownload, akan dihapus. Anda tidak dapat mengurungkan tindakan ini."</string>
     <string name="master_clear_final_button_text" msgid="866772743886027768">"Hapus semua"</string>
-    <string name="master_clear_failed" msgid="7588397453984229892">"Penyetelan ulang tidak dilakukan karena layanan System Clear tidak tersedia."</string>
+    <string name="master_clear_failed" msgid="7588397453984229892">"Peresetan tidak dilakukan karena layanan System Clear tidak tersedia."</string>
     <string name="master_clear_confirm_title" msgid="698328669893512402">"Hapus semua data?"</string>
-    <string name="master_clear_not_available" msgid="4676613348163652454">"Fitur kembalikan ke setelan pabrik tidak tersedia untuk pengguna ini"</string>
+    <string name="master_clear_not_available" msgid="4676613348163652454">"Fitur kembali ke setelan pabrik tidak tersedia untuk pengguna ini"</string>
     <string name="master_clear_progress_title" msgid="378953167274114857">"Menghapus"</string>
     <string name="master_clear_progress_text" msgid="5418958116008976218">"Harap tunggu..."</string>
     <string name="call_settings_title" msgid="5033906789261282752">"Setelan panggilan"</string>
@@ -1645,7 +1645,7 @@
     <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>
-    <string name="mobile_connect_to_internet" msgid="6031886097365170913">"Sambungkan ke internet"</string>
+    <string name="mobile_connect_to_internet" msgid="6031886097365170913">"Hubungkan ke internet"</string>
     <string name="location_title" msgid="8664674161765477168">"Lokasiku"</string>
     <string name="managed_profile_location_switch_title" msgid="8157384427925389680">"Lokasi untuk profil kerja"</string>
     <string name="location_app_level_permissions" msgid="1298041503927632960">"Izin aplikasi"</string>
@@ -1738,9 +1738,9 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="6861154706098327320">"Untuk tambahan keamanan, gunakan pola profil kerja"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="6306902249365524526">"Untuk tambahan keamanan, masukkan PIN profil kerja"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="2917338218971012776">"Untuk tambahan keamanan, masukkan sandi profil kerja"</string>
-    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="1085862410379709928">"Ponsel telah disetel ulang ke setelan pabrik. Masukkan pola sebelumnya untuk menggunakan ponsel."</string>
-    <string name="lockpassword_confirm_your_pin_details_frp" msgid="6849889353126558761">"Ponsel telah disetel ulang ke setelan pabrik. Masukkan PIN sebelumnya untuk menggunakan ponsel."</string>
-    <string name="lockpassword_confirm_your_password_details_frp" msgid="3239944795659418737">"Ponsel telah disetel ulang ke setelan pabrik. Masukkan sandi sebelumnya untuk menggunakan ponsel."</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="1085862410379709928">"Ponsel telah dikembalikan ke setelan pabrik. Masukkan pola sebelumnya untuk menggunakan ponsel."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="6849889353126558761">"Ponsel telah dikembalikan ke setelan pabrik. Masukkan PIN sebelumnya untuk menggunakan ponsel."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="3239944795659418737">"Ponsel telah dikembalikan ke setelan pabrik. Masukkan sandi sebelumnya untuk menggunakan ponsel."</string>
     <string name="lockpassword_confirm_your_pattern_header_frp" msgid="3290569334665839860">"Verifikasi pola"</string>
     <string name="lockpassword_confirm_your_pin_header_frp" msgid="8520474869079710782">"Verifikasi PIN"</string>
     <string name="lockpassword_confirm_your_password_header_frp" msgid="7326670978891793470">"Verifikasi sandi"</string>
@@ -1753,7 +1753,7 @@
     <string name="lockpattern_recording_intro_header" msgid="2262005028838969839">"Buat pola pembuka kunci"</string>
     <string name="lockpattern_recording_intro_footer" msgid="5426745740754065099">"Tekan Menu untuk bantuan."</string>
     <string name="lockpattern_recording_inprogress" msgid="4060818382176523671">"Angkat jari ketika selesai"</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="6374760294545431845">"Sambungkan setidaknya <xliff:g id="NUMBER">%d</xliff:g> titik. Coba lagi."</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="6374760294545431845">"Hubungkan setidaknya <xliff:g id="NUMBER">%d</xliff:g> titik. Coba lagi."</string>
     <string name="lockpattern_pattern_entered_header" msgid="2108106638322637851">"Pola direkam"</string>
     <string name="lockpattern_need_to_confirm" msgid="4079482507985867389">"Gambar pola lagi untuk mengonfirmasi"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="5603156929428721407">"Pola pembuka kunci baru Anda"</string>
@@ -1767,7 +1767,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="4935583222709647096">"Perlihatkan pola"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="5338893138982642228">"Perlihatkan pola profil"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="3203621862806531947">"Bergetar saat diketuk"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5890335732200257777">"Tombol power langsung kunci"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5890335732200257777">"Tombol daya langsung kunci"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="1279989004145567840">"Kecuali jika tetap tidak dikunci oleh <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="9042142745571386381">"Setel pola pembuka kunci"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1456643060737114885">"Ubah pola pembuka kunci"</string>
@@ -1842,10 +1842,10 @@
     <string name="show_running_services" msgid="1895994322704667543">"Lihat layanan berjalan"</string>
     <string name="show_background_processes" msgid="88012264528093617">"Lihat proses di cache"</string>
     <string name="default_emergency_app" msgid="286530070173495823">"Aplikasi darurat"</string>
-    <string name="reset_app_preferences" msgid="1426500030595212077">"Setel ulang preferensi aplikasi"</string>
-    <string name="reset_app_preferences_title" msgid="792909865493673598">"Setel ulang pref aplikasi?"</string>
+    <string name="reset_app_preferences" msgid="1426500030595212077">"Reset preferensi aplikasi"</string>
+    <string name="reset_app_preferences_title" msgid="792909865493673598">"Reset pref aplikasi?"</string>
     <string name="reset_app_preferences_desc" msgid="7935273005301096031">"Tindakan ini akan menyetel ulang semua preferensi untuk:\n\n "<li>"Aplikasi yang dinonaktifkan"</li>\n" "<li>"Notifikasi aplikasi yang dinonaktifkan"</li>\n" "<li>"Aplikasi default untuk tindakan"</li>\n" "<li>"Batasan data latar belakang untuk aplikasi"</li>\n" "<li>"Batasan izin apa pun"</li>\n\n" Data aplikasi tidak akan hilang."</string>
-    <string name="reset_app_preferences_button" msgid="2041894727477934656">"Setel ulang aplikasi"</string>
+    <string name="reset_app_preferences_button" msgid="2041894727477934656">"Reset aplikasi"</string>
     <string name="manage_space_text" msgid="6166469422303124302">"Kelola ruang"</string>
     <string name="filter" msgid="2426943916212457962">"Filter"</string>
     <string name="filter_dlg_title" msgid="115313222190512670">"Pilih opsi filter"</string>
@@ -1888,7 +1888,7 @@
     <string name="app_install_location_title" msgid="5121617802063021720">"Lokasi pemasangan yang disukai"</string>
     <string name="app_install_location_summary" msgid="109719780117187797">"Ubah lokasi pemasangan yang diinginkan untuk apl baru."</string>
     <string name="app_disable_dlg_positive" msgid="5508828271100168073">"Menonaktifkan aplikasi"</string>
-    <string name="app_disable_dlg_text" msgid="9221864774943530281">"Jika Anda menonaktifkan aplikasi ini, Android dan aplikasi lain mungkin tidak berfungsi lagi sesuai harapan. Perlu diingat, Anda tidak dapat menghapus aplikasi yang disertakan oleh pabrikan di perangkat Anda. Namun, Anda dapat menonaktifkannya, yang berarti mematikan dan menyembunyikan aplikasi tersebut di perangkat Anda."</string>
+    <string name="app_disable_dlg_text" msgid="9221864774943530281">"Jika aplikasi ini dinonaktifkan, Android dan aplikasi lain mungkin tidak berfungsi normal. Perlu diingat, Anda tidak dapat menghapus aplikasi bawaan perangkat. Menonaktifkan aplikasi ini berarti mematikannya dan menyembunyikannya di perangkat."</string>
     <string name="app_disable_notifications_dlg_title" msgid="699530661413553928">"Matikan notifikasi?"</string>
     <string name="app_install_details_group_title" msgid="2909597319422976921">"Toko Aplikasi"</string>
     <string name="app_install_details_title" msgid="6954953384372934881">"Detail aplikasi"</string>
@@ -2102,7 +2102,7 @@
     <string name="accessibility_hearingaid_title" msgid="3700978781235124891">"Alat bantu dengar"</string>
     <string name="accessibility_hearingaid_not_connected_summary" msgid="634573930469952213">"Tidak ada alat bantu dengar yang terhubung"</string>
     <string name="accessibility_hearingaid_adding_summary" msgid="4139031880828714300">"Tambahkan alat bantu dengar"</string>
-    <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="2671518890909750740">"Untuk menyambungkan alat bantu, temukan dan ketuk perangkat Anda di layar berikutnya."</string>
+    <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="2671518890909750740">"Untuk menghubungkan alat bantu pendengaran, temukan lalu ketuk perangkatnya di layar berikutnya."</string>
     <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="1584538735488464991">"Pastikan alat bantu dengar Anda dalam mode penyambungan."</string>
     <string name="accessibility_hearingaid_active_device_summary" msgid="6081382497207168885">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> aktif"</string>
     <plurals name="show_number_hearingaid_count" formatted="false" msgid="7906547154695855096">
@@ -2245,7 +2245,7 @@
     <string name="screen_usage_summary" msgid="263396144684078341">"Jumlah waktu layar diaktifkan sejak pengisian daya terakhir hingga penuh"</string>
     <string name="device_usage_list_summary" msgid="8299017481332816368">"Penggunaan perangkat sejak pengisian baterai penuh terakhir"</string>
     <string name="battery_since_unplugged" msgid="6486555910264026856">"Penggunaan baterai sejak dicabut"</string>
-    <string name="battery_since_reset" msgid="4747587791838336661">"Penggunaan baterai sejak penyetelan ulang"</string>
+    <string name="battery_since_reset" msgid="4747587791838336661">"Penggunaan baterai sejak peresetan"</string>
     <string name="battery_stats_on_battery" msgid="2644055304085279716">"Memakai baterai: <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="battery_stats_duration" msgid="4867858933068728005">"<xliff:g id="TIME">%1$s</xliff:g> sejak dicabut"</string>
     <string name="battery_stats_charging_label" msgid="3156586822576998231">"Mengisi daya"</string>
@@ -2519,7 +2519,7 @@
     <string name="tts_install_voices_text" msgid="7464832428439739995">"Lanjutkan aplikasi <xliff:g id="TTS_APP_NAME">%s</xliff:g> untuk menginstal suara"</string>
     <string name="tts_install_voices_open" msgid="686776451008134790">"Buka Aplikasi"</string>
     <string name="tts_install_voices_cancel" msgid="1622512922523479646">"Batal"</string>
-    <string name="tts_reset" msgid="8864073594540705579">"Setel ulang"</string>
+    <string name="tts_reset" msgid="8864073594540705579">"Reset"</string>
     <string name="tts_play" msgid="9023430029380675514">"Putar"</string>
     <string name="vpn_settings_title" msgid="7008219502396889192">"VPN"</string>
     <string name="credentials_title" msgid="7119207354982673965">"Penyimpanan kredensial"</string>
@@ -2690,7 +2690,7 @@
     <string name="data_usage_tab_3g" msgid="4262659656028408064">"2G-3G"</string>
     <string name="data_usage_list_mobile" msgid="5623011459774885900">"Ponsel"</string>
     <string name="data_usage_list_none" msgid="5948870220795490796">"Tidak ada"</string>
-    <string name="data_usage_enable_mobile" msgid="7238385042860001374">"Kuota seluler"</string>
+    <string name="data_usage_enable_mobile" msgid="7238385042860001374">"Data seluler"</string>
     <string name="data_usage_enable_3g" msgid="3725838726334043367">"Data 2G-3G"</string>
     <string name="data_usage_enable_4g" msgid="8872517106293561179">"Data 4G"</string>
     <string name="data_roaming_enable_mobile" msgid="5886394350890765947">"Roaming"</string>
@@ -2708,7 +2708,7 @@
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="5004823486046340090">"Perubahan apa pun yang dilakukan pada akun Anda di web akan disalin ke ponsel secara otomatis.\n\nBeberapa akun juga dapat otomatis menyalin setiap perubahan yang dilakukan di ponsel ke web. Akun Google mengikuti cara kerja tersebut."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="7105334544291643305">"Nonaktifkan sinkronisasi data otomatis?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4057984234450947964">"Ini akan menghemat penggunaan baterai dan data, tapi Anda perlu menyinkronkan setiap akun secara manual untuk mengumpulkan informasi terkini. Anda juga tidak akan menerima pemberitahuan ketika ada update."</string>
-    <string name="data_usage_cycle_editor_title" msgid="4967309390043599889">"Tanggal penyetelan ulang siklus penggunaan"</string>
+    <string name="data_usage_cycle_editor_title" msgid="4967309390043599889">"Tanggal peresetan siklus penggunaan"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="6043098041946166597">"Tanggal setiap bulannya:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="9155752056537811646">"Setel"</string>
     <string name="data_usage_warning_editor_title" msgid="1431385383278389290">"Setel peringatan penggunaan kuota"</string>
@@ -2767,13 +2767,13 @@
     <string name="vpn_cancel" msgid="440645172381062337">"Batal"</string>
     <string name="vpn_done" msgid="6314426362224527349">"Tutup"</string>
     <string name="vpn_save" msgid="1332625259182278316">"Simpan"</string>
-    <string name="vpn_connect" msgid="772295154834334710">"Sambungkan"</string>
+    <string name="vpn_connect" msgid="772295154834334710">"Hubungkan"</string>
     <string name="vpn_replace" msgid="7818130465019803404">"Ganti"</string>
     <string name="vpn_edit" msgid="7284861108584255618">"Edit profil VPN"</string>
     <string name="vpn_forget" msgid="7662717604542624887">"Lupakan"</string>
-    <string name="vpn_connect_to" msgid="7926776854873218762">"Menyambung ke <xliff:g id="PROFILE">%s</xliff:g>"</string>
+    <string name="vpn_connect_to" msgid="7926776854873218762">"Menghubungkan ke <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3505111947735651082">"Putuskan sambungan VPN ini?"</string>
-    <string name="vpn_disconnect" msgid="4625914562388652486">"Putuskan sambungan"</string>
+    <string name="vpn_disconnect" msgid="4625914562388652486">"Putuskan hubungan"</string>
     <string name="vpn_version" msgid="2006792987077940456">"Versi <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="8457511440635534478">"Lupakan VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="8517436922021598103">"Ganti VPN yang sudah ada?"</string>
@@ -2870,8 +2870,8 @@
     <string name="user_add_user_item_title" msgid="6835385073795492410">"Pengguna"</string>
     <string name="user_add_profile_item_title" msgid="4932743891449790664">"Profil dibatasi"</string>
     <string name="user_add_user_title" msgid="2320897397066676472">"Tambahkan pengguna baru?"</string>
-    <string name="user_add_user_message_long" msgid="686637203224195465">"Anda dapat berbagi penggunaan perangkat ini dengan orang lain dengan membuat pengguna tambahan. Setiap pengguna memiliki ruang sendiri, yang dapat disesuaikan dengan aplikasi, wallpaper, dan lainnya. Pengguna juga dapat menyesuaikan setelan perangkat seperti Wi-Fi yang dapat memengaruhi semua pengguna lain.\n\nSaat Anda menambahkan pengguna baru, pengguna tersebut perlu menyiapkan ruangnya.\n\nPengguna mana pun dapat mengupdate aplikasi untuk semua pengguna lainnya. Layanan dan setelan aksesibilitas mungkin tidak ditransfer ke pengguna baru."</string>
-    <string name="user_add_user_message_short" msgid="1802594476285458254">"Saat Anda menambahkan pengguna baru, orang tersebut perlu menyiapkan ruang mereka sendiri.\n\nPengguna mana pun dapat memperbarui aplikasi untuk semua pengguna lain."</string>
+    <string name="user_add_user_message_long" msgid="686637203224195465">"Anda dapat berbagi pemakaian perangkat ini dengan menambahkan pengguna lain. Setiap pengguna memiliki ruang sendiri yang dapat disesuaikan dengan aplikasi, wallpaper, dan lainnya. Pengguna juga dapat menyesuaikan setelan perangkat seperti Wi-Fi yang dapat memengaruhi semua pengguna lain.\n\nJika ditambahkan, pengguna baru harus menyiapkan ruangnya sendiri.\n\nPengguna dapat mengupdate aplikasi untuk semua pengguna lain. Layanan dan setelan aksesibilitas mungkin tidak ditransfer ke pengguna baru."</string>
+    <string name="user_add_user_message_short" msgid="1802594476285458254">"Jika ditambahkan, pengguna baru harus menyiapkan ruangnya sendiri.\n\nPengguna dapat mengupdate aplikasi untuk semua pengguna lain."</string>
     <string name="user_setup_dialog_title" msgid="6748950002206392396">"Siapkan pengguna sekarang?"</string>
     <string name="user_setup_dialog_message" msgid="2988559933258353919">"Pastikan orang tersebut ada untuk mengambil perangkat dan menyiapkan ruangnya"</string>
     <string name="user_setup_profile_dialog_message" msgid="7611900802824048526">"Siapkan profil sekarang?"</string>
@@ -3074,8 +3074,8 @@
     <string name="keywords_voice_input" msgid="569012518085308407">"pengenal, masukan, ucapan, ucapkan, bahasa, handsfree, hands free, pengenalan, menyinggung, kata, audio, histori, bluetooth headset"</string>
     <string name="keywords_text_to_speech_output" msgid="1337378060761399890">"beri rating, bahasa, default, ucapkan, berbicara, text to speech, aksesibilitas, pembaca layar, tunanetra"</string>
     <string name="keywords_date_and_time" msgid="4434079919474174978">"jam, militer"</string>
-    <string name="keywords_network_reset" msgid="2064330046866583215">"setel ulang, memulihkan, pabrik"</string>
-    <string name="keywords_factory_data_reset" msgid="5865739790670615499">"hapus total, hapus, pulihkan, kosongkan, hilangkan, reset ke setelan pabrik"</string>
+    <string name="keywords_network_reset" msgid="2064330046866583215">"reset, memulihkan, pabrik"</string>
+    <string name="keywords_factory_data_reset" msgid="5865739790670615499">"hapus total, hapus, pulihkan, kosongkan, hilangkan, kembalikan ke setelan pabrik"</string>
     <string name="keywords_printing" msgid="8499167841024606451">"printer"</string>
     <string name="keywords_sounds" msgid="9155626618185269312">"bip speaker, speaker, volume, nonaktifkan notifikasi, matikan suara, audio, musik"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="7106220678170229900">"jangan jangan ganggu, mengganggu, gangguan, putus"</string>
@@ -3084,7 +3084,7 @@
     <string name="keywords_accounts" msgid="5908945725229306088">"akun"</string>
     <string name="keywords_users" msgid="5880705776023155640">"pembatasan, membatasi, dibatasi"</string>
     <string name="keywords_keyboard_and_ime" msgid="3327265741354129990">"koreksi teks, benar suara, getar otomatis, bahasa, isyarat, sarankan, saran, tema, menyinggung, kata, jenis, emoji, internasional"</string>
-    <string name="keywords_reset_apps" msgid="2645701455052020435">"setel ulang, preferensi, default"</string>
+    <string name="keywords_reset_apps" msgid="2645701455052020435">"reset, preferensi, default"</string>
     <string name="keywords_all_apps" msgid="846444448435698930">"apl download aplikasi sistem"</string>
     <string name="keywords_app_permissions" msgid="8539841019997048500">"aplikasi, izin, keamanan"</string>
     <string name="keywords_default_apps" msgid="7435952699323965532">"aplikasi, default"</string>
@@ -3726,7 +3726,7 @@
     <string name="sharing_remote_bugreport_dialog_message" msgid="3814787466701526359">"Laporan bug ini sedang dibagikan kepada admin IT. Hubungi mereka untuk detail selengkapnya."</string>
     <string name="share_remote_bugreport_action" msgid="8600797271670537888">"Bagikan"</string>
     <string name="decline_remote_bugreport_action" msgid="706319275774199033">"Tolak"</string>
-    <string name="usb_use_charging_only" msgid="2344625733377110164">"Tidak ada transfer data"</string>
+    <string name="usb_use_charging_only" msgid="2344625733377110164">"Jangan transfer data"</string>
     <string name="usb_use_charging_only_desc" msgid="3283518562582478950">"Mengisi daya perangkat ini saja"</string>
     <string name="usb_use_power_only" msgid="6595783381323810697">"Isi daya baterai perangkat yang terhubung"</string>
     <string name="usb_use_file_transfers" msgid="6153021302176151884">"Transfer File"</string>
@@ -4060,8 +4060,8 @@
     <string name="special_access_more" msgid="7086690625048471400">"Lihat lainnya"</string>
     <string name="confirm_convert_to_fbe_warning" msgid="4972595831034280189">"Benar-benar hapus data pengguna dan konversikan ke enkripsi file?"</string>
     <string name="button_confirm_convert_fbe" msgid="419832223125147297">"Hapus dan konversikan"</string>
-    <string name="reset_shortcut_manager_throttling" msgid="1912184636360233397">"Setel ulang pembatasan frekuensi ShortcutManager"</string>
-    <string name="reset_shortcut_manager_throttling_complete" msgid="2932990541160593632">"Pembatasan kecepatan PengelolaPintasan telah disetel ulang"</string>
+    <string name="reset_shortcut_manager_throttling" msgid="1912184636360233397">"Reset pembatasan frekuensi ShortcutManager"</string>
+    <string name="reset_shortcut_manager_throttling_complete" msgid="2932990541160593632">"Pembatasan kecepatan PengelolaPintasan telah direset"</string>
     <string name="notification_suggestion_title" msgid="3292107671498148560">"Kontrol info di layar kunci"</string>
     <string name="notification_suggestion_summary" msgid="6516827892359614597">"Menampilkan atau menyembunyikan konten notifikasi"</string>
     <string name="page_tab_title_summary" msgid="4824744863994538006">"Semua"</string>
@@ -4160,7 +4160,7 @@
     <string name="auto_sync_account_title" msgid="2394463123733529506">"Otomatis sinkronkan data"</string>
     <string name="auto_sync_personal_account_title" msgid="6844465157916100655">"Otomatis sinkronkan data pribadi"</string>
     <string name="auto_sync_work_account_title" msgid="2403222633447522376">"Otomatis sinkronkan data kerja"</string>
-    <string name="auto_sync_account_summary" msgid="6316230976974033772">"Izinkan aplikasi memuat ulang data secara otomatis"</string>
+    <string name="auto_sync_account_summary" msgid="6316230976974033772">"Izinkan aplikasi otomatis memuat ulang data"</string>
     <string name="account_sync_title" msgid="1570164819114297154">"Sinkronisasi akun"</string>
     <string name="account_sync_summary_some_on" msgid="1934556869158274053">"Sinkronisasi untuk <xliff:g id="ID_1">%1$d</xliff:g> dari <xliff:g id="ID_2">%2$d</xliff:g> item aktif"</string>
     <string name="account_sync_summary_all_on" msgid="3634161204232431700">"Sinkronisasi untuk semua item aktif"</string>
@@ -4251,14 +4251,14 @@
     <string name="app_info_storage_title" msgid="6643391804949509308">"Ruang penyimpanan yang digunakan"</string>
     <string name="webview_uninstalled_for_user" msgid="3407952144444040557">"(di-uninstal untuk pengguna <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="8057805373224993504">"(dinonaktifkan untuk pengguna <xliff:g id="USER">%s</xliff:g>)"</string>
-    <string name="autofill_app" msgid="3990765434980280073">"Layanan IsiOtomatis"</string>
+    <string name="autofill_app" msgid="3990765434980280073">"Layanan isi otomatis"</string>
     <string name="autofill_keywords" msgid="7717726766232862218">"otomatis, isi, isiotomatis"</string>
     <string name="autofill_confirmation_message" msgid="1385894598730361304">"&lt;b&gt;Pastikan Anda memercayai aplikasi ini&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google IsiOtomatis&gt;%1$s&lt;/xliff:g&gt; menggunakan item yang ada di layar untuk menentukan item apa saja yang dapat diisi otomatis."</string>
     <string name="debug_autofill_category" msgid="6262526615416295645">"IsiOtomatis"</string>
     <string name="autofill_logging_level_title" msgid="2577340324541102626">"Level logging"</string>
     <string name="autofill_max_partitions" msgid="125269645910590057">"Permintaan maks per sesi"</string>
     <string name="autofill_max_visible_datasets" msgid="2791081640248423492">"Jumlah set data maks yang terlihat"</string>
-    <string name="autofill_reset_developer_options" msgid="7208417230269613101">"Setel ulang ke nilai default"</string>
+    <string name="autofill_reset_developer_options" msgid="7208417230269613101">"Reset ke nilai default"</string>
     <string name="autofill_reset_developer_options_complete" msgid="5686061993002179524">"Opsi developer IsiOtomatis telah direset"</string>
     <string name="device_theme" msgid="8992291311481135893">"Tema perangkat"</string>
     <string name="default_theme" msgid="5986996377385956138">"Default"</string>
@@ -4414,7 +4414,7 @@
     <string name="mobile_network_use_sim_on" msgid="1944823242539751387">"Gunakan SIM"</string>
     <string name="mobile_network_use_sim_off" msgid="2077820358051946635">"Nonaktif"</string>
     <string name="mobile_network_esim_swap_confirm_title" msgid="6077154427380613615">"Beralih ke <xliff:g id="CARRIER">%1$s</xliff:g>?"</string>
-    <string name="mobile_network_esim_swap_confirm_body" msgid="1192274915146275063">"Hanya satu SIM hasil download yang dapat diaktifkan pada satu waktu.\n\nBeralih ke <xliff:g id="CARRIER1">%1$s</xliff:g> tidak akan membatalkan layanan <xliff:g id="CARRIER2">%2$s</xliff:g> Anda."</string>
+    <string name="mobile_network_esim_swap_confirm_body" msgid="1192274915146275063">"Hanya satu SIM hasil download yang dapat diaktifkan pada satu waktu.\n\nBeralih ke <xliff:g id="CARRIER1">%1$s</xliff:g> tidak akan membatalkan layanan <xliff:g id="CARRIER2">%2$s</xliff:g>."</string>
     <string name="mobile_network_esim_swap_confirm_ok" msgid="4253442720111626242">"Beralih ke <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="mobile_network_erase_sim" msgid="7813251003613841044">"Hapus SIM"</string>
     <string name="mobile_network_erase_sim_dialog_title" msgid="3796268164204467499">"Hapus SIM yang didownload?"</string>
@@ -4449,7 +4449,7 @@
     <string name="see_more" msgid="7463940160389802632">"Lihat lainnya"</string>
     <string name="see_less" msgid="3718892257002813387">"Lihat lebih sedikit"</string>
     <string name="network_connection_request_dialog_title" msgid="3150489262902506588">"Perangkat yang digunakan dengan <xliff:g id="APPNAME">%1$s</xliff:g>"</string>
-    <string name="network_connection_timeout_dialog_message" msgid="7036704569274087733">"Perangkat tidak ditemukan. Pastikan perangkat dihidupkan dan dapat tersambung ke jaringan."</string>
+    <string name="network_connection_timeout_dialog_message" msgid="7036704569274087733">"Perangkat tidak ditemukan. Pastikan perangkat dihidupkan dan dapat terhubung ke jaringan."</string>
     <string name="network_connection_timeout_dialog_ok" msgid="5156496438627748361">"Coba lagi"</string>
     <string name="network_connection_errorstate_dialog_message" msgid="1599445930536043943">"Ada masalah. Aplikasi telah membatalkan permintaan untuk memilih perangkat."</string>
     <string name="network_connection_connect_successful" msgid="888912275986965748">"Koneksi berhasil"</string>
diff --git a/tests/CarDeveloperOptions/res/values-is/strings.xml b/tests/CarDeveloperOptions/res/values-is/strings.xml
index 0707eb3..9f84a39 100644
--- a/tests/CarDeveloperOptions/res/values-is/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-is/strings.xml
@@ -2092,7 +2092,7 @@
     <string name="accessibility_autoclick_description" msgid="5492414927846407499">"Ef þú notar mús geturðu stillt bendilinn þannig að hann framkvæmi aðgerð sjálfkrafa þegar hann er óhreyfður í tiltekinn tíma."</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="8303022510942147049">"Bíða áður en smellt er"</string>
     <string name="accessibility_vibration_settings_title" msgid="1902649657883159406">"Titringur"</string>
-    <string name="accessibility_notification_vibration_title" msgid="1005799039440510298">"Titringur fyrir tilkynningar"</string>
+    <string name="accessibility_notification_vibration_title" msgid="1005799039440510298">"Titringur tilkynninga"</string>
     <string name="accessibility_ring_vibration_title" msgid="7943341443551359985">"Titringur hringingar"</string>
     <string name="accessibility_touch_vibration_title" msgid="285890135612038092">"Snertititringur"</string>
     <string name="accessibility_service_master_switch_title" msgid="2734791644475782924">"Nota þjónustu"</string>
@@ -4418,7 +4418,7 @@
     <string name="mobile_network_esim_swap_confirm_ok" msgid="4253442720111626242">"Skipta yfir í <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="mobile_network_erase_sim" msgid="7813251003613841044">"Hreinsa SIM"</string>
     <string name="mobile_network_erase_sim_dialog_title" msgid="3796268164204467499">"Viltu hreinsa þetta sótta SIM-kort?"</string>
-    <string name="mobile_network_erase_sim_dialog_body" msgid="1923189407958581450">"Ef þessu SIM-korti er eytt verður þjónusta <xliff:g id="CARRIER_0">%1$s</xliff:g> fjarlægð úr þessu tæki.\n\nÞjónustu <xliff:g id="CARRIER_1">%2$s</xliff:g> verður ekki sagt upp."</string>
+    <string name="mobile_network_erase_sim_dialog_body" msgid="1923189407958581450">"Ef þetta SIM-kort er hreinsað verður þjónusta <xliff:g id="CARRIER_0">%1$s</xliff:g> fjarlægð úr þessu tæki.\n\nÞjónustu <xliff:g id="CARRIER_1">%2$s</xliff:g> verður ekki sagt upp."</string>
     <string name="mobile_network_erase_sim_dialog_ok" msgid="7133484721717815447">"Eyða"</string>
     <string name="mobile_network_erase_sim_dialog_progress" msgid="4881754030959536493">"Eyðir SIM-korti…"</string>
     <string name="mobile_network_erase_sim_error_dialog_title" msgid="9026625253242102706">"Ekki hreinsa SIM"</string>
diff --git a/tests/CarDeveloperOptions/res/values-it/strings.xml b/tests/CarDeveloperOptions/res/values-it/strings.xml
index 02abed3..8e5c3b7 100644
--- a/tests/CarDeveloperOptions/res/values-it/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-it/strings.xml
@@ -107,7 +107,7 @@
     <string name="bluetooth_scan_for_devices" msgid="3215740768422735880">"Cerca dispositivi"</string>
     <string name="bluetooth_rename_device" msgid="7862992396452800566">"Rinomina questo dispositivo"</string>
     <string name="bluetooth_rename_button" msgid="8946904845821073267">"Rinomina"</string>
-    <string name="bluetooth_disconnect_title" msgid="2689706557852333780">"Scollegare il dispositivo?"</string>
+    <string name="bluetooth_disconnect_title" msgid="2689706557852333780">"Disconnettere il dispositivo?"</string>
     <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8920448151607060442">"Il telefono verrà scollegato da <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="7322773998151831579">"Il tablet verrà scollegato da <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_disconnect_all_profiles" product="device" msgid="4707569949253450208">"Il dispositivo verrà scollegato da <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
@@ -263,7 +263,7 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="67933353112027726">"Ricerca di media nella scheda SD..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="7959964366461613091">"Archivio USB montato: lettura."</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="8854112253788893415">"La scheda SD montata è di sola lettura."</string>
-    <string name="skip_label" msgid="8067961347551157478">"Ignora"</string>
+    <string name="skip_label" msgid="8067961347551157478">"Salta"</string>
     <string name="next_label" msgid="4710056309804362410">"Avanti"</string>
     <string name="language_picker_title" msgid="7807759931261107686">"Lingue"</string>
     <string name="locale_remove_menu" msgid="3395565699934985486">"Rimuovi"</string>
@@ -444,20 +444,20 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6734490666593320711">"Utilizza la tua impronta digitale per sbloccare il telefono o approvare un acquisto.\n\nNota: la tua impronta digitale potrebbe essere meno sicura di una sequenza o un codice PIN complessi."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="9168637333731599827">"Annulla"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="271662150372486535">"Continua"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="756928427429893070">"Ignora"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="756928427429893070">"Salta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="4125977169169671144">"Avanti"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="763018850721691594">"Saltare la configurazione?"</string>
     <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="8849928362049018680">"La configurazione dell\'impronta digitale richiede solo un paio di minuti. Se salti questo passaggio, potrai aggiungere l\'impronta digitale in seguito nelle impostazioni."</string>
-    <string name="lock_screen_intro_skip_title" msgid="5307431665496346914">"Ignorare il blocco schermo?"</string>
+    <string name="lock_screen_intro_skip_title" msgid="5307431665496346914">"Saltare il blocco schermo?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7553945981266845264">"Le funzioni di protezione del dispositivo non verranno attivate. Non potrai impedire ad altre persone di utilizzare questo tablet se viene smarrito, rubato o reimpostato."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="1378243257238015603">"Le funzioni di protezione del dispositivo non verranno attivate. Non potrai impedire ad altre persone di utilizzare questo dispositivo se viene smarrito, rubato o reimpostato."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="8395540117461339748">"Le funzioni di protezione del dispositivo non verranno attivate. Non potrai impedire ad altre persone di utilizzare questo telefono se viene smarrito, rubato o reimpostato."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="7572334562915795226">"Le funzioni di protezione del dispositivo non verranno attivate. Non potrai impedire ad altre persone di utilizzare questo tablet se viene smarrito o rubato."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3819285334459763813">"Le funzioni di protezione del dispositivo non verranno attivate. Non potrai impedire ad altre persone di utilizzare questo dispositivo se viene smarrito o rubato."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="5361573789585652826">"Le funzioni di protezione del dispositivo non verranno attivate. Non potrai impedire ad altre persone di utilizzare questo telefono se viene smarrito o rubato."</string>
-    <string name="skip_anyway_button_label" msgid="4437815969645175429">"Ignora comunque"</string>
+    <string name="skip_anyway_button_label" msgid="4437815969645175429">"Salta comunque"</string>
     <string name="go_back_button_label" msgid="7310586887969860472">"Torna indietro"</string>
-    <string name="skip_lock_screen_dialog_button_label" msgid="6706047245716780006">"Ignora"</string>
+    <string name="skip_lock_screen_dialog_button_label" msgid="6706047245716780006">"Salta"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="2534925227627658819">"Annulla"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="8909829699273726469">"Tocca il sensore"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="581120963079780740">"Si trova sulla parte posteriore del telefono. Utilizza il dito indice."</string>
@@ -1572,13 +1572,13 @@
     <string name="reset_dashboard_summary" msgid="8778383341461126642">"È possibile reimpostare la rete, le app o il dispositivo"</string>
     <string name="reset_network_title" msgid="8944059136930806211">"Reimposta Wi-Fi, dati mobili e Bluetooth"</string>
     <string name="reset_network_desc" msgid="4982633363916261109">"Verranno reimpostate tutte le impostazioni di rete, tra cui:\n\n"<li>"Wi‑Fi"</li>\n<li>"Dati mobili"</li>\n<li>"Bluetooth"</li></string>
-    <string name="reset_esim_title" msgid="7630781767040831893">"Cancella SIM scaricate"</string>
+    <string name="reset_esim_title" msgid="7630781767040831893">"Resetta SIM scaricate"</string>
     <string name="reset_esim_desc" msgid="433226911566802">"Per scaricare le SIM sostitutive, contatta il tuo operatore. Ciò non annullerà alcun piano di servizio mobile."</string>
     <string name="reset_network_button_text" msgid="4293271046867912819">"Reimposta"</string>
     <string name="reset_network_final_desc" msgid="2463817067048751373">"Ripristinare tutte le impostazioni della rete? Questa azione non può essere annullata."</string>
     <string name="reset_network_final_desc_esim" msgid="4676436976372555750">"Reimpostare tutte le impostazioni di rete e resettare tutte le SIM scaricate? Questa azione non può essere annullata."</string>
     <string name="reset_network_final_button_text" msgid="345255333127794393">"Reimposta impostazioni"</string>
-    <string name="reset_network_confirm_title" msgid="2432145031070536008">"Reimpostare?"</string>
+    <string name="reset_network_confirm_title" msgid="2432145031070536008">"Vuoi reimpostare?"</string>
     <string name="network_reset_not_available" msgid="6146655531868016281">"La reimpostazione della rete non è disponibile per questo utente"</string>
     <string name="reset_network_complete_toast" msgid="128225929536005495">"Le impostazioni di rete sono state reimpostate"</string>
     <string name="reset_esim_error_title" msgid="4728931209471875632">"Impossibile resettare le SIM"</string>
@@ -1843,7 +1843,7 @@
     <string name="show_background_processes" msgid="88012264528093617">"Mostra processi nella cache"</string>
     <string name="default_emergency_app" msgid="286530070173495823">"App di emergenza"</string>
     <string name="reset_app_preferences" msgid="1426500030595212077">"Reimposta preferenze app"</string>
-    <string name="reset_app_preferences_title" msgid="792909865493673598">"Reimpostare preferenze app?"</string>
+    <string name="reset_app_preferences_title" msgid="792909865493673598">"Reimpostare le preferenze per le app?"</string>
     <string name="reset_app_preferences_desc" msgid="7935273005301096031">"Verranno reimpostate tutte le preferenze relative a:\n\n "<li>"App disattivate"</li>\n" "<li>"Notifiche di app disattivate"</li>\n" "<li>"Applicazioni predefinite per azioni"</li>\n" "<li>"Limitazioni di dati in background per app"</li>\n" "<li>"Eventuali limitazioni di autorizzazioni"</li>\n\n" Non perderai i dati delle app."</string>
     <string name="reset_app_preferences_button" msgid="2041894727477934656">"Reimposta app"</string>
     <string name="manage_space_text" msgid="6166469422303124302">"Gestisci spazio"</string>
@@ -2455,7 +2455,7 @@
     <string name="battery_saver_auto_percentage_summary" msgid="2036128588460338677">"Si attiva quando la batteria raggiunge <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_saver_schedule_settings_title" msgid="574233428557678128">"Imposta una pianificazione"</string>
     <string name="battery_saver_sticky_title_new" msgid="5328707297110866082">"Disattiva quando la ricarica è completa"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="3406582427270935879">"Risparmio energetico si disattiva quando il livello di carica del telefono è <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="3406582427270935879">"Il risparmio energetico si disattiva quando il livello di carica del telefono è <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_saver_sticky_description_new" product="tablet" msgid="3284967694001857194">"Risparmio energetico si attiva quando il tablet è a un livello di carica pari a <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_saver_sticky_description_new" product="device" msgid="5056520668081504111">"Risparmio energetico si attiva quando il dispositivo è a un livello di carica pari a <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (7607123201469333645) -->
diff --git a/tests/CarDeveloperOptions/res/values-iw/strings.xml b/tests/CarDeveloperOptions/res/values-iw/strings.xml
index 9f9d37e..4e5900d 100644
--- a/tests/CarDeveloperOptions/res/values-iw/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-iw/strings.xml
@@ -28,7 +28,7 @@
       <item quantity="other">אתה כעת במרחק של <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> צעדים מלהיות מפתח.</item>
       <item quantity="one">אתה כעת במרחק של צעד <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> מלהיות מפתח.</item>
     </plurals>
-    <string name="show_dev_on" msgid="9075712234786224065">"אתה כעת מפתח!"</string>
+    <string name="show_dev_on" msgid="9075712234786224065">"הוגדרת כמפתח!"</string>
     <string name="show_dev_already" msgid="7665948832405148689">"אין צורך, אתה כבר מפתח."</string>
     <string name="dev_settings_disabled_warning" msgid="3198732189395396721">"קודם עליך להפעיל את אפשרויות המפתח."</string>
     <string name="header_category_wireless_networks" msgid="8968405993937795898">"רשתות ותקשורת אלחוטית"</string>
@@ -2888,9 +2888,7 @@
     <string name="one_userkey" msgid="5349738921509013845">"מקש משתמש אחד"</string>
     <string name="one_usercrt" msgid="856282310586987313">"אישור למשתמש אחד"</string>
     <string name="one_cacrt" msgid="4757720453112732485">"אישור CA אחד"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for n_cacrts (7539893176217891549) -->
-    <skip />
+    <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_none_installed" msgid="4129252817676332368">"לא הותקנו פרטי כניסה של המשתמש"</string>
@@ -3486,9 +3484,9 @@
     <string name="zen_access_detail_switch" msgid="8706332327904974500">"הפעלת ההרשאה \'נא לא להפריע\'"</string>
     <string name="zen_access_empty_text" msgid="7667538993781607731">"אין אפליקציות מותקנות שביקשו גישה אל \'נא לא להפריע\'"</string>
     <string name="loading_notification_apps" msgid="1978345231934072091">"טוען אפליקציות..."</string>
-    <string name="app_notifications_off_desc" msgid="3904090905748895146">"לבקשתך, מערכת Android חוסמת במכשיר זה הצגת התראות מאפליקציה זו"</string>
-    <string name="channel_notifications_off_desc" msgid="8005444443218306611">"לבקשתך, מערכת Android חוסמת במכשיר הצגה של קטגוריית התראות זו"</string>
-    <string name="channel_group_notifications_off_desc" msgid="7154205544298672850">"לבקשתך, מערכת Android חוסמת במכשיר הצגה של מקבץ הודעות זה"</string>
+    <string name="app_notifications_off_desc" msgid="3904090905748895146">"לבקשתך, מערכת Android לא מאפשרת להציג במכשיר הזה התראות מהאפליקציה הזו"</string>
+    <string name="channel_notifications_off_desc" msgid="8005444443218306611">"לבקשתך, מערכת Android לא מאפשרת להציג במכשיר הזה התראות ששייכות לקטגוריה הזו"</string>
+    <string name="channel_group_notifications_off_desc" msgid="7154205544298672850">"לבקשתך, מערכת Android לא מאפשרת להציג במכשיר הזה התראות מקבוצה זו"</string>
     <string name="notification_channels" msgid="956764228116145956">"קטגוריות"</string>
     <string name="notification_channels_other" msgid="1615988645667411530">"אחר"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3744856747513344999">
@@ -3747,7 +3745,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>
@@ -4291,10 +4289,10 @@
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="5223278198179877704">"לא זמין במכשירים הנעולים לספק"</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_title" msgid="4462106633708675959">"אפליקציות ללא התקנה"</string>
     <string name="web_action_enable_summary" msgid="1729016644691793085">"פתיחת קישורים באפליקציות, גם אם הן לא מותקנות"</string>
-    <string name="web_action_section_title" msgid="5563229447734734662">"אפליקציות אינסטנט"</string>
-    <string name="instant_apps_settings" msgid="879003203555847537">"העדפות של אפליקציות אינסטנט"</string>
+    <string name="web_action_section_title" msgid="5563229447734734662">"אפליקציות ללא התקנה"</string>
+    <string name="instant_apps_settings" msgid="879003203555847537">"העדפות של אפליקציות ללא התקנה"</string>
     <string name="domain_url_section_title" msgid="206403507921518321">"אפליקציות מותקנות"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="2630083316417707308">"האחסון שלך מנוהל כעת על ידי מנהל האחסון"</string>
     <string name="account_for_section_header" msgid="5975241715840642563">"חשבונות עבור <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -4423,7 +4421,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>
diff --git a/tests/CarDeveloperOptions/res/values-ja/strings.xml b/tests/CarDeveloperOptions/res/values-ja/strings.xml
index 218aa51..cb05b9b 100644
--- a/tests/CarDeveloperOptions/res/values-ja/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ja/strings.xml
@@ -23,11 +23,11 @@
     <string name="deny" msgid="3998166389989144025">"許可しない"</string>
     <string name="device_info_default" msgid="1548919563979154348">"不明"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="3953785659137161981">
-      <item quantity="other">デベロッパーになるまであと<xliff:g id="STEP_COUNT_1">%1$d</xliff:g>ステップです。</item>
-      <item quantity="one">デベロッパーになるまであと<xliff:g id="STEP_COUNT_0">%1$d</xliff:g>ステップです。</item>
+      <item quantity="other">開発者向けオプションが有効になるまであと <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> 回です</item>
+      <item quantity="one">開発者向けオプションが有効になるまであと <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> 回です</item>
     </plurals>
-    <string name="show_dev_on" msgid="9075712234786224065">"これでデベロッパーになりました！"</string>
-    <string name="show_dev_already" msgid="7665948832405148689">"開発者向けオプションが既に有効です。"</string>
+    <string name="show_dev_on" msgid="9075712234786224065">"開発者向けオプションが有効になりました"</string>
+    <string name="show_dev_already" msgid="7665948832405148689">"開発者向けオプションはすでに有効です"</string>
     <string name="dev_settings_disabled_warning" msgid="3198732189395396721">"まず開発者向けオプションを有効にしてください。"</string>
     <string name="header_category_wireless_networks" msgid="8968405993937795898">"無線とネットワーク"</string>
     <string name="header_category_system" msgid="4045988717359334410">"システム"</string>
@@ -1572,7 +1572,7 @@
     <string name="reset_dashboard_summary" msgid="8778383341461126642">"ネットワーク、アプリ、デバイスをリセットできます"</string>
     <string name="reset_network_title" msgid="8944059136930806211">"Wi-Fi、モバイル、Bluetooth をリセット"</string>
     <string name="reset_network_desc" msgid="4982633363916261109">"以下を含む、すべてのネットワーク設定がリセットされます。\n\n"<li>"Wi‑Fi"</li>\n<li>"モバイルデータ"</li>\n<li>"Bluetooth"</li></string>
-    <string name="reset_esim_title" msgid="7630781767040831893">"ダウンロードされた eSIM の消去"</string>
+    <string name="reset_esim_title" msgid="7630781767040831893">"ダウンロードされた eSIM を消去"</string>
     <string name="reset_esim_desc" msgid="433226911566802">"別の eSIM をダウンロードするには、携帯通信会社にお問い合わせください。この操作でモバイルのサービスプランが解約されることはありません。"</string>
     <string name="reset_network_button_text" msgid="4293271046867912819">"設定をリセット"</string>
     <string name="reset_network_final_desc" msgid="2463817067048751373">"すべてのネットワーク設定をリセットしますか？この操作を取り消すことはできません。"</string>
@@ -3308,9 +3308,9 @@
     <string name="notification_badging_title" msgid="6311699476970264712">"通知ドットの許可"</string>
     <string name="notification_bubbles_title" msgid="9196562435741861317">"ふきだし"</string>
     <string name="notification_bubbles_summary" msgid="4624512775901949578">"フローティング ショートカットにより、アプリのコンテンツにどこからでもすぐにアクセスできます"</string>
-    <string name="bubbles_feature_education" msgid="8979109826818881018">"一部の通知や他のコンテンツを画面にふきだしとして表示できます。ふきだしはタップすると開き、画面の下へドラッグすると消えます。"</string>
+    <string name="bubbles_feature_education" msgid="8979109826818881018">"一部の通知や他のコンテンツを画面にバブルとして表示できます。バブルはタップすると開き、画面の下へドラッグすると消えます。"</string>
     <string name="bubbles_app_toggle_title" msgid="6401217027603326439">"ふきだし"</string>
-    <string name="bubbles_app_toggle_summary" msgid="7707611139796553855">"一部の通知をふきだしとして表示することを <xliff:g id="APP_NAME">%1$s</xliff:g> に許可します"</string>
+    <string name="bubbles_app_toggle_summary" msgid="7707611139796553855">"一部の通知をバブルとして表示することを <xliff:g id="APP_NAME">%1$s</xliff:g> に許可します"</string>
     <string name="bubbles_feature_disabled_dialog_title" msgid="3375452386012079293">"ふきだしの有効化"</string>
     <string name="bubbles_feature_disabled_dialog_text" msgid="326945485806386477">"このアプリのふきだしを有効にするには、デバイスでふきだしを有効にしておく必要があります。この設定は、ふきだしを以前に有効にした他のアプリにも反映されます。"</string>
     <string name="bubbles_feature_disabled_button_approve" msgid="6661464849674493351">"デバイスで有効にする"</string>
@@ -3371,9 +3371,9 @@
     <string name="no_notification_assistant" msgid="9140123568386413264">"アシスタントなし"</string>
     <string name="no_notification_listeners" msgid="1366386609506834717">"通知へのアクセスをリクエストしたインストール済みアプリはありません。"</string>
     <string name="notification_assistant_security_warning_title" msgid="4190584438086738496">"通知へのアクセスを<xliff:g id="SERVICE">%1$s</xliff:g>に許可しますか？"</string>
-    <string name="notification_assistant_security_warning_summary" msgid="6924513399671031930">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g>はすべての通知を読み取ることができます。通知には、連絡先名などの個人情報や受信したメッセージの本文も含まれます。また、通知を変更または非表示にしたり、通知内のボタン操作を実行したりすることもできます。\n\nこれにより、アプリがサイレント モード設定を切り替えたり、関連する設定を変更したりすることも可能になります。"</string>
-    <string name="notification_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_assistant_security_warning_summary" msgid="6924513399671031930">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> がすべての通知を読み取れるようになります。通知には、連絡先名などの個人情報や受信したメッセージの本文も含まれます。また、通知を変更または非表示にしたり、通知内のボタン操作をタップしたりすることも許可されます。\n\nこれにより、アプリがサイレント モード設定を切り替えたり、関連する設定を変更したりすることも可能になります。"</string>
+    <string name="notification_listener_security_warning_title" msgid="4902253246428777797">"<xliff:g id="SERVICE">%1$s</xliff:g> による通知へのアクセスを許可しますか？"</string>
+    <string name="notification_listener_security_warning_summary" msgid="4454702907350100288">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> がすべての通知を読み取れるようになります。通知には、連絡先名などの個人情報や受信したメッセージの本文も含まれます。また、通知を非表示にしたり、通知内のボタン操作を実行したりすることもできます。\n\nこれにより、アプリがサイレント モード設定を切り替えたり、関連する設定を変更したりすることも可能になります。"</string>
     <string name="notification_listener_disable_warning_summary" msgid="162165151519082978">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> の通知アクセスを OFF にすると、サイレント モードのアクセスも OFF になります。"</string>
     <string name="notification_listener_disable_warning_confirm" msgid="7863495391671154188">"OFF にする"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="6264631825225298458">"キャンセル"</string>
@@ -4417,7 +4417,7 @@
     <string name="mobile_network_esim_swap_confirm_body" msgid="1192274915146275063">"ダウンロード型 SIM は一度に 1 つのみ有効にできます。\n\n<xliff:g id="CARRIER1">%1$s</xliff:g> に切り替えても、<xliff:g id="CARRIER2">%2$s</xliff:g> サービスが解約されることはありません。"</string>
     <string name="mobile_network_esim_swap_confirm_ok" msgid="4253442720111626242">"<xliff:g id="CARRIER">%1$s</xliff:g> に切り替え"</string>
     <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_title" msgid="3796268164204467499">"このダウンロードされた eSIM を消去しますか？"</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>
diff --git a/tests/CarDeveloperOptions/res/values-kk/arrays.xml b/tests/CarDeveloperOptions/res/values-kk/arrays.xml
index bfa188c..d01b7b8 100644
--- a/tests/CarDeveloperOptions/res/values-kk/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-kk/arrays.xml
@@ -257,7 +257,7 @@
     <item msgid="5420704980305018295">"дыбыс қаттылығы"</item>
     <item msgid="5797363115508970204">"қоңыраудың дыбыс деңгейі"</item>
     <item msgid="8233154098550715999">"мультимeдиа дыбыс деңгейі"</item>
-    <item msgid="5196715605078153950">"дабыл дыбысының қаттылығы"</item>
+    <item msgid="5196715605078153950">"дабыл дыбысының деңгейі"</item>
     <item msgid="394030698764284577">"хабар дыбысының қаттылығы"</item>
     <item msgid="8952898972491680178">"bluetooth дыбысының қаттылығы"</item>
     <item msgid="8506227454543690851">"ұйқы бермеу"</item>
diff --git a/tests/CarDeveloperOptions/res/values-kk/strings.xml b/tests/CarDeveloperOptions/res/values-kk/strings.xml
index 60d43a3..bd229f5 100644
--- a/tests/CarDeveloperOptions/res/values-kk/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-kk/strings.xml
@@ -162,7 +162,7 @@
     <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> сіздің SIM картаңызға кіруге рұқсат сұрайды. Ондай рұқсатты берсеңіз, байланыс барысында дерек тасымалы өшіріледі. <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_device_name_summary" msgid="8661066392056595005">"Басқа құрылғыларға \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" атымен көрінеді."</string>
     <string name="bluetooth_off_footer" msgid="7658444560543730571">"Басқа құрылғыларға қосылу үшін Bluetooth функциясын қосыңыз."</string>
     <string name="bluetooth_paired_device_title" msgid="8361860197780425286">"Құрылғыларыңыз"</string>
     <string name="bluetooth_pairing_page_title" msgid="9053463656712597709">"Жаңа құрылғымен жұптастыру"</string>
@@ -728,7 +728,7 @@
     <string name="bluetooth_quick_toggle_summary" msgid="3951769568065428093">"Bluetooth құрылғысын қосу"</string>
     <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_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">"Bluetooth жұптау коды"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="6205151011298670207">"Жұптау кодын теріңіз, содан кейін «Оралу» немесе «Енгізу» түймесін басыңыз"</string>
@@ -1572,7 +1572,7 @@
     <string name="reset_dashboard_summary" msgid="8778383341461126642">"Желіні, қолданбаны не құрылғыны бастапқы күйіне қайтаруға болады"</string>
     <string name="reset_network_title" msgid="8944059136930806211">"Wi-Fi, мобильдік деректер және Bluetooth параметрлерін бастапқы күйіне қайтару"</string>
     <string name="reset_network_desc" msgid="4982633363916261109">"Мұның нәтижесінде барлық желі параметрлері бастапқы күйіне қайтарылады, соның ішінде:\n\n"<li>"Wi‑Fi"</li>\n<li>"мобильдік деректер"</li>\n<li>"Bluetooth"</li></string>
-    <string name="reset_esim_title" msgid="7630781767040831893">"Жүктеп алынған SIM карталарын тазарту"</string>
+    <string name="reset_esim_title" msgid="7630781767040831893">"Жүктеп алынған SIM карталарын өшіру"</string>
     <string name="reset_esim_desc" msgid="433226911566802">"Жаңа SIM карталарын жүктеп алу үшін операторға хабарласыңыз. Мобильдік қызмет жоспарларынан бас тартылмайды."</string>
     <string name="reset_network_button_text" msgid="4293271046867912819">"Параметрлерді бастапқы күйге қайтару"</string>
     <string name="reset_network_final_desc" msgid="2463817067048751373">"Барлық желі параметрлері бастапқы күйіне қайтарылсын ба? Бұл әрекетті қайтару мүмкін емес."</string>
@@ -1609,7 +1609,7 @@
     <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>
-    <string name="call_settings_summary" msgid="2119161087671450035">"Дауыс хабары, қоңырауды басқа нөмірге бағыттау, күту және қоңырау шалушының жеке анықтағышын орнату"</string>
+    <string name="call_settings_summary" msgid="2119161087671450035">"Дауыстық пошта, қоңырауды басқа нөмірге бағыттау және ұстап тұру, қоңырау шалушыт нөмірлерді автоматты анықтау"</string>
     <string name="tether_settings_title_usb" msgid="4265582654602420357">"USB тетеринг"</string>
     <string name="tether_settings_title_wifi" msgid="2060965130234484613">"Алынбалы хот-спот"</string>
     <string name="tether_settings_title_bluetooth" msgid="1999590158102569959">"Bluetooth модем"</string>
@@ -1618,7 +1618,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">"Data Saver функциясы қосулы кезде, тетерингті немесе тасымалы хот-спотты пайдалану мүмкін емес"</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>
@@ -2268,18 +2268,18 @@
     <string name="controls_subtitle" msgid="6920199888882834620">"Қуат қолданысын бейімдеу"</string>
     <string name="packages_subtitle" msgid="6506269487892204413">"Қамтылған орамдар"</string>
     <string name="battery_tip_summary_title" msgid="2750922152518825526">"Қолданбалар қалыпты жұмыс істеп тұр"</string>
-    <string name="battery_tip_summary_summary" product="default" msgid="6294900413896440006">"Телефон фондық режимде батарея зарядын қалыпты күйде пайдаланады"</string>
-    <string name="battery_tip_summary_summary" product="tablet" msgid="5280099016800644130">"Планшет фондық режимде батарея зарядын қалыпты күйде пайдаланады"</string>
-    <string name="battery_tip_summary_summary" product="device" msgid="4459840492610842705">"Құрылғы фондық режимде батарея зарядын қалыпты күйде пайдаланады"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="6294900413896440006">"Телефон фондық режимде батарея зарядын қалыпты күйде пайдаланады."</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="5280099016800644130">"Планшет фондық режимде батарея зарядын қалыпты күйде пайдаланады."</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="4459840492610842705">"Құрылғы фондық режимде батарея зарядын қалыпты күйде пайдаланады."</string>
     <string name="battery_tip_low_battery_title" msgid="6784043681672161175">"Батарея заряды аз қалды"</string>
     <string name="battery_tip_low_battery_summary" msgid="9151355911381188604">"Батарея заряды ұзаққа жетпейді"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="5517122075918038665">"Телефон батареясының қызметтік мерзімін ұзартыңыз"</string>
     <string name="battery_tip_smart_battery_title" product="tablet" msgid="203494973250969040">"Планшет батареясының қызметтік мерзімін ұзартыңыз"</string>
     <string name="battery_tip_smart_battery_title" product="device" msgid="7419448992583346364">"Құрылғы батареясының қызметтік мерзімін ұзартыңыз"</string>
     <string name="battery_tip_smart_battery_summary" msgid="5344821856478265778">"Battery Manager функциясын қосыңыз"</string>
-    <string name="battery_tip_early_heads_up_title" msgid="707163785378746813">"Battery Saver функциясын қосу"</string>
+    <string name="battery_tip_early_heads_up_title" msgid="707163785378746813">"Батареяны үнемдеу режимін қосу"</string>
     <string name="battery_tip_early_heads_up_summary" msgid="4231489566422395156">"Батареяның заряды тез азаюы мүмкін"</string>
-    <string name="battery_tip_early_heads_up_done_title" msgid="112550885882648429">"Battery Saver қосулы"</string>
+    <string name="battery_tip_early_heads_up_done_title" msgid="112550885882648429">"Батареяны үнемдеу режимі қосулы"</string>
     <string name="battery_tip_early_heads_up_done_summary" msgid="8692257022962771181">"Кейбір функциялар шектелуі мүмкін"</string>
     <string name="battery_tip_high_usage_title" product="default" msgid="4103005178310487352">"Телефон әдеттегіден көп қолданылды"</string>
     <string name="battery_tip_high_usage_title" product="tablet" msgid="1019583260005768965">"Планшет әдеттегіден көп қолданылды"</string>
@@ -2317,9 +2317,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="8120081438825031335">"Бұл қолданба батареяны фондық режимде пайдаланады. Батареяның заряды тез азаюы мүмкін."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="9154938931448151479">"Алу"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="7331148618292397166">"Бас тарту"</string>
-    <string name="battery_tip_dialog_summary_message" product="default" msgid="7244950433272770280">"Қолданбалар батарея зарядын қалыпты тұтынуда. Көп тұтынатын болса, телефонда орындауға болатын әрекеттер ұсынылады.\n\nБатарея заряды аз болса, Battery Saver функциясын қосуыңызға болады."</string>
-    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="1721081030632329647">"Қолданбалар батарея зарядын қалыпты тұтынуда. Көп тұтынатын болса, планшетте орындауға болатын әрекеттер ұсынылады.\n\nБатарея заряды аз болса, Battery Saver функциясын қосуыңызға болады."</string>
-    <string name="battery_tip_dialog_summary_message" product="device" msgid="146872407040848465">"Қолданбалар батарея зарядын қалыпты тұтынуда. Көп тұтынатын болса, құрылғыда орындауға болатын әрекеттер ұсынылады.\n\nБатарея заряды аз болса, Battery Saver функциясын қосуыңызға болады."</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="7244950433272770280">"Қолданбалар батарея зарядын қалыпты тұтынуда. Көп тұтынатын болса, телефонда орындауға болатын әрекеттер ұсынылады.\n\nБатарея заряды аз болса, Батареяны үнемдеу режимін қосуыңызға болады."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="1721081030632329647">"Қолданбалар батарея зарядын қалыпты тұтынуда. Көп тұтынатын болса, планшетте орындауға болатын әрекеттер ұсынылады.\n\nБатарея заряды аз болса, Батареяны үнемдеу режимін қосуыңызға болады."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="146872407040848465">"Қолданбалар батарея зарядын қалыпты тұтынуда. Көп тұтынатын болса, құрылғыда орындауға болатын әрекеттер ұсынылады.\n\nБатарея заряды аз болса, Батареяны үнемдеу режимін қосуыңызға болады."</string>
     <string name="smart_battery_manager_title" msgid="5744035036663849515">"Battery Manager"</string>
     <string name="smart_battery_title" msgid="4919670408532804351">"Қолданбаларды автоматты түрде реттеу"</string>
     <string name="smart_battery_summary" msgid="640027046471198174">"Сирек пайдаланылатын қолданбалар үшін батареяның пайдаланылуын шектеу"</string>
@@ -2369,7 +2369,7 @@
     <string name="power_phone" msgid="4644276202135343197">"Дыбыс қоңыраулары"</string>
     <string name="power_idle" product="tablet" msgid="5220710816048070792">"Планшет бос"</string>
     <string name="power_idle" product="default" msgid="440519902393849215">"Күту режимі"</string>
-    <string name="power_unaccounted" msgid="327460424681976487">"Әр түрлі"</string>
+    <string name="power_unaccounted" msgid="327460424681976487">"Әртүрлі"</string>
     <string name="power_overcounted" msgid="8336743020857416490">"Артық есептелген"</string>
     <string name="usage_type_cpu" msgid="1128777292301436265">"Барлық CPU (орталық өңдеу бірлігі)"</string>
     <string name="usage_type_cpu_foreground" msgid="5496661858574622156">"CPU (орталық процессор) алғы шебі"</string>
@@ -2446,7 +2446,7 @@
     <string name="process_kernel_label" msgid="4175060316414593760">"Android операциялық жүйесі"</string>
     <string name="process_mediaserver_label" msgid="8591722404282619153">"Meдиасервері"</string>
     <string name="process_dex2oat_label" msgid="8249082119748556085">"Қолданбаны оңтайландыру"</string>
-    <string name="battery_saver" msgid="3989710213758938398">"Battery Saver"</string>
+    <string name="battery_saver" msgid="3989710213758938398">"Батареяны үнемдеу режимі"</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>
@@ -2455,7 +2455,7 @@
     <string name="battery_saver_auto_percentage_summary" msgid="2036128588460338677">"Заряд деңгейі <xliff:g id="PERCENT">%1$s</xliff:g> болғанда, қосылады"</string>
     <string name="battery_saver_schedule_settings_title" msgid="574233428557678128">"Кестені белгілеу"</string>
     <string name="battery_saver_sticky_title_new" msgid="5328707297110866082">"Толық зарядталғанда өшіру"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="3406582427270935879">"Телефон заряды <xliff:g id="PERCENT">%1$s</xliff:g> болғанда, Battery Saver өшіріледі."</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="3406582427270935879">"Телефон заряды <xliff:g id="PERCENT">%1$s</xliff:g> болғанда, Батареяны үнемдеу режимі өшеді."</string>
     <string name="battery_saver_sticky_description_new" product="tablet" msgid="3284967694001857194">"Планшет заряды <xliff:g id="PERCENT">%1$s</xliff:g> болғанда, Battery Saver өшіріледі."</string>
     <string name="battery_saver_sticky_description_new" product="device" msgid="5056520668081504111">"Құрылғы заряды <xliff:g id="PERCENT">%1$s</xliff:g> болғанда, Battery Saver өшіріледі."</string>
     <!-- no translation found for battery_saver_seekbar_title (7607123201469333645) -->
@@ -2514,7 +2514,7 @@
     <string name="tts_sliders_title" msgid="1927481069989092278">"Сөйлеу жылдамдығы және екпін"</string>
     <string name="tts_engine_section_title" msgid="7796486438271227076">"Жүйе"</string>
     <string name="tts_install_voice_title" msgid="3143328760690690254">"Дауыс"</string>
-    <string name="tts_spoken_language" msgid="8057256621711361944">"Сөйлесу тілі"</string>
+    <string name="tts_spoken_language" msgid="8057256621711361944">"Дыбысталу тілі"</string>
     <string name="tts_install_voices_title" msgid="363811937643579286">"Дауыстарды орнату"</string>
     <string name="tts_install_voices_text" msgid="7464832428439739995">"Дауыстарды орнату үшін <xliff:g id="TTS_APP_NAME">%s</xliff:g> қолданбасына өту"</string>
     <string name="tts_install_voices_open" msgid="686776451008134790">"Қолданбаны ашу"</string>
@@ -3083,7 +3083,7 @@
     <string name="keywords_location" msgid="6439463166207072559">"маңай, орын, тарих, есеп жіберу, GPS"</string>
     <string name="keywords_accounts" msgid="5908945725229306088">"есептік жазба"</string>
     <string name="keywords_users" msgid="5880705776023155640">"шектеу, шектелген"</string>
-    <string name="keywords_keyboard_and_ime" msgid="3327265741354129990">"мәтінді түзету, түзету, дыбыс, дірілдету, авто, тіл, қимыл, ұсыну, ұсыныс, тақырып, тіл тигізетін, сөз, түрі, эмодзи, халықаралық"</string>
+    <string name="keywords_keyboard_and_ime" msgid="3327265741354129990">"мәтінді түзету, түзету, дыбыс, дірілдету, авто, тіл, қимыл, ұсыну, ұсыныс, тақырып, тіл тигізетін, сөз, түрі, эмоджи, халықаралық"</string>
     <string name="keywords_reset_apps" msgid="2645701455052020435">"ысыру, параметрлер, әдепкі"</string>
     <string name="keywords_all_apps" msgid="846444448435698930">"қолданбалар, жүктеу, қолданбалар, жүйе"</string>
     <string name="keywords_app_permissions" msgid="8539841019997048500">"қолданбалар, рұқсаттар, қауіпсіздік"</string>
@@ -3130,7 +3130,7 @@
     <string name="keywords_battery_saver_sticky" msgid="8733804259716284872">"battery saver, бекітілген, тұрақты, power saver, батарея"</string>
     <string name="default_sound" msgid="6675629744816442953">"Әдепкі дыбыс"</string>
     <string name="sound_settings_summary" msgid="8467549670633195109">"Қоңыраудың дыбыс деңгейі: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
-    <string name="sound_dashboard_summary" msgid="5187301919242823508">"Дыбыс деңгейі, діріл, \"Мазаламау\" режимі"</string>
+    <string name="sound_dashboard_summary" msgid="5187301919242823508">"Дыбыс деңгейі, діріл, Мазаламау режимі"</string>
     <string name="sound_settings_summary_vibrate" msgid="2194491116884798590">"Қоңырау дірілдеу режиміне қойылған"</string>
     <string name="sound_settings_summary_silent" msgid="899823817462768876">"Қоңырау үнсіз режимге қойылған"</string>
     <string name="sound_settings_example_summary" msgid="2091822107298841827">"Қоңыраудың дыбыс деңгейі: 80%"</string>
@@ -3144,7 +3144,7 @@
     <string name="notification_ringtone_title" msgid="2932960620843976285">"Әдепкі хабарландыру сигналы"</string>
     <string name="notification_unknown_sound_title" msgid="8043718667804838398">"Қолданбамен берілген дыбыс"</string>
     <string name="notification_sound_default" msgid="2664544380802426260">"Әдепкі хабарландыру дыбысы"</string>
-    <string name="alarm_ringtone_title" msgid="6411326147408635902">"Әдепкі дабыл сигналы"</string>
+    <string name="alarm_ringtone_title" msgid="6411326147408635902">"Әдепкі оятқыш сигналы"</string>
     <string name="vibrate_when_ringing_title" msgid="2757996559847126952">"Қоңырау кезіндегі діріл"</string>
     <string name="other_sound_settings" msgid="5250376066099818676">"Басқа дыбыстар"</string>
     <string name="dial_pad_tones_title" msgid="8877212139988655769">"Нөмір тергіш дыбысы"</string>
@@ -3169,7 +3169,7 @@
       <item quantity="one">1 іске қосылды</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>
@@ -3185,7 +3185,7 @@
     <string name="zen_mode_automatic_rule_settings_page_title" msgid="5272888746413504692">"Кесте"</string>
     <string name="zen_mode_schedule_category_title" msgid="1936785755444711221">"Кесте"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="4921779962633710347">"Телефонды дыбыссыз режимге қою"</string>
-    <string name="zen_mode_automation_suggestion_summary" msgid="2709837472884371037">"\"Мазаламау\" ережесін орнату"</string>
+    <string name="zen_mode_automation_suggestion_summary" msgid="2709837472884371037">"Мазаламау ережесін орнату"</string>
     <string name="zen_mode_schedule_title" msgid="5275268813192802631">"Кесте"</string>
     <string name="zen_mode_use_automatic_rule" msgid="446326253915861824">"Кестені пайдалану"</string>
     <string name="zen_mode_option_important_interruptions" msgid="5173944276846940149">"Маңыздылары ғана"</string>
@@ -3194,14 +3194,14 @@
     <string name="zen_mode_summary_combination" msgid="6960111215170691605">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="8378266552787406849">"Көрнекі мазалағыштарды бөгеу"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6608239691864638854">"Визуалды сигналдарды қосу"</string>
-    <string name="zen_mode_settings_category" msgid="5601680733422424922">"\"Мазаламау\" режимі қосулы кезде"</string>
+    <string name="zen_mode_settings_category" msgid="5601680733422424922">"Мазаламау режимі қосулы кезде"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="7486753018073540477">"Хабарландыруларды шектеу"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="2673665450311184875">"Хабарландырулар дыбыстық сигналсыз беріледі"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="1696217042353376674">"Хабарландырулар экранға шығады"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3049522809520549054">"Хабарландырулар келіп түскенде, телефон дыбыс шығармайды не дірілдемейді."</string>
     <string name="zen_mode_restrict_notifications_hide" msgid="3296933643539682552">"Хабарландырулар визуалды не дыбыстық сигналсыз беріледі"</string>
     <string name="zen_mode_restrict_notifications_hide_summary" msgid="1449301153755270168">"Хабарландырулар көрсетілмейді не естілмейді"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="7617688597593946765">"Жаңа немесе бұрыннан бар хабарландыруларды телефон көрсетпейді, дірілдемейді немесе дыбыс шығармайды. Бірақ телефон әрекетіне және күйіне қатысты маңызды хабарландырулар шыға береді.\n\n\"Мазаламау\" режимін өшірген соң, әлі ашылмаған хабарландыруларды көру үшін экранды жоғарыдан төмен қарай сипап өтіңіз."</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="7617688597593946765">"Жаңа немесе бұрыннан бар хабарландыруларды телефон көрсетпейді, дірілдемейді немесе дыбыс шығармайды. Бірақ телефон әрекетіне және күйіне қатысты маңызды хабарландырулар шыға береді.\n\nМазаламау режимін өшірген соң, әлі ашылмаған хабарландыруларды көру үшін экранды жоғарыдан төмен қарай сипап өтіңіз."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="3167252482570424133">"Арнаулы"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="6376983315529894440">"Арнаулы параметрді қосу"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="8004212081465043044">"Арнаулы параметрді өшіру"</string>
@@ -3232,11 +3232,11 @@
     <string name="zen_mode_enable_dialog_turn_on" msgid="6396050543542026184">"Қосу"</string>
     <string name="zen_mode_button_turn_on" msgid="1097964136225943415">"Қазір қосу"</string>
     <string name="zen_mode_button_turn_off" msgid="3990967728457149454">"Қазір өшіру"</string>
-    <string name="zen_mode_settings_dnd_manual_end_time" msgid="4307574188962071429">"\"Мазаламау\" режимі <xliff:g id="FORMATTED_TIME">%s</xliff:g> дейін қосулы болады"</string>
-    <string name="zen_mode_settings_dnd_manual_indefinite" msgid="3701005376825238752">"\"Мазаламау\" режимі өшірілгенше қосулы болады"</string>
-    <string name="zen_mode_settings_dnd_automatic_rule" msgid="2843297614114625408">"\"Мазаламау\" режимі <xliff:g id="RULE_NAME">%s</xliff:g> ережесі арқылы автоматты түрде қосылды"</string>
-    <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="5103454923160912313">"\"Мазаламау\" режимі <xliff:g id="APP_NAME">%s</xliff:g> қолданбасы арқылы автоматты түрде қосылды"</string>
-    <string name="zen_mode_settings_dnd_custom_settings_footer" msgid="6335108298640066560">"<xliff:g id="RULE_NAMES">%s</xliff:g> үшін арнаулы параметрлер орнатылған \"Мазаламау\" режимі қосулы."</string>
+    <string name="zen_mode_settings_dnd_manual_end_time" msgid="4307574188962071429">"Мазаламау режимі <xliff:g id="FORMATTED_TIME">%s</xliff:g> дейін қосулы болады"</string>
+    <string name="zen_mode_settings_dnd_manual_indefinite" msgid="3701005376825238752">"Мазаламау режимі өшірілгенше қосулы болады"</string>
+    <string name="zen_mode_settings_dnd_automatic_rule" msgid="2843297614114625408">"Мазаламау режимі <xliff:g id="RULE_NAME">%s</xliff:g> ережесі арқылы автоматты түрде қосылды"</string>
+    <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="5103454923160912313">"Мазаламау режимі <xliff:g id="APP_NAME">%s</xliff:g> қолданбасы арқылы автоматты түрде қосылды"</string>
+    <string name="zen_mode_settings_dnd_custom_settings_footer" msgid="6335108298640066560">"<xliff:g id="RULE_NAMES">%s</xliff:g> үшін арнаулы параметрлер орнатылған Мазаламау режимі қосулы."</string>
     <string name="zen_mode_settings_dnd_custom_settings_footer_link" msgid="4007974052885089379"><annotation id="link">" Арнаулы параметрлерді көру"</annotation></string>
     <string name="zen_interruption_level_priority" msgid="9178419297408319234">"Маңыздылары ғана"</string>
     <string name="zen_mode_and_condition" msgid="4123722186007123567">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
@@ -3259,7 +3259,7 @@
     <string name="zen_category_exceptions" msgid="2139670640033601899">"Ерекше жағдайлар"</string>
     <string name="zen_category_schedule" msgid="989629666210114164">"Кесте"</string>
     <string name="zen_sound_title" msgid="3429086967245473870">"Барлық ерекше жағдайларды көру"</string>
-    <string name="zen_sound_footer" msgid="1778673975517424878">"\"Мазаламау\" режимі қосулы кезде, дыбыс және діріл өшіріледі (жоғарыда рұқсат берілгендерді қоспағанда)."</string>
+    <string name="zen_sound_footer" msgid="1778673975517424878">"Мазаламау режимі қосулы кезде, дыбыс және діріл өшіріледі (жоғарыда рұқсат берілгендерді қоспағанда)."</string>
     <string name="zen_sound_category_title" msgid="2109447208414722786">"Келесілерді қоспағанда, барлығының дыбысын өшіру:"</string>
     <string name="zen_sound_all_muted" msgid="4844094866910870591">"Дыбысы өшірулі"</string>
     <string name="zen_sound_none_muted" msgid="4869385974769188085">"Дыбысы өшірілмеген"</string>
@@ -3272,20 +3272,20 @@
     <string name="zen_custom_settings_notifications_header" msgid="7469592764589354302">"Хабарландырулар"</string>
     <string name="zen_custom_settings_duration_header" msgid="1806465684026300942">"Ұзақтығы"</string>
     <string name="zen_msg_event_reminder_title" msgid="8685224436389816905">"Хабарлар, іс-шаралар және еске салғыштар"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="164400918479831580">"\"Мазаламау\" режимі қосулы кезде, хабарлардың, еске салғыштардың және іс-шаралардың дыбысы өшіріледі (жоғарыда рұқсат берілгендерді қоспағанда). Достарыңыз, отбасы мүшелері не басқа контактілер сізге хабарласа алуы үшін, хабарлардың параметрлерін реттей аласыз."</string>
+    <string name="zen_msg_event_reminder_footer" msgid="164400918479831580">"Мазаламау режимі қосулы кезде, хабарлардың, еске салғыштардың және іс-шаралардың дыбысы өшіріледі (жоғарыда рұқсат берілгендерді қоспағанда). Достарыңыз, отбасы мүшелері не басқа контактілер сізге хабарласа алуы үшін, хабарлардың параметрлерін реттей аласыз."</string>
     <string name="zen_onboarding_ok" msgid="6403635918125323678">"Дайын"</string>
     <string name="zen_onboarding_settings" msgid="1416466597876383322">"Параметрлер"</string>
     <string name="zen_onboarding_new_setting_title" msgid="3622673375041304362">"Хабарландырулар визуалды не дыбыстық сигналсыз беріледі"</string>
     <string name="zen_onboarding_current_setting_title" msgid="2560330551761407563">"Хабарландырулар дыбыссыз беріледі"</string>
     <string name="zen_onboarding_new_setting_summary" msgid="8264430315983860075">"Хабарландырулар көрсетілмейді не естілмейді. Жұлдызшалы және тұрақты контактілерден келетін қоңырауларға рұқсат етілген."</string>
     <string name="zen_onboarding_current_setting_summary" msgid="3569246708507270821">"(ағымдағы параметр)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="7584229011611927613">"\"Мазаламау\" режиміндегі хабарландыру параметрлері өзгертілсін бе?"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="7584229011611927613">"Мазаламау режиміндегі хабарландыру параметрлері өзгертілсін бе?"</string>
     <string name="sound_work_settings" msgid="4140215240360927923">"Жұмыс профилінің дыбыстары"</string>
     <string name="work_use_personal_sounds_title" msgid="531727195073003599">"Жеке профиль дыбыстарын пайдалану"</string>
-    <string name="work_use_personal_sounds_summary" msgid="2886871383995187441">"Жұмыс пен жеке профильдер үшін дыбысы қолданылады"</string>
+    <string name="work_use_personal_sounds_summary" msgid="2886871383995187441">"Жұмыс профилі мен жеке профиль дыбыстары бірдей"</string>
     <string name="work_ringtone_title" msgid="5499360583947410224">"Жұмыс телефонының рингтоны"</string>
     <string name="work_notification_ringtone_title" msgid="8059159087214025757">"Әдепкі жұмыс хабарландыруының дыбысы"</string>
-    <string name="work_alarm_ringtone_title" msgid="5328487181385375130">"Әдепкі жұмыс дабылының дыбысы"</string>
+    <string name="work_alarm_ringtone_title" msgid="5328487181385375130">"Әдепкі жұмыс оятқышының дыбысы"</string>
     <string name="work_sound_same_as_personal" msgid="7728560881697159758">"Жеке профильдікімен бірдей"</string>
     <string name="work_sync_dialog_title" msgid="4799120971202956837">"Дыбыстарды ауыстыру керек пе?"</string>
     <string name="work_sync_dialog_yes" msgid="2110726233746476066">"Ауыстыру"</string>
@@ -3371,10 +3371,10 @@
     <string name="no_notification_assistant" msgid="9140123568386413264">"Көмекші жоқ"</string>
     <string name="no_notification_listeners" msgid="1366386609506834717">"Орнатылған қолданбалардың ешбірі хабарландыруға кіруге рұқсат сұрамады."</string>
     <string name="notification_assistant_security_warning_title" msgid="4190584438086738496">"<xliff:g id="SERVICE">%1$s</xliff:g> қызметіне хабарландыруға кіру рұқсатын беру қажет пе?"</string>
-    <string name="notification_assistant_security_warning_summary" msgid="6924513399671031930">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> барлық хабарландыруларды, соның ішінде контакт аттары, сізге келген хабарлардың мәтіні сияқты жеке ақпаратты оқи алатын болады. Сондай-ақ хабарландыруларды өзгерте, жаба немесе олардағы әрекет түймелерін қоса алады. \n\nБұл әрі қолданбаға \"Мазаламау\" режимін қосуға немесе өшіруге және тиісті параметрлерді өзгертуге мүмкіндік береді."</string>
+    <string name="notification_assistant_security_warning_summary" msgid="6924513399671031930">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> барлық хабарландыруларды, соның ішінде контакт аттары, сізге келген хабарлардың мәтіні сияқты жеке ақпаратты оқи алатын болады. Сондай-ақ хабарландыруларды өзгерте, жаба немесе олардағы әрекет түймелерін қоса алады. \n\nБұл әрі қолданбаға Мазаламау режимін қосуға немесе өшіруге және тиісті параметрлерді өзгертуге мүмкіндік береді."</string>
     <string name="notification_listener_security_warning_title" msgid="4902253246428777797">"<xliff:g id="SERVICE">%1$s</xliff:g> үшін хабарландыруға кіру рұқсатын беру қажет пе?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="4454702907350100288">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> барлық хабарландыруларды, оның ішінде контакт аттары, сізге келген хабарлардың мәтіні сияқты жеке ақпаратты оқи алатын болады. Сондай-ақ хабарландыруларды жаба немесе олардағы әрекет түймелерін қоса алатын болады. \n\nБұл әрі қолданбаға \"Мазаламау\" параметрін қосуға немесе өшіруге және байланысты параметрлерді өзгертуге мүмкіндік береді."</string>
-    <string name="notification_listener_disable_warning_summary" msgid="162165151519082978">"Егер <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> үшін хабарландыру параметрін өшірсеңіз, \"Мазаламау\" параметрі де өшуі мүмкін."</string>
+    <string name="notification_listener_security_warning_summary" msgid="4454702907350100288">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> барлық хабарландыруларды, оның ішінде контакт аттары, сізге келген хабарлардың мәтіні сияқты жеке ақпаратты оқи алатын болады. Сондай-ақ хабарландыруларды жаба немесе олардағы әрекет түймелерін қоса алатын болады. \n\nБұл әрі қолданбаға Мазаламау параметрін қосуға немесе өшіруге және байланысты параметрлерді өзгертуге мүмкіндік береді."</string>
+    <string name="notification_listener_disable_warning_summary" msgid="162165151519082978">"Егер <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> үшін хабарландыру параметрін өшірсеңіз, Мазаламау параметрі де өшуі мүмкін."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="7863495391671154188">"Өшіру"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="6264631825225298458">"Бас тарту"</string>
     <string name="vr_listeners_title" msgid="511483902408792832">"Виртуалды шынайылық көмекші қызметтері"</string>
@@ -3390,8 +3390,8 @@
     <string name="picture_in_picture_app_detail_title" msgid="3916189052657425936">"Суреттегі сурет"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"\"Суреттегі сурет\" режиміне рұқсат беру"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="918632751775525347">"Қолданба ашық болғанда не одан шыққанда (мысалы, бейнені көре беру үшін), бұл қолданбаға суреттегі сурет терезесін ашуға мүмкіндік береді. Бұл терезе пайдаланылып жатқан басқа қолданбалардың үстінен шығады."</string>
-    <string name="manage_zen_access_title" msgid="3058206309728524196">"\"Мазаламау\" режимін пайдалану"</string>
-    <string name="zen_access_detail_switch" msgid="8706332327904974500">"\"Мазаламау\" режимін пайдалануға рұқсат ету"</string>
+    <string name="manage_zen_access_title" msgid="3058206309728524196">"Мазаламау режимін пайдалану"</string>
+    <string name="zen_access_detail_switch" msgid="8706332327904974500">"Мазаламау режимін пайдалануға рұқсат ету"</string>
     <string name="zen_access_empty_text" msgid="7667538993781607731">"Орнатылған қолданбалардың ешбірі Мазаламау режиміне кіруге рұқсат сұрамады"</string>
     <string name="loading_notification_apps" msgid="1978345231934072091">"Қолданбаларды жүктеу…"</string>
     <string name="app_notifications_off_desc" msgid="3904090905748895146">"Сұрауыңыз бойынша Android бұл қолданбаның хабарландыруларын көрсетпейді"</string>
@@ -3422,8 +3422,8 @@
     <string name="notification_content_block_summary" msgid="2743896875255591743">"Тақтада немесе перифериялық құрылғыларда хабарландыруларды ешқашан көрсетпеу"</string>
     <string name="notification_badge_title" msgid="8989086619255666442">"Хабарландыру белгісіне рұқсат беру"</string>
     <string name="notification_channel_badge_title" msgid="8228215248332054612">"Хабарландыру белгісін көрсету"</string>
-    <string name="app_notification_override_dnd_title" msgid="1757042206738172601">"\"Мазаламау\" режимін елемеу"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3152957611171210980">"\"Мазаламау\" режимі қосулы болса да, хабарландырулардың шығуына рұқсат ету"</string>
+    <string name="app_notification_override_dnd_title" msgid="1757042206738172601">"Мазаламау режимін елемеу"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3152957611171210980">"Мазаламау режимі қосулы болса да, хабарландырулардың шығуына рұқсат ету"</string>
     <string name="app_notification_visibility_override_title" msgid="2349335170165637672">"Құлып экранында"</string>
     <string name="app_notification_row_banned" msgid="2079325338122151677">"Бөгелген"</string>
     <string name="app_notification_row_priority" msgid="432299064888787236">"Маңызды"</string>
@@ -3446,9 +3446,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>
@@ -3470,7 +3470,7 @@
     <string name="zen_mode_schedule_rule_days_all" msgid="8814173364016139675">"Күн сайын"</string>
     <string name="zen_mode_schedule_alarm_title" msgid="2078194049274875023">"Оятқыш аяқталу уақытын өзгерте алады"</string>
     <string name="zen_mode_schedule_alarm_summary" msgid="5556997989911412070">"Оятқыш қосылған кезде, кесте өшеді"</string>
-    <string name="zen_mode_custom_behavior_title" msgid="8908861697886331001">"\"Мазаламау\" режимі"</string>
+    <string name="zen_mode_custom_behavior_title" msgid="8908861697886331001">"Мазаламау режимі"</string>
     <string name="zen_mode_custom_behavior_summary_default" msgid="3509865340195397447">"Әдепкі параметрлерді пайдалану"</string>
     <string name="zen_mode_custom_behavior_summary" msgid="7206909852887332604">"Осы кесте үшін ерекше параметрлер орнату"</string>
     <string name="zen_mode_custom_behavior_category_title" msgid="7451686525113262087">"\"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" үшін"</string>
@@ -3511,8 +3511,8 @@
     <string name="zen_mode_bypassing_apps" msgid="3080739479028713449">"Қолданбаларға қайта анықтауға рұқсат беру"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="2115024664615538847">"Қолданбаларға арналған ерекшеліктер"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="8723144434730871572">
-      <item quantity="other"><xliff:g id="NUMBER">%1$d</xliff:g> қолданбадан келетін хабарландырулар \"Мазаламау\" режимін қайта анықтай алады</item>
-      <item quantity="one">1 қолданбадан келетін хабарландырулар \"Мазаламау\" режимін қайта анықтай алады</item>
+      <item quantity="other"><xliff:g id="NUMBER">%1$d</xliff:g> қолданбадан келетін хабарландырулар Мазаламау режимін қайта анықтай алады</item>
+      <item quantity="one">1 қолданбадан келетін хабарландырулар Мазаламау режимін қайта анықтай алады</item>
     </plurals>
     <string name="zen_mode_events_list" msgid="8578102701815684873">"оқиғалар"</string>
     <string name="zen_mode_all_callers" msgid="4455039040077343838">"кез келген адам"</string>
@@ -3531,7 +3531,7 @@
     <string name="zen_mode_when_weeknights" msgid="2412709309122408474">"Жұмыс күн-гі түндер"</string>
     <string name="zen_mode_start_time" msgid="5979122139937561731">"Басталу уақыты"</string>
     <string name="zen_mode_end_time" msgid="3188578493250909972">"Аяқталу уақыты"</string>
-    <string name="zen_mode_end_time_next_day_summary_format" msgid="1598612215612648214">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> келесі күні"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="1598612215612648214">"Келесі күні <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
     <string name="zen_mode_summary_alarms_only_indefinite" msgid="2470936648971337656">"Мерзімсіз \"дабылдар ғана\" режиміне өзгерту"</string>
     <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="7192429395424304796">
       <item quantity="other">Дабылдарды (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> дейін) <xliff:g id="DURATION">%1$d</xliff:g> минутқа ғана өзгерту</item>
@@ -3544,10 +3544,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>
@@ -3609,7 +3609,7 @@
     <string name="notifications_silenced" msgid="538923056987616372">"Үнсіз етілген"</string>
     <string name="notifications_redacted" msgid="308836040236690014">"Құлыпталған экранда құпия мазмұн жоқ"</string>
     <string name="notifications_hidden" msgid="3665505522897010205">"Құлыпталған экранда емес"</string>
-    <string name="notifications_priority" msgid="8849045645983017929">"\"Мазаламау\" режимі қайта анықталды"</string>
+    <string name="notifications_priority" msgid="8849045645983017929">"Мазаламау режимі қайта анықталды"</string>
     <string name="notifications_summary_divider" msgid="3148951310482572028">" / "</string>
     <string name="notification_summary_level" msgid="309162160355022027">"%d-деңгейі"</string>
     <string name="notification_summary_channel" msgid="3372346622071114366">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> • <xliff:g id="GROUP_NAME">%2$s</xliff:g>"</string>
@@ -3641,7 +3641,7 @@
     <string name="filter_notif_urgent_channels" msgid="5000735867167027148">"Санаттар: аса маңызды"</string>
     <string name="filter_notif_low_channels" msgid="6859599463135775287">"Санаттар: маңыздылығы төмен"</string>
     <string name="filter_notif_blocked_channels" msgid="6110799550327612670">"Санаттар: өшірілген"</string>
-    <string name="filter_notif_dnd_channels" msgid="3251570137256371092">"Санаттар: \"Мазаламау\" режимін қайта анықтайды"</string>
+    <string name="filter_notif_dnd_channels" msgid="3251570137256371092">"Санаттар: Мазаламау режимін қайта анықтайды"</string>
     <string name="advanced_apps" msgid="6643869089344883537">"Қосымша"</string>
     <string name="configure_apps" msgid="4066683118857400943">"Қолданбаларды конфигурациялау"</string>
     <string name="unknown_app" msgid="2312052973570376877">"Белгісіз қолданба"</string>
@@ -3746,7 +3746,7 @@
     <string name="usb_control_device" msgid="9154790265254725254">"Осы құрылғы"</string>
     <string name="usb_switching" msgid="1230386065163529904">"Ауыстырылуда..."</string>
     <string name="usb_switching_failed" msgid="6857722544186145439">"Ауыстырылмады"</string>
-    <string name="usb_summary_charging_only" msgid="4118449308708872339">"Осы құрылғыны зарядтауда"</string>
+    <string name="usb_summary_charging_only" msgid="4118449308708872339">"Осы құрылғыны зарядтауда."</string>
     <string name="usb_summary_power_only" msgid="3552240122641051107">"Жалғанған құрылғыны зарядтау"</string>
     <string name="usb_summary_file_transfers" msgid="7805342797099821502">"Файл жіберу"</string>
     <string name="usb_summary_tether" msgid="778845069037366883">"USB тетеринг"</string>
@@ -3789,8 +3789,8 @@
     <string name="zen_access_warning_dialog_title" msgid="7704910289810337055">"<xliff:g id="APP">%1$s</xliff:g> қолданбасына «Мазаламау» режиміне кіруге бола ма?"</string>
     <string name="zen_access_warning_dialog_summary" msgid="2717755746850874577">"Қолданба «Мазаламау» режимін қосуы/өшіруі және қатысты параметрлерге өзгерістер енгізуі мүмкін."</string>
     <string name="zen_access_disabled_package_warning" msgid="7086237569177576966">"Хабарландыру параметрі қосулы болғандықтан, міндетті түрде қосулы болуы тиіс"</string>
-    <string name="zen_access_revoke_warning_dialog_title" msgid="6850994585577513299">"<xliff:g id="APP">%1$s</xliff:g> үшін \"Мазаламау\" режиміне қатынасты қайтару керек пе?"</string>
-    <string name="zen_access_revoke_warning_dialog_summary" msgid="3487422193181311403">"Осы қолданба жасаған барлық \"Мазаламау\" ережелері жойылады."</string>
+    <string name="zen_access_revoke_warning_dialog_title" msgid="6850994585577513299">"<xliff:g id="APP">%1$s</xliff:g> үшін Мазаламау режиміне қатынасты қайтару керек пе?"</string>
+    <string name="zen_access_revoke_warning_dialog_summary" msgid="3487422193181311403">"Осы қолданба жасаған барлық Мазаламау ережелері жойылады."</string>
     <string name="ignore_optimizations_on" msgid="4373971641328943551">"Оңтайландырмау"</string>
     <string name="ignore_optimizations_off" msgid="4372289432580282870">"Оңтайландыру"</string>
     <string name="ignore_optimizations_on_desc" msgid="2904484569799521559">"Батарея тезірек отыруы мүмкін: қолданбаларға енді фондық режимде батареяны пайдалануға шектеу қойылмайды"</string>
@@ -3890,14 +3890,14 @@
     <string name="condition_hotspot_title" msgid="4143299802283098506">"Хотспот қосулы"</string>
     <string name="condition_airplane_title" msgid="8484582712516148433">"Ұшақ режимі қосулы"</string>
     <string name="condition_airplane_summary" msgid="3021193218494740742">"Желілер қолжетімді емес."</string>
-    <string name="condition_zen_title" msgid="2128184708916052585">"\"Мазаламау\" режимі қосулы"</string>
+    <string name="condition_zen_title" msgid="2128184708916052585">"Мазаламау режимі қосулы"</string>
     <string name="condition_zen_summary_phone_muted" msgid="4396050395522974654">"Телефон дыбысы өшірулі"</string>
     <string name="condition_zen_summary_with_exceptions" msgid="3435216391993785818">"Ерекше жағдайлар қарастырылған"</string>
     <string name="condition_battery_title" msgid="6704870010912986274">"Батарея үнемдегіш қосулы"</string>
     <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>
-    <string name="condition_bg_data_title" msgid="184684435298857712">"Data Saver"</string>
+    <string name="condition_bg_data_title" msgid="184684435298857712">"Трафикті үнемдеу"</string>
     <string name="condition_bg_data_summary" msgid="5194942860807136682">"Мүмкіндіктер шектеулі"</string>
     <string name="condition_work_title" msgid="9046811302347490371">"Жұмыс профилі өшірулі"</string>
     <string name="condition_work_summary" msgid="5586134491975748565">"Қолданбалар және хабарландырулар үшін"</string>
@@ -3964,8 +3964,8 @@
     <string name="configure" msgid="8232696842838580549">"Конфигурациялау"</string>
     <string name="data_usage_other_apps" msgid="7002491980141402084">"Басқа қолданбалар трафикке қосылды"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="6046013861315713697">
-      <item quantity="other">Data Saver қосулы кезде, <xliff:g id="COUNT">%1$d</xliff:g> қолданбаға деректерді шексіз пайдалануға рұқсат етілген</item>
-      <item quantity="one">Data Saver қосулы кезде, 1 қолданбаға деректерді шексіз пайдалануға рұқсат етілген</item>
+      <item quantity="other">Трафикті үнемдеу режимі қосулы кезде, <xliff:g id="COUNT">%1$d</xliff:g> қолданбаға деректерді шексіз пайдалануға рұқсат етілген</item>
+      <item quantity="one">Трафикті үнемдеу режимі қосулы кезде, 1 қолданбаға деректерді шексіз пайдалануға рұқсат етілген</item>
     </plurals>
     <string name="data_usage_title" msgid="7874606430902201083">"Негізгі деректер"</string>
     <string name="data_usage_wifi_title" msgid="7161828479387766556">"Wi‑Fi деректері"</string>
@@ -3985,14 +3985,14 @@
     <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">"Data Saver"</string>
+    <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_off" msgid="7439439787358504018">"Өшірулі"</string>
-    <string name="data_saver_switch_title" msgid="8244008132112735207">"Data Saver функциясын қолдану"</string>
+    <string name="data_saver_switch_title" msgid="8244008132112735207">"Трафикті үнемдеу функциясын қолдану"</string>
     <string name="unrestricted_app_title" msgid="4390661122069905122">"Деректерді шексіз пайдалану"</string>
-    <string name="unrestricted_app_summary" msgid="2829141815077800483">"Data Saver қосулы кезде, деректерді шексіз пайдалануға рұқсат ету"</string>
+    <string name="unrestricted_app_summary" msgid="2829141815077800483">"Трафикті үнемдеу режимі қосулы кезде, деректерді шексіз пайдалануға рұқсат ету"</string>
     <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>
@@ -4272,7 +4272,7 @@
     <string name="storage_movies_tv" msgid="7282484273991655296">"Фильм және телебағдарлама қолданбалары"</string>
     <string name="carrier_provisioning" msgid="3309125279191534469">"Операторды инициализациялау туралы ақпарат"</string>
     <string name="trigger_carrier_provisioning" msgid="6284005970057901477">"Операторды инциализациялауды іске қосу"</string>
-    <string name="zen_suggestion_title" msgid="2134699720214231950">"\"Мазаламау\" режимін жаңарту"</string>
+    <string name="zen_suggestion_title" msgid="2134699720214231950">"Мазаламау режимін жаңарту"</string>
     <string name="zen_suggestion_summary" msgid="4041062903237952737">"Алаңдататын хабарландыруларды кідірту"</string>
     <string name="disabled_low_ram_device" msgid="4958060232123741721">"Бұл мүмкіндік құрылғыда жоқ"</string>
     <string name="disabled_feature" msgid="3747549387387702365">"Бұл функция қолжетімді емес."</string>
@@ -4419,7 +4419,7 @@
     <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_ok" msgid="7133484721717815447">"Жою"</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>
diff --git a/tests/CarDeveloperOptions/res/values-km/strings.xml b/tests/CarDeveloperOptions/res/values-km/strings.xml
index 4ac7a2c..89cad7e 100644
--- a/tests/CarDeveloperOptions/res/values-km/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-km/strings.xml
@@ -655,8 +655,8 @@
       <item quantity="one">ត្រូវ​តែ​មាន​យ៉ាង​ហោច​ណាស់ <xliff:g id="COUNT_0">%d</xliff:g> តួ</item>
     </plurals>
     <plurals name="lockpassword_pin_too_short" formatted="false" msgid="6805936168283187298">
-      <item quantity="other">កូដ PIN ត្រូវ​តែ​មាន​យ៉ាង​ហោច​ណាស់ <xliff:g id="COUNT_1">%d</xliff:g> ខ្ទង់</item>
-      <item quantity="one">កូដ PIN ត្រូវ​តែ​មាន​យ៉ាង​ហោច​ណាស់ <xliff:g id="COUNT_0">%d</xliff:g> ខ្ទង់</item>
+      <item quantity="other">កូដ PIN ត្រូវ​មានយ៉ាងតិច <xliff:g id="COUNT_1">%d</xliff:g> ខ្ទង់</item>
+      <item quantity="one">កូដ PIN ត្រូវ​មានយ៉ាងតិច <xliff:g id="COUNT_0">%d</xliff:g> ខ្ទង់</item>
     </plurals>
     <string name="lockpassword_continue_label" msgid="7279261861924400655">"បន្ត"</string>
     <plurals name="lockpassword_password_too_long" formatted="false" msgid="7994068708438608179">
@@ -1313,7 +1313,7 @@
     <string name="security_patch" msgid="483709031051932208">"កម្រិតបំណះសុវត្ថិភាព Android"</string>
     <string name="model_info" msgid="1729765474260797594">"ម៉ូដែល"</string>
     <string name="model_summary" msgid="8781425868254352168">"ម៉ូដែល៖ %1$s"</string>
-    <string name="hardware_info" msgid="174270144950621815">"ម៉ូដែល និង​ផ្នែករឹង"</string>
+    <string name="hardware_info" msgid="174270144950621815">"ម៉ូដែល និង​ហាតវែរ"</string>
     <string name="hardware_revision" msgid="3315744162524354246">"កំណែ​ផ្នែករឹង"</string>
     <string name="fcc_equipment_id" msgid="8681995718533066093">"លេខ​សម្គាល់​បរិក្ខារ"</string>
     <string name="baseband_version" msgid="9115560821840757786">"កំណែ​មូលដ្ឋាន"</string>
@@ -2446,7 +2446,7 @@
     <string name="process_kernel_label" msgid="4175060316414593760">"ប្រព័ន្ធ​ប្រតិបត្តិការ Android"</string>
     <string name="process_mediaserver_label" msgid="8591722404282619153">"Mediaserver"</string>
     <string name="process_dex2oat_label" msgid="8249082119748556085">"បង្កើនប្រសិទ្ធិភាពកម្មវិធី"</string>
-    <string name="battery_saver" msgid="3989710213758938398">"កម្មវិធីសន្សំថ្ម"</string>
+    <string name="battery_saver" msgid="3989710213758938398">"មុខងារ​សន្សំ​ថ្ម"</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>
@@ -3422,7 +3422,7 @@
     <string name="notification_content_block_summary" msgid="2743896875255591743">"កុំ​បង្ហាញ​ការ​ជូន​ដំណឹង​នៅក្នុង​ផ្ទាំង​ទម្លាក់ ឬ​នៅលើ​ឧបករណ៍​ភ្ជាប់​ជាមួយ​កុំព្យូទ័រ"</string>
     <string name="notification_badge_title" msgid="8989086619255666442">"អនុញ្ញាតស្លាកជូនដំណឹង"</string>
     <string name="notification_channel_badge_title" msgid="8228215248332054612">"បង្ហាញស្លាកជូនដំណឹង"</string>
-    <string name="app_notification_override_dnd_title" msgid="1757042206738172601">"បដិសេធមុខងារកុំរំខាន"</string>
+    <string name="app_notification_override_dnd_title" msgid="1757042206738172601">"លុបពីលើមុខងារកុំរំខាន"</string>
     <string name="app_notification_override_dnd_summary" msgid="3152957611171210980">"អនុញ្ញាត​ឱ្យ​ការជូនដំណឹង​ទាំងនេះ​បន្ត​រំខាន នៅពេល​មុខងារកុំរំខាន​បើក"</string>
     <string name="app_notification_visibility_override_title" msgid="2349335170165637672">"នៅ​លើ​អេក្រង់​ចាក់សោ"</string>
     <string name="app_notification_row_banned" msgid="2079325338122151677">"បាន​រារាំង"</string>
@@ -3736,7 +3736,7 @@
     <string name="usb_use_tethering" msgid="4250626730173163846">"ការ​ភ្ជាប់តាម USB"</string>
     <string name="usb_use_MIDI" msgid="4710632870781041401">"MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="1770966187150010947">"ប្រើឧបករណ៍នេះជាមីឌី"</string>
-    <string name="usb_use" msgid="8940500223316278632">"ប្រើ USB ដើម្បី"</string>
+    <string name="usb_use" msgid="8940500223316278632">"ប្រើ USB សម្រាប់"</string>
     <string name="usb_default_label" msgid="7471316635263936101">"ការកំណត់​រចនាសម្ព័ន្ធ USB លំនាំ​ដើម"</string>
     <string name="usb_default_info" msgid="953775292571786528">"ការកំណត់​ទាំងនេះ​នឹងអនុវត្ត នៅពេល​ដែល​ទូរសព្ទ​របស់អ្នក​ដោះសោ ហើយឧបករណ៍​ផ្សេងទៀត​ត្រូវបានភ្ជាប់​។ សូម​ភ្ជាប់​ជាមួយឧបករណ៍​ដែលទុកចិត្ត​តែប៉ុណ្ណោះ។"</string>
     <string name="usb_pref" msgid="6194821550693495068">"USB"</string>
@@ -4052,7 +4052,7 @@
     <string name="display_cutout_emulation_keywords" msgid="6795671536772871439">"ឆក, ក្បាលឆក"</string>
     <string name="overlay_option_device_default" msgid="165508753381657697">"លំនាំដើម​របស់ឧបករណ៍"</string>
     <string name="overlay_toast_failed_to_apply" msgid="5692251825129250040">"មិនអាចប្រើ​ការដាក់​ត្រួតគ្នា​បានទេ"</string>
-    <string name="special_access" msgid="1453926335914696206">"ការចូលប្រើប្រាស់កម្មវិធីពិសេស"</string>
+    <string name="special_access" msgid="1453926335914696206">"សិទ្ធិចូលប្រើប្រាស់កម្មវិធីពិសេស"</string>
     <plurals name="special_access_summary" formatted="false" msgid="5182092345063909346">
       <item quantity="other">កម្មវិធី <xliff:g id="COUNT">%d</xliff:g> អាច​ប្រើ​ទិន្នន័យដែលគ្មានការដាក់កំហិត</item>
       <item quantity="one">កម្មវិធី 1 អាច​ប្រើ​ទិន្នន័យដែលគ្មានការដាក់កំហិត</item>
diff --git a/tests/CarDeveloperOptions/res/values-kn/arrays.xml b/tests/CarDeveloperOptions/res/values-kn/arrays.xml
index 2b09f58..d690770 100644
--- a/tests/CarDeveloperOptions/res/values-kn/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-kn/arrays.xml
@@ -324,7 +324,7 @@
     <item msgid="1600379420669104929">"ಧ್ವನಿ ವಾಲ್ಯೂಮ್"</item>
     <item msgid="6296768210470214866">"ರಿಂಗ್ ವಾಲ್ಯೂಮ್"</item>
     <item msgid="510690696071629241">"ಮಾಧ್ಯಮ ವಾಲ್ಯೂಮ್"</item>
-    <item msgid="406861638631430109">"ಅಲಾರಮ್ ವಾಲ್ಯೂಮ್"</item>
+    <item msgid="406861638631430109">"ಅಲಾರಂ ವಾಲ್ಯೂಮ್"</item>
     <item msgid="4715864795872233884">"ಅಧಿಸೂಚನೆ ವಾಲ್ಯೂಮ್"</item>
     <item msgid="2311478519251301183">"ಬ್ಲೂಟೂತ್‌‌ ವಾಲ್ಯೂಮ್"</item>
     <item msgid="5133991377896747027">"ಎಚ್ಚರವಾಗಿಡಿ"</item>
@@ -391,7 +391,7 @@
     <item msgid="6462911487571123954">"100%"</item>
   </string-array>
   <string-array name="captioning_preset_selector_titles">
-    <item msgid="326819345272910536">"ಆಪ್‌‌ ಡಿಫಾಲ್ಟ್‌ ಬಳಸಿ"</item>
+    <item msgid="326819345272910536">"ಆ್ಯಪ್‍‍ ಡಿಫಾಲ್ಟ್‌ ಬಳಸಿ"</item>
     <item msgid="8611890312638868524">"ಕಪ್ಪು ಬಣ್ಣದಲ್ಲಿ ಬಿಳಿ"</item>
     <item msgid="5891360837786277638">"ಬಿಳಿ ಬಣ್ಣದಲ್ಲಿ ಕಪ್ಪು"</item>
     <item msgid="2798457065945456853">"ಕಪ್ಪು ಬಣ್ಣದಲ್ಲಿ ಹಳದಿ"</item>
diff --git a/tests/CarDeveloperOptions/res/values-kn/strings.xml b/tests/CarDeveloperOptions/res/values-kn/strings.xml
index e51e8c9..2720a5f 100644
--- a/tests/CarDeveloperOptions/res/values-kn/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-kn/strings.xml
@@ -264,7 +264,7 @@
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="7959964366461613091">"USB ಸಂಗ್ರಹಣೆಯನ್ನು ಓದಲು ಮಾತ್ರ ಅಳವಡಿಸಲಾಗಿದೆ."</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="8854112253788893415">"SD ಕಾರ್ಡ್‌ ಅನ್ನು ಓದಲು ಮಾತ್ರ ಅಳವಡಿಸಲಾಗಿದೆ."</string>
     <string name="skip_label" msgid="8067961347551157478">"ಸ್ಕಿಪ್‌"</string>
-    <string name="next_label" msgid="4710056309804362410">"ಮುಂದೆ"</string>
+    <string name="next_label" msgid="4710056309804362410">"ಮುಂದಿನದು"</string>
     <string name="language_picker_title" msgid="7807759931261107686">"ಭಾಷೆಗಳು"</string>
     <string name="locale_remove_menu" msgid="3395565699934985486">"ತೆಗೆದುಹಾಕಿ"</string>
     <string name="add_a_language" msgid="4103889327406274800">"ಭಾಷೆ ಸೇರಿಸಿ"</string>
@@ -445,7 +445,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="9168637333731599827">"ರದ್ದುಮಾಡಿ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="271662150372486535">"ಮುಂದುವರಿಸು"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="756928427429893070">"ಸ್ಕಿಪ್‌"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="4125977169169671144">"ಮುಂದೆ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="4125977169169671144">"ಮುಂದಿನದು"</string>
     <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>
@@ -491,7 +491,7 @@
     <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>
+    <string name="fingerprint_enroll_button_next" msgid="6419214079104413695">"ಮುಂದಿನದು"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="5831834311961551423">"ನಿಮ್ಮ ಫೋನ್‌ ಅನ್‌ಲಾಕ್‌ ಮಾಡುವುದಕ್ಕೆ ಹೆಚ್ಚುವರಿಯಾಗಿ, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್‌ ಪ್ರವೇಶಿಸಲು ನಿಮ್ಮ ಬೆರಳಚ್ಚು‌ ಅನ್ನು ಕೂಡಾ ನೀವು ಬಳಸಬಹುದು. "<annotation id="url">"ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ"</annotation></string>
     <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7954742554236652690">" ಪರದೆ ಲಾಕ್ ಆಯ್ಕೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ. ಇನ್ನಷ್ಟು ತಿಳಿಯಲು ನಿಮ್ಮ ಸಂಸ್ಥೆಯ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ. "<annotation id="admin_details">"ಹೆಚ್ಚಿನ ವಿವರಗಳು"</annotation>\n\n"ಖರೀದಿಗಳನ್ನು ಅನುಮೋದಿಸಲು ಅಥವಾ ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಪ್ರವೇಶಿಸಲು ನಿಮ್ಮ ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಇನ್ನೂ ಬಳಸಬಹುದು. "<annotation id="url">"ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ"</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1670703069782212223">"ಬೆರಳನ್ನು ಮೇಲಕ್ಕೆ ಎತ್ತಿರಿ, ನಂತರ ಮತ್ತೊಮ್ಮೆ ಸೆನ್ಸರ್ ಅನ್ನು ಸ್ಪರ್ಶಿಸಿ"</string>
@@ -709,7 +709,7 @@
     <string name="lockpassword_clear_label" msgid="3201458533657963554">"ತೆರವುಗೊಳಿಸಿ"</string>
     <string name="lockpassword_credential_changed" msgid="5183961439209866170">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಅನ್ನು ಈಗಾಗಲೇ ಬದಲಾಯಿಸಲಾಗಿದೆ. ಹೊಸ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಬಳಸಿಕೊಂಡು ಪುನಃ ಪ್ರಯತ್ನಿಸಿ."</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="450401426127674369">"ರದ್ದುಮಾಡಿ"</string>
-    <string name="lockpattern_tutorial_continue_label" msgid="8474690922559443018">"ಮುಂದೆ"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="8474690922559443018">"ಮುಂದಿನದು"</string>
     <string name="lock_setup" msgid="8710689848703935088">"ಸೆಟಪ್ ಪೂರ್ಣಗೊಂಡಿದೆ."</string>
     <string name="manage_device_admin" msgid="322047441168191695">"ಸಾಧನ ನಿರ್ವಹಣಾ ಆ್ಯಪ್‍‍ಗಳು"</string>
     <string name="number_of_device_admins_none" msgid="8519193548630223132">"ಸಕ್ರಿಯ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಲ್ಲ"</string>
@@ -729,7 +729,7 @@
     <string name="bluetooth_settings" msgid="5228032727293770389">"ಬ್ಲೂಟೂತ್‌‌"</string>
     <string name="bluetooth_settings_title" msgid="7261244857456521825">"ಬ್ಲೂಟೂತ್‌‌"</string>
     <string name="bluetooth_settings_summary" msgid="1221689092429277887">"ಸಂಪರ್ಕಗಳನ್ನು ನಿರ್ವಹಿಸಿ, ಸಾಧನದ ಹೆಸರು &amp; ಅನ್ವೇಷಣೆಯಾಗುವಿಕೆಯನ್ನು ಹೊಂದಿಸಿ"</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">"ಬ್ಲೂಟೂತ್ ಜೋಡಿಸುವ ಕೋಡ್"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="6205151011298670207">"ಜೋಡಣೆ ಕೋಡ್‌ ಟೈಪ್‌ ಮಾಡಿ ತದನಂತರ ರಿಟರ್ನ್‌ ಅಥವಾ ಎಂಟರ್‌ ಒತ್ತಿ."</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="9138308197078115672">"ಅಕ್ಷರಗಳು ಅಥವಾ ಚಿಹ್ನೆಗಳನ್ನು ಪಿನ್‌ ಹೊಂದಿದೆ"</string>
@@ -1168,7 +1168,7 @@
     <string name="accessibility_category_personal" msgid="1423427301759058762">"ವೈಯಕ್ತಿಕ ಪ್ರೊಫೈಲ್ ಖಾತೆಗಳು"</string>
     <string name="accessibility_work_account_title" msgid="3195468574776888011">"ಕೆಲಸದ ಖಾತೆ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_personal_account_title" msgid="7251761883688839354">"ವೈಯಕ್ತಿಕ ಖಾತೆ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
-    <string name="search_settings" msgid="5809250790214921377">"ಹುಡುಕಿ"</string>
+    <string name="search_settings" msgid="5809250790214921377">"Search"</string>
     <string name="display_settings" msgid="1045535829232307190">"ಪ್ರದರ್ಶನ"</string>
     <string name="accelerometer_title" msgid="2427487734964971453">"ಪರದೆಯನ್ನು ಸ್ವಯಂ-ತಿರುಗಿಸು"</string>
     <string name="color_mode_title" msgid="8164858320869449142">"ಬಣ್ಣಗಳು"</string>
@@ -1369,7 +1369,7 @@
     <string name="memory_available_read_only" msgid="9125440204248584531">"ಲಭ್ಯವಿದೆ (ಓದಲು ಮಾತ್ರ)"</string>
     <string name="memory_size" msgid="6637939229251056764">"ಒಟ್ಟು ಸ್ಥಳ"</string>
     <string name="memory_calculating_size" msgid="8407591625479256510">"ಎಣಿಕೆ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
-    <string name="memory_apps_usage" msgid="1886814780760368266">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು &amp; ಅಪ್ಲಿಕೇಶನ್‌ ಡೇಟಾ"</string>
+    <string name="memory_apps_usage" msgid="1886814780760368266">"ಆ್ಯಪ್‍ಗಳು &amp; ಆ್ಯಪ್‍ ಡೇಟಾ"</string>
     <string name="memory_media_usage" msgid="2744652206722240527">"ಮಾಧ್ಯಮ"</string>
     <string name="memory_downloads_usage" msgid="7039979723012065168">"ಡೌನ್‌ಲೋಡ್‌"</string>
     <string name="memory_dcim_usage" msgid="599009211606524732">"ಚಿತ್ರಗಳು, ವೀಡಿಯೊಗಳು"</string>
@@ -1450,7 +1450,7 @@
     <string name="storage_internal_forget_confirm_title" msgid="331032276130605241">"<xliff:g id="NAME">^1</xliff:g> ಮರೆತುಹೋಯಿತೇ?"</string>
     <string name="storage_internal_forget_confirm" msgid="3052483375203727176">"ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು, ಫೋಟೋಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಈ <xliff:g id="NAME">^1</xliff:g> ನಲ್ಲಿ ಸಂಗ್ರಹಿಸಿದರೆ ಶಾಶ್ವತವಾಗಿ ಕಳೆದುಹೋಗುತ್ತದೆ."</string>
     <string name="storage_detail_apps" msgid="8154648512504196820">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
-    <string name="storage_detail_images" msgid="6996202225684468964">"ಚಿತ್ರಗಳು"</string>
+    <string name="storage_detail_images" msgid="6996202225684468964">"Images"</string>
     <string name="storage_detail_videos" msgid="6030983354721080849">"ವೀಡಿಯೊಗಳು"</string>
     <string name="storage_detail_audio" msgid="6011098436589663944">"ಆಡಿಯೊ"</string>
     <string name="storage_detail_cached" msgid="5761648455067920683">"ಸಂಗ್ರಹಿಸಿದ ಡೇಟಾ"</string>
@@ -1458,7 +1458,7 @@
     <string name="storage_detail_system" msgid="6784247618772153283">"ಸಿಸ್ಟಂ"</string>
     <string name="storage_detail_explore" msgid="8206900269596580264">"<xliff:g id="NAME">^1</xliff:g> ಅನ್ನು ಎಕ್ಸ್‌ಪ್ಲೋರ್ ಮಾಡಿ"</string>
     <string name="storage_detail_dialog_other" msgid="5073511663616043370">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಉಳಿಸಿರುವ ಹಂಚಿದ ಫೈಲ್‌ಗಳು, ಇಂಟರ್ನೆಟ್ ಅಥವಾ ಬ್ಲೂಟೂತ್ ಮೂಲಕ ಡೌನ್‌ಲೋಡ್ ಮಾಡಿರುವ ಫೈಲ್‌ಗಳು, Android ಫೈಲ್‌ಗಳು ಹಾಗೂ ಮೊದಲಾದವುಗಳನ್ನು ಒಳಗೊಂಡಿರುತ್ತವೆ. \n\n ಇದರ ಗೋಚರಿಸುವ ವಿಷಯಗಳನ್ನು ವೀಕ್ಷಿಸಲು <xliff:g id="NAME">^1</xliff:g>, ಎಕ್ಸ್‌ಪ್ಲೋರ್ ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
-    <string name="storage_detail_dialog_system" msgid="1472572861360014226">"Android ಆವೃತ್ತಿ <xliff:g id="VERSION">%s</xliff:g> ರನ್ ಮಾಡಲು ಬಳಸುವ ಫೈಲ್‌ಗಳನ್ನು ಸಿಸ್ಟಂ ಒಳಗೊಂಡಿದೆ"</string>
+    <string name="storage_detail_dialog_system" msgid="1472572861360014226">"Android ಆವೃತ್ತಿ <xliff:g id="VERSION">%s</xliff:g> ರನ್ ಮಾಡಲು ಬಳಸುವ ಫೈಲ್‌ಗಳು ಈ ಸಿಸ್ಟಂನಲ್ಲಿವೆ"</string>
     <string name="storage_detail_dialog_user" msgid="1663117417635010371">"<xliff:g id="USER_0">^1</xliff:g> ಅವರು <xliff:g id="SIZE">^2</xliff:g> ಸಂಗ್ರಹಣೆ ಬಳಸಿ ಫೋಟೋಗಳು, ಸಂಗೀತ, ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅಥವಾ ಇತರ ಡೇಟಾವನ್ನು ಉಳಿಸಿರಬಹುದು. \n\nವಿವರಗಳನ್ನು ವೀಕ್ಷಿಸಲು <xliff:g id="USER_1">^1</xliff:g> ಗೆ ಬದಲಾಯಿಸಿ."</string>
     <string name="storage_wizard_init_title" msgid="3407283236421089014">"ನಿಮ್ಮ <xliff:g id="NAME">^1</xliff:g> ಅನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="storage_wizard_init_external_title" msgid="6853250619674645478">"ಪೋರ್ಟಬಲ್ ಸಂಗ್ರಹಣೆಯಂತೆ ಬಳಸಿ"</string>
@@ -1569,7 +1569,7 @@
     <string name="menu_restore" msgid="3799288817317293115">"ಡೀಫಾಲ್ಟ್‌ಗೆ  ಮರುಹೊಂದಿಸು"</string>
     <string name="restore_default_apn_completed" msgid="5671734152740058937">"ಡಿಫಾಲ್ಟ್ APN ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಮರುಹೊಂದಿಕೆಯು ಪೂರ್ಣಗೊಂಡಿದೆ."</string>
     <string name="reset_dashboard_title" msgid="7084966342252178530">"ಮರುಹೊಂದಿಸುವ ಆಯ್ಕೆಗಳು"</string>
-    <string name="reset_dashboard_summary" msgid="8778383341461126642">"ನೆಟ್‌ವರ್ಕ್, ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅಥವಾ ಸಾಧನವನ್ನು ಮರುಹೊಂದಿಸಬಹುದಾಗಿದೆ"</string>
+    <string name="reset_dashboard_summary" msgid="8778383341461126642">"ನೆಟ್‌ವರ್ಕ್, ಆ್ಯಪ್‍‍ಗಳು ಅಥವಾ ಸಾಧನವನ್ನು ಮರುಹೊಂದಿಸಬಹುದಾಗಿದೆ"</string>
     <string name="reset_network_title" msgid="8944059136930806211">"ವೈ-ಫೈ, ಮೊಬೈಲ್ ಮತ್ತು ಬ್ಲೂಟೂತ್ ಮರುಹೊಂದಿಸಿ"</string>
     <string name="reset_network_desc" msgid="4982633363916261109">"ಕೆಳಗಿನವುಗಳನ್ನು ಒಳಗೊಂಡಂತೆ ಇದು ಎಲ್ಲಾ ನೆಟ್‌ವರ್ಕ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮರುಹೊಂದಿಸುತ್ತದೆ:\n\n"<li>"ವೈ-ಫೈ"</li>\n<li>"ಮೊಬೈಲ್ ಡೇಟಾ"</li>\n<li>"ಬ್ಲೂಟೂತ್‌"</li></string>
     <string name="reset_esim_title" msgid="7630781767040831893">"ಡೌನ್‌ಲೋಡ್ ಮಾಡಿದ SIM ಅಳಿಸಿ"</string>
@@ -1583,8 +1583,8 @@
     <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_short_title" msgid="919098101581335101">"ಎಲ್ಲಾ ಡೇಟಾ ಅಳಿಸಿ (ಫ್ಯಾಕ್ಟರಿ ಮರುಹೊಂದಿಸಿ)"</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>
     <string name="master_clear_accounts" product="default" msgid="3432884235445405376">\n\n"ನೀವು ಪ್ರಸ್ತುತ ಕೆಳಗಿನ ಖಾತೆಗಳಿಗೆ ಸೈನ್ ಇನ್ ಆಗಿರುವಿರಿ:\n"</string>
@@ -1636,7 +1636,7 @@
     <string name="sms_application_title" msgid="7815840568119334679">"SMS ಅಪ್ಲಿಕೇಶನ್"</string>
     <string name="sms_change_default_dialog_title" msgid="6301260161969667578">"SMS ಅಪ್ಲಿಕೇಶನ್‌ ಬದಲಾಯಿಸುವುದೇ?"</string>
     <string name="sms_change_default_dialog_text" msgid="8275088077930942680">"<xliff:g id="CURRENT_APP">%2$s</xliff:g> ಬದಲಾಗಿ <xliff:g id="NEW_APP">%1$s</xliff:g> ಅನ್ನು ನಿಮ್ಮ SMS ಅಪ್ಲಿಕೇಶನ್‌ ಆಗಿ ಬಳಸುವುದೇ?"</string>
-    <string name="sms_change_default_no_previous_dialog_text" msgid="4680224695080527907">"<xliff:g id="NEW_APP">%s</xliff:g> ಅನ್ನು ನಿಮ್ಮ SMS ಅಪ್ಲಿಕೇಶನ್‌ ಆಗಿ ಬಳಸುವುದೇ?"</string>
+    <string name="sms_change_default_no_previous_dialog_text" msgid="4680224695080527907">"<xliff:g id="NEW_APP">%s</xliff:g> ಅನ್ನು ನಿಮ್ಮ SMS ಆ್ಯಪ್‍ ಆಗಿ ಬಳಸುವುದೇ?"</string>
     <string name="network_scorer_picker_title" msgid="1691073966560952916">"ನೆಟ್‌ವರ್ಕ್ ರೇಟಿಂಗ್ ಒದಗಿಸುವವರು"</string>
     <string name="network_scorer_picker_none_preference" msgid="6448280557733231737">"ಯಾವುದೂ ಅಲ್ಲ"</string>
     <string name="network_scorer_change_active_dialog_title" msgid="4274159562371475090">"Wi‑Fi ಸಹಾಯಕವನ್ನು ಬದಲಿಸುವುದೇ?"</string>
@@ -1788,9 +1788,9 @@
     <string name="manageapplications_settings_summary" msgid="5092964799412478962">"ಸ್ಥಾಪಿಸಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ನಿರ್ವಹಿಸಿ ಮತ್ತು ತೆಗೆದುಹಾಕಿ"</string>
     <string name="applications_settings" msgid="368331725658793179">"ಅಪ್ಲಿಕೇಶನ್ ಮಾಹಿತಿ"</string>
     <string name="applications_settings_summary" msgid="8888258399577123906">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ನಿರ್ವಹಿಸಿ, ಶೀಘ್ರ ಪ್ರಾರಂಭ ಶಾರ್ಟ್‌ಕಟ್‌ಗಳನ್ನು ಹೊಂದಿಸಿ"</string>
-    <string name="applications_settings_header" msgid="3766501606045211098">"ಅಪ್ಲಿಕೇಶನ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
+    <string name="applications_settings_header" msgid="3766501606045211098">"ಆ್ಯಪ್‍ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="install_applications" msgid="7745902974984889179">"ಅಪರಿಚಿತ ಮೂಲಗಳು"</string>
-    <string name="install_applications_title" msgid="8164828577588659496">"ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್ ಮೂಲಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
+    <string name="install_applications_title" msgid="8164828577588659496">"ಎಲ್ಲಾ ಆ್ಯಪ್‍ ಮೂಲಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="recent_app_category_title" msgid="7688788038277126727">"ಇತ್ತೀಚೆಗಷ್ಟೇ ತೆರೆಯಲಾಗಿರುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="see_all_apps_title" msgid="6435061912110347474">"ಎಲ್ಲಾ <xliff:g id="COUNT">%1$d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string>
     <string name="install_all_warning" product="tablet" msgid="4580699862358542727">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಹಾಗೂ ವೈಯಕ್ತಿಕ ಡೇಟಾ, ಅಪರಿಚಿತ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ದಾಳಿಗೆ ತುತ್ತಾಗುವ ಸಾಧ್ಯತೆ ಹೆಚ್ಚಾಗಿದೆ. ಈ ಮೂಲದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಸ್ಥಾಪಿಸುವ ಮೂಲಕ, ನಿಮ್ಮ ಫೋನ್‌ಗೆ ಯಾವುದೇ ಹಾನಿ ಉಂಟಾದರೆ ಅಥವಾ ಅವುಗಳ ಬಳಕೆಯಿಂದ ಡೇಟಾ ನಷ್ಟವಾದರೆ, ಅದಕ್ಕೆ ನೀವೇ ಜವಾಬ್ದಾರರು ಎನ್ನುವುದನ್ನು ಒಪ್ಪಿಕೊಳ್ಳುತ್ತೀರಿ."</string>
@@ -1798,7 +1798,7 @@
     <string name="install_all_warning" product="device" msgid="9141585291103603515">"ನಿಮ್ಮ ಸಾಧನ ಹಾಗೂ ವೈಯಕ್ತಿಕ ಡೇಟಾ, ಅಪರಿಚಿತ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ದಾಳಿಗೆ ತುತ್ತಾಗುವ ಸಾಧ್ಯತೆ ಹೆಚ್ಚಾಗಿದೆ. ಈ ಮೂಲದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡುವ ಮೂಲಕ, ನಿಮ್ಮ ಫೋನ್‌ಗೆ ಯಾವುದೇ ಹಾನಿ ಉಂಟಾದರೆ ಅಥವಾ ಅವುಗಳ ಬಳಕೆಯಿಂದ ಡೇಟಾ ನಷ್ಟವಾದರೆ, ಅದಕ್ಕೆ ನೀವೇ ಜವಾಬ್ದಾರರು ಎನ್ನುವುದನ್ನು ಒಪ್ಪಿಕೊಳ್ಳುತ್ತೀರಿ."</string>
     <string name="advanced_settings" msgid="6282069364060968122">"ಸುಧಾರಿತ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="advanced_settings_summary" msgid="5912237062506771716">"ಇನ್ನಷ್ಟು ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಆಯ್ಕೆಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸು"</string>
-    <string name="application_info_label" msgid="3886253474964599105">"ಅಪ್ಲಿಕೇಶನ್ ಮಾಹಿತಿ"</string>
+    <string name="application_info_label" msgid="3886253474964599105">"ಆ್ಯಪ್‍ ಮಾಹಿತಿ"</string>
     <string name="storage_label" msgid="1109537840103290384">"ಸಂಗ್ರಹಣೆ"</string>
     <string name="auto_launch_label" msgid="47089737922907379">"ಡಿಫಾಲ್ಟ್ ಮೂಲಕ ತೆರೆಯಿರಿ"</string>
     <string name="auto_launch_label_generic" msgid="7865828543459493308">"ಡೀಫಾಲ್ಟ್‌ಗಳು"</string>
@@ -1815,8 +1815,8 @@
     <string name="controls_label" msgid="5609285071259457221">"ನಿಯಂತ್ರಣಗಳು"</string>
     <string name="force_stop" msgid="9213858124674772386">"ಸ್ಥಗಿತಗೊಳಿಸಿ"</string>
     <string name="total_size_label" msgid="3929917501176594692">"ಒಟ್ಟು"</string>
-    <string name="application_size_label" msgid="175357855490253032">"ಅಪ್ಲಿಕೇಶನ್ ಗಾತ್ರ"</string>
-    <string name="external_code_size_label" msgid="3434421216268309411">"USB ಸಂಗ್ರಹಣೆ ಅಪ್ಲಿಕೇಶನ್"</string>
+    <string name="application_size_label" msgid="175357855490253032">"ಆ್ಯಪ್‍ ಗಾತ್ರ"</string>
+    <string name="external_code_size_label" msgid="3434421216268309411">"USB ಸಂಗ್ರಹಣೆ ಆ್ಯಪ್‍"</string>
     <string name="data_size_label" msgid="7790201846922671662">"ಬಳಕೆದಾರರ ಡೇಟಾ"</string>
     <string name="external_data_size_label" product="nosdcard" msgid="8004991551882573479">"USB ಸಂಗ್ರಹಣೆ ಡೇಟಾ"</string>
     <string name="external_data_size_label" product="default" msgid="1097584278225902734">"SD ಕಾರ್ಡ್"</string>
@@ -1844,7 +1844,7 @@
     <string name="default_emergency_app" msgid="286530070173495823">"ತುರ್ತು ಅಪ್ಲಿಕೇಶನ್"</string>
     <string name="reset_app_preferences" msgid="1426500030595212077">"ಆ್ಯಪ್ ಆದ್ಯತೆಗಳನ್ನು ಮರುಹೊಂದಿಸಿ"</string>
     <string name="reset_app_preferences_title" msgid="792909865493673598">"ಆ್ಯಪ್ ಆದ್ಯತೆಗಳನ್ನು ಮರುಹೊಂದಿಸುವುದೇ?"</string>
-    <string name="reset_app_preferences_desc" msgid="7935273005301096031">"ಈ ಕೆಳಗಿನ ಎಲ್ಲದಕ್ಕೂ ಇದು ಪ್ರಾಶಸ್ತ್ಯ ಮರುಹೊಂದಿಸುತ್ತದೆ:\n\n "<li>"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</li>\n" "<li>"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ ಅಧಿಸೂಚನೆಗಳು"</li>\n" "<li>"ಕಾರ್ಯಗಳಿಗೆ ಡೀಫಾಲ್ಟ್ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</li>\n" "<li>"ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗಾಗಿ ಹಿನ್ನೆಲೆ ಡೇಟಾ ನಿರ್ಬಂಧಗಳು"</li>\n" "<li>"ಯಾವುದೇ ಅನುಮತಿ ನಿರ್ಬಂಧಗಳು"</li>\n\n" ನೀವು ಯಾವುದೇ ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾವನ್ನು ಕಳೆದುಕೊಳ್ಳುವುದಿಲ್ಲ."</string>
+    <string name="reset_app_preferences_desc" msgid="7935273005301096031">"ಇದು ಕೆಳಗಿನವುಗಳ ಎಲ್ಲಾ ಆದ್ಯತೆಗಳನ್ನು ಮರುಹೊಂದಿಸುತ್ತದೆ:\n\n "<li>"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</li>\n" "<li>"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ ಅಧಿಸೂಚನೆಗಳು"</li>\n" "<li>"ಕಾರ್ಯಗಳಿಗೆ ಡೀಫಾಲ್ಟ್ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</li>\n" "<li>"ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗಾಗಿ ಹಿನ್ನೆಲೆ ಡೇಟಾ ನಿರ್ಬಂಧಗಳು"</li>\n" "<li>"ಯಾವುದೇ ಅನುಮತಿ ನಿರ್ಬಂಧಗಳು"</li>\n\n" ನೀವು ಯಾವುದೇ ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾವನ್ನು ಕಳೆದುಕೊಳ್ಳುವುದಿಲ್ಲ."</string>
     <string name="reset_app_preferences_button" msgid="2041894727477934656">"ಆ್ಯಪ್‍‍ಗಳನ್ನು ಮರುಹೊಂದಿಸಿ"</string>
     <string name="manage_space_text" msgid="6166469422303124302">"ಸ್ಥಳ ನಿರ್ವಹಿಸಿ"</string>
     <string name="filter" msgid="2426943916212457962">"ಫಿಲ್ಟರ್‌"</string>
@@ -1887,12 +1887,12 @@
     <string name="force_stop_dlg_text" msgid="7435245769456493398">"ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಬಲವಂತವಾಗಿ ಸ್ಥಗಿತಗೊಳಿಸಿದರೆ, ಅದು ಸರಿಯಾಗಿ ಕಾರ್ಯನಿರ್ವಹಿಸದಿರಬಹುದು."</string>
     <string name="app_install_location_title" msgid="5121617802063021720">"ಅಪೇಕ್ಷಿತ ಸ್ಥಾಪನೆ ಸ್ಥಳ"</string>
     <string name="app_install_location_summary" msgid="109719780117187797">"ಹೊಸ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗಾಗಿ ಪ್ರಾಶಸ್ತ್ಯದ ಸ್ಥಾಪನೆ ಸ್ಥಾನವನ್ನು ಬದಲಾಯಿಸಿ"</string>
-    <string name="app_disable_dlg_positive" msgid="5508828271100168073">"ಅಪ್ಲಿಕೇಶನ್‌ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string>
+    <string name="app_disable_dlg_positive" msgid="5508828271100168073">"ಆ್ಯಪ್‍ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string>
     <string name="app_disable_dlg_text" msgid="9221864774943530281">"ನೀವು ಈ ಆ್ಯಪ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದರೆ, Android ಮತ್ತು ಇತರ ಆ್ಯಪ್‌ಗಳು ಇನ್ನು ಮುಂದೆ ಉದ್ದೇಶಿಸಿದ ಹಾಗೆ ಕಾರ್ಯನಿರ್ವಹಿಸದಿರಬಹುದು. ಈ ಆ್ಯಪ್ ಅನ್ನು ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಪೂರ್ವ-ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿರುವುದರಿಂದ, ನೀವು ಅದನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಎಂಬುದನ್ನು ನೆನಪಿನಲ್ಲಿಡಿ. ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವ ಮೂಲಕ, ಈ ಆ್ಯಪ್ ಅನ್ನು ನೀವು ಆಫ್ ಮಾಡಬಹುದು ಮತ್ತು ಅದನ್ನು ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಮರೆ ಮಾಡಬಹುದು."</string>
     <string name="app_disable_notifications_dlg_title" msgid="699530661413553928">"ಅಧಿಸೂಚನೆಗಳನ್ನು ಆಫ್‌ ಮಾಡುವುದೇ?"</string>
-    <string name="app_install_details_group_title" msgid="2909597319422976921">"ಅಂಗಡಿ"</string>
+    <string name="app_install_details_group_title" msgid="2909597319422976921">"ಸ್ಟೋರ್"</string>
     <string name="app_install_details_title" msgid="6954953384372934881">"ಅಪ್ಲಿಕೇಶನ್ ವಿವರಗಳು"</string>
-    <string name="app_install_details_summary" msgid="6612222941121363940">"<xliff:g id="APP_STORE">%1$s</xliff:g> ನಿಂದ ಅಪ್ಲಿಕೇಶನ್ ಸ್ಥಾಪಿಸಲಾಗಿದೆ"</string>
+    <string name="app_install_details_summary" msgid="6612222941121363940">"<xliff:g id="APP_STORE">%1$s</xliff:g> ನಿಂದ ಆ್ಯಪ್‍ ಸ್ಥಾಪಿಸಲಾಗಿದೆ"</string>
     <string name="instant_app_details_summary" msgid="6384264315914966114">"<xliff:g id="APP_STORE">%1$s</xliff:g> ನಲ್ಲಿ ಹೆಚ್ಚಿನ ಮಾಹಿತಿ"</string>
     <string name="app_ops_running" msgid="6378418969742957805">"ಚಾಲನೆಯಲ್ಲಿದೆ"</string>
     <string name="app_ops_never_used" msgid="8305262378162525813">"(ಎಂದಿಗೂ ಬಳಸಿಲ್ಲ)"</string>
@@ -1924,14 +1924,14 @@
     <string name="running_processes_header_used_prefix" msgid="2984090414986096084">"ಬಳಕೆಯಾಗಿದ್ದು"</string>
     <string name="running_processes_header_cached_prefix" msgid="8398315634778729026">"ಸಂಗ್ರಹಿಸಲಾಗಿದ್ದು"</string>
     <string name="running_processes_header_ram" msgid="3867954556214535588">"RAM ನ <xliff:g id="RAM_0">%1$s</xliff:g>"</string>
-    <string name="runningservicedetails_settings_title" msgid="7075556369123578372">"ಚಾಲನೆಯಲ್ಲಿರುವ ಅಪ್ಲಿಕೇಶನ್"</string>
+    <string name="runningservicedetails_settings_title" msgid="7075556369123578372">"ಚಾಲನೆಯಲ್ಲಿರುವ ಆ್ಯಪ್‍"</string>
     <string name="no_services" msgid="2085012960886321920">"ಕ್ರಿಯಾಶೀಲವಾಗಿಲ್ಲ"</string>
     <string name="runningservicedetails_services_title" msgid="5890094559748633615">"ಸೇವೆಗಳು"</string>
     <string name="runningservicedetails_processes_title" msgid="5496507383850423763">"ಪ್ರಕ್ರಿಯೆಗಳು"</string>
     <string name="service_stop" msgid="8812777462903125191">"ನಿಲ್ಲಿಸಿ"</string>
     <string name="service_manage" msgid="7045214643721276662">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="service_stop_description" msgid="4184180745938573707">"ಈ ಸೇವೆಯನ್ನು ಇದರ ಅಪ್ಲಿಕೇಶನ್‌ ಪ್ರಾರಂಭಿಸಿದೆ. ನಿಲ್ಲಿಸುವುದರಿಂದ ಇದು ಅಪ್ಲಿಕೇಶನ್ ವಿಫಲಗೊಳ್ಳಲು ಕಾರಣವಾಗಬಹುದು."</string>
-    <string name="heavy_weight_stop_description" msgid="7444148811046611463">"ಈ ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಸುರಕ್ಷಿತವಾಗಿ ನಿಲ್ಲಿಸಲಾಗುವುದಿಲ್ಲ. ನೀವು ಇದನ್ನು ನಿಲ್ಲಿಸಿದರೆ, ನಿಮ್ಮ ಪ್ರಸ್ತುತ ಕೆಲವು ಕಾರ್ಯವನ್ನು ನೀವು ಕಳೆದುಕೊಳ್ಳಬಹುದು."</string>
+    <string name="heavy_weight_stop_description" msgid="7444148811046611463">"ಈ ಆ್ಯಪ್‍ ಅನ್ನು ಸುರಕ್ಷಿತವಾಗಿ ನಿಲ್ಲಿಸಲಾಗುವುದಿಲ್ಲ. ನೀವು ಇದನ್ನು ನಿಲ್ಲಿಸಿದರೆ, ನಿಮ್ಮ ಪ್ರಸ್ತುತ ಕೆಲವು ಕಾರ್ಯವನ್ನು ನೀವು ಕಳೆದುಕೊಳ್ಳಬಹುದು."</string>
     <string name="background_process_stop_description" msgid="8971810208873038109">"ಇದು ಮತ್ತೆ ಅಗತ್ಯವಿರುವ ಸಂದರ್ಭದಲ್ಲಿ ಇನ್ನೂ ಚಾಲನೆಯಲ್ಲಿರುವ ಹಳೆಯ ಅಪ್ಲಿಕೇಶನ್ ಪ್ರಕ್ರಿಯೆ ಇದಾಗಿದೆ. ಇದನ್ನು ನಿಲ್ಲಿಸಲು ಸಾಮಾನ್ಯವಾಗಿ ಯಾವುದೇ ಕಾರಣವಿಲ್ಲ."</string>
     <string name="service_manage_description" msgid="8058123524402833082">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: ಪ್ರಸ್ತುತ ಬಳಕೆಯಲ್ಲಿದೆ. ಅದನ್ನು ನಿಯಂತ್ರಿಸಲು ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
     <string name="main_running_process_description" msgid="7733268956566861797">"ಮುಖ್ಯ ಪ್ರಕ್ರಿಯೆಯು ಬಳಕೆಯಲ್ಲಿದೆ."</string>
@@ -2031,7 +2031,7 @@
     <string name="usage_stats_label" msgid="3128999956478977035">"ಬಳಕೆಯ ಅಂಕಿಅಂಶಗಳು"</string>
     <string name="testing_usage_stats" msgid="704965692323956976">"ಬಳಕೆಯ ಅಂಕಿಅಂಶಗಳು"</string>
     <string name="display_order_text" msgid="2973620313510295873">"ಈ ಪ್ರಕಾರ ವಿಂಗಡಿಸು:"</string>
-    <string name="app_name_label" msgid="2258469951312794816">"ಅಪ್ಲಿಕೇಶನ್‌"</string>
+    <string name="app_name_label" msgid="2258469951312794816">"ಆ್ಯಪ್‍"</string>
     <string name="last_time_used_label" msgid="1119322667349666930">"ಕಳೆದ ಬಾರಿಯ ಬಳಕೆ"</string>
     <string name="usage_time_label" msgid="5615725415876461039">"ಬಳಕೆ ಸಮಯ"</string>
     <string name="accessibility_settings" msgid="9140621093888234485">"ಪ್ರವೇಶ ಲಭ್ಯತೆ"</string>
@@ -2342,14 +2342,14 @@
       <item quantity="other">%1$d ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="1161081105263761743">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
-    <string name="dialog_stop_title" msgid="4354544579084434590">"ಅಪ್ಲಿಕೇಶನ್‌ ನಿಲ್ಲಿಸಬೇಕೇ?"</string>
+    <string name="dialog_stop_title" msgid="4354544579084434590">"ಆ್ಯಪ್‍‌ ನಿಲ್ಲಿಸಬೇಕೇ?"</string>
     <string name="dialog_stop_message" product="default" msgid="1361660290824872555">"<xliff:g id="APP">%1$s</xliff:g>ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿರುವ ಕಾರಣದಿಂದಾಗಿ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಫೋನ್ ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಈ ಸಮಸ್ಯೆಯನ್ನು ಸರಿಪಡಿಸಲು, ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ನಿಲ್ಲಿಸಬಹುದು.\n\nಇದನ್ನು ಮುಂದುವರಿಸಿದ್ದಲ್ಲಿ, ಬ್ಯಾಟರಿ ಕಾರ್ಯಕ್ಷಮತೆ ಸುಧಾರಿಸಲು ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಅಸ್ಥಾಪಿಸಬೇಕಾಗುತ್ತದೆ."</string>
     <string name="dialog_stop_message" product="tablet" msgid="8948358625588034303">"<xliff:g id="APP">%1$s</xliff:g>ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ ಅನ್ನು ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿರುವ ಕಾರಣದಿಂದಾಗಿ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಈ ಸಮಸ್ಯೆಯನ್ನು ಸರಿಪಡಿಸಲು, ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ನಿಲ್ಲಿಸಬಹುದು.\n\nಇದನ್ನು ಮುಂದುವರಿಸಿದ್ದಲ್ಲಿ, ಬ್ಯಾಟರಿ ಕಾರ್ಯಕ್ಷಮತೆ ಸುಧಾರಿಸಲು ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಅಸ್ಥಾಪಿಸಬೇಕಾಗುತ್ತದೆ."</string>
     <string name="dialog_stop_message" product="device" msgid="3550459274584461359">"<xliff:g id="APP">%1$s</xliff:g>ನಿಮ್ಮ ಸಾಧನವನ್ನು ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿರುವ ಕಾರಣದಿಂದಾಗಿ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಸಾಧನ ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಈ ಸಮಸ್ಯೆಯನ್ನು ಸರಿಪಡಿಸಲು, ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ನಿಲ್ಲಿಸಬಹುದು.\n\nಇದನ್ನು ಮುಂದುವರಿಸಿದ್ದಲ್ಲಿ, ಬ್ಯಾಟರಿ ಕಾರ್ಯಕ್ಷಮತೆ ಸುಧಾರಿಸಲು ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಅಸ್ಥಾಪಿಸಬೇಕಾಗುತ್ತದೆ."</string>
     <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="5361295199859282104">"<xliff:g id="APP_0">%1$s</xliff:g>ನಿಮ್ಮ ಫೋನ್‌ ಅನ್ನು ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿರುವ ಕಾರಣದಿಂದಾಗಿ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಫೋನ್ ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಈ ಸಮಸ್ಯೆಯನ್ನು ಸರಿಪಡಿಸಲು, <xliff:g id="APP_1">%1$s</xliff:g> ಅನ್ನು ನಿಲ್ಲಿಸಬಹುದು.\n\nಇದನ್ನು ಮುಂದುವರಿಸಿದ್ದಲ್ಲಿ, ಬ್ಯಾಟರಿ ಕಾರ್ಯಕ್ಷಮತೆ ಸುಧಾರಿಸಲು ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಅಸ್ಥಾಪಿಸಬೇಕಾಗುತ್ತದೆ."</string>
     <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="3270887403788487776">"<xliff:g id="APP_0">%1$s</xliff:g>ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ ಅನ್ನು ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿರುವ ಕಾರಣದಿಂದಾಗಿ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಈ ಸಮಸ್ಯೆಯನ್ನು ಸರಿಪಡಿಸಲು, <xliff:g id="APP_1">%1$s</xliff:g>ಅನ್ನು ನಿಲ್ಲಿಸಬಹುದು.\n\nಇದನ್ನು ಮುಂದುವರಿಸಿದ್ದಲ್ಲಿ, ಬ್ಯಾಟರಿ ಕಾರ್ಯಕ್ಷಮತೆ ಸುಧಾರಿಸಲು ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಅಸ್ಥಾಪಿಸಬೇಕಾಗುತ್ತದೆ."</string>
     <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="6577512995315373362">"<xliff:g id="APP_0">%1$s</xliff:g>ನಿಮ್ಮ ಸಾಧನವನ್ನು ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿರುವ ಕಾರಣದಿಂದಾಗಿ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಸಾಧನ ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಈ ಸಮಸ್ಯೆಯನ್ನು ಸರಿಪಡಿಸಲು, <xliff:g id="APP_1">%1$s</xliff:g> ಅನ್ನು ನಿಲ್ಲಿಸಬಹುದು.\n\nಇದನ್ನು ಮುಂದುವರಿಸಿದ್ದಲ್ಲಿ, ಬ್ಯಾಟರಿ ಕಾರ್ಯಕ್ಷಮತೆ ಸುಧಾರಿಸಲು ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಅಸ್ಥಾಪಿಸಬೇಕಾಗುತ್ತದೆ."</string>
-    <string name="dialog_stop_ok" msgid="5809052504018242928">"ಅಪ್ಲಿಕೇಶನ್‌ ನಿಲ್ಲಿಸಿ"</string>
+    <string name="dialog_stop_ok" msgid="5809052504018242928">"ಆ್ಯಪ್‍ ನಿಲ್ಲಿಸಿ"</string>
     <string name="dialog_background_check_title" msgid="6289139150963983470">"ಹಿನ್ನೆಲೆ ಬಳಕೆಯನ್ನು ಆಫ್ ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ ಸ್ಥಗಿತಗೊಳಿಸಬೇಕೆ?"</string>
     <string name="dialog_background_check_message" product="default" msgid="944264053032952679">"<xliff:g id="APP_0">%1$s</xliff:g> ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿರುವ ಕಾರಣದಿಂದಾಗಿ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಫೋನ್ ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಈ ಸಮಸ್ಯೆಯನ್ನು ಬಗೆಹರಿಸಲು ಪ್ರಯತ್ನಿಸಲು, ನೀವು <xliff:g id="APP_1">%1$s</xliff:g> ಅನ್ನು ನಿಲ್ಲಿಸಬಹುದು ಮತ್ತು ಅದು ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಕೆಲಸ ಮಾಡುವುದನ್ನು ತಡೆಯಬಹುದು."</string>
     <string name="dialog_background_check_message" product="tablet" msgid="5246650726585461386">"<xliff:g id="APP_0">%1$s</xliff:g> ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ ಅನ್ನು ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿರುವ ಕಾರಣದಿಂದಾಗಿ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಈ ಸಮಸ್ಯೆಯನ್ನು ಬಗೆಹರಿಸಲು ಪ್ರಯತ್ನಿಸಲು, ನೀವು <xliff:g id="APP_1">%1$s</xliff:g> ಅನ್ನು ನಿಲ್ಲಿಸಬಹುದು ಮತ್ತು ಅದು ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಕೆಲಸ ಮಾಡುವುದನ್ನು ತಡೆಯಬಹುದು."</string>
@@ -2393,7 +2393,7 @@
     <string name="usage_type_computed_power" msgid="2594890316149868151">"ಗಣನೆ ಮಾಡಲಾದ ಪವರ್‌ ಬಳಕೆ"</string>
     <string name="usage_type_actual_power" msgid="8067253427718526111">"ಗಮನಿಸಲಾದ ಪವರ್ ಬಳಕೆ"</string>
     <string name="battery_action_stop" msgid="1866624019460630143">"ಸ್ಥಗಿತಗೊಳಿಸಿ"</string>
-    <string name="battery_action_app_details" msgid="1077011181969550402">"ಅಪ್ಲಿಕೇಶನ್ ಮಾಹಿತಿ"</string>
+    <string name="battery_action_app_details" msgid="1077011181969550402">"ಆ್ಯಪ್‍ ಮಾಹಿತಿ"</string>
     <string name="battery_action_app_settings" msgid="587998773852488539">"ಅಪ್ಲಿಕೇಶನ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="battery_action_display" msgid="4887913003634317465">"ಪರದೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="battery_action_wifi" msgid="7123520587925323824">"Wi‑Fi ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
@@ -2412,7 +2412,7 @@
     <string name="battery_desc_bluetooth" msgid="3468061900485447679">"ಬ್ಲೂಟೂತ್‌‌ ಬಳಸಿದ ಬ್ಯಾಟರಿ"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="6353294067057749310">"ನೀವು ಬ್ಲೂಟೂತ್‌‌ ಅನ್ನು ಬಳಸದಿರುವಾಗ ಅದನ್ನು ಆಫ್ ಮಾಡಿ"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="2421931037149315202">"ಬೇರೆ ಬ್ಲೂಟೂತ್‌‌ ಸಾಧನಕ್ಕೆ ಸಂಪರ್ಕಗೊಳಿಸಲು ಪ್ರಯತ್ನಿಸಿ"</string>
-    <string name="battery_desc_apps" msgid="6826726880149226823">"ಅಪ್ಲಿಕೇಶನ್‌ ಬಳಸಿದ ಬ್ಯಾಟರಿ"</string>
+    <string name="battery_desc_apps" msgid="6826726880149226823">"ಆ್ಯಪ್‍‌ ಬಳಸಿದ ಬ್ಯಾಟರಿ"</string>
     <string name="battery_sugg_apps_info" msgid="9175761965559743977">"ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ನಿಲ್ಲಿಸಿ ಅಥವಾ ಅನ್‌ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿ"</string>
     <string name="battery_sugg_apps_gps" msgid="489694612870772770">"ಬ್ಯಾಟರಿ ಉಳಿಸುವ ಮೋಡ್‌‌ ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="battery_sugg_apps_settings" msgid="20465932930350295">"ಬ್ಯಾಟರಿಯ ಬಳಕೆ ಕಡಿಮೆಗೊಳಿಸಲು ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಅಪ್ಲಿಕೇಶನ್ ಅವಕಾಶ ಮಾಡಿಕೊಡಬಹುದು"</string>
@@ -2517,7 +2517,7 @@
     <string name="tts_spoken_language" msgid="8057256621711361944">"ಆಡುಭಾಷೆ"</string>
     <string name="tts_install_voices_title" msgid="363811937643579286">"ಧ್ವನಿಗಳನ್ನು ಸ್ಥಾಪಿಸಿ"</string>
     <string name="tts_install_voices_text" msgid="7464832428439739995">"ಧ್ವನಿಗಳನ್ನು ಸ್ಥಾಪಿಸಲು <xliff:g id="TTS_APP_NAME">%s</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಮುಂದುವರಿಯಿರಿ"</string>
-    <string name="tts_install_voices_open" msgid="686776451008134790">"ಅಪ್ಲಿಕೇಶನ್‌ ತೆರೆಯಿರಿ"</string>
+    <string name="tts_install_voices_open" msgid="686776451008134790">"ಆ್ಯಪ್‍‌ ತೆರೆಯಿರಿ"</string>
     <string name="tts_install_voices_cancel" msgid="1622512922523479646">"ರದ್ದುಮಾಡಿ"</string>
     <string name="tts_reset" msgid="8864073594540705579">"ಮರುಹೊಂದಿಸಿ"</string>
     <string name="tts_play" msgid="9023430029380675514">"ಪ್ಲೇ"</string>
@@ -2543,7 +2543,7 @@
     <string name="credentials_reset_hint" msgid="3484350477764088169">"ಎಲ್ಲ ವಿಷಯಗಳನ್ನು ತೆಗೆದುಹಾಕುವುದೇ?"</string>
     <string name="credentials_erased" msgid="7287088033523869085">"ರುಜುವಾತು ಸಂಗ್ರಹಣೆಯನ್ನು ಅಳಿಸಲಾಗಿದೆ."</string>
     <string name="credentials_not_erased" msgid="9137227570738627637">"ರುಜುವಾತು ಸಂಗ್ರಹಣೆಯನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
-    <string name="usage_access_title" msgid="7981321142726540574">"ಬಳಕೆಯ ಪ್ರವೇಶದ ಆಪ್‌‌"</string>
+    <string name="usage_access_title" msgid="7981321142726540574">"ಬಳಕೆಯ ಪ್ರವೇಶವಿರುವ ಆ್ಯಪ್‍‍ಗಳು"</string>
     <string name="emergency_tone_title" msgid="130211364025984428">"ತುರ್ತು ಡೈಯಲಿಂಗ್ ಸಿಗ್ನಲ್"</string>
     <string name="emergency_tone_summary" msgid="8035940153401622240">"ತುರ್ತು ಕರೆ ಮಾಡಿದಾಗ ಕಾರ್ಯ ರೀತಿಯನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="privacy_settings_title" msgid="3573891462732375772">"ಬ್ಯಾಕಪ್"</string>
@@ -2555,13 +2555,13 @@
     <string name="backup_data_summary" msgid="555459891017933746">"Google ಸರ್ವರ್‌ಗಳಿಗೆ ಅಪ್ಲಿಕೇಶನ್‌‌ ಡೇಟಾ, ವೈ-ಫೈ ಪಾಸ್‌ವರ್ಡ್‌ಗಳು ಮತ್ತು ಇತರ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬ್ಯಾಕಪ್‌ ಮಾಡು"</string>
     <string name="backup_configure_account_title" msgid="1534734650559070294">"ಬ್ಯಾಕಪ್ ಖಾತೆ"</string>
     <string name="backup_data_management_title" msgid="6299288795610243508">"ಬ್ಯಾಕಪ್ ಖಾತೆಯನ್ನು ನಿರ್ವಹಿಸಿ"</string>
-    <string name="include_app_data_title" msgid="6117211611131913293">"ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾ ಸೇರಿಸಿ"</string>
+    <string name="include_app_data_title" msgid="6117211611131913293">"ಆ್ಯಪ್‍ ಡೇಟಾ ಸೇರಿಸಿ"</string>
     <string name="auto_restore_title" msgid="8367486774010915221">"ಸ್ವಯಂಚಾಲಿತ ಮರುಸ್ಥಾಪನೆ"</string>
     <string name="auto_restore_summary" msgid="1941047568966428377">"ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಮರುಸ್ಥಾಪಿಸುವಾಗ, ಬ್ಯಾಕಪ್‌‌ ಮಾಡಲಾದ ಸೆಟ್ಟಿಂಗ್‌ಗಳು, ಡೇಟಾವನ್ನು ಮರುಸ್ಥಾಪಿಸು"</string>
     <string name="backup_inactive_title" msgid="5513496915638307750">"ಬ್ಯಾಕ್‌ಅಪ್ ಸೇವೆ ಸಕ್ರಿಯವಾಗಿಲ್ಲ"</string>
     <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="backup_erase_dialog_message" msgid="8767843355330070902">"ನಿಮ್ಮ Wi‑Fi ಪಾಸ್‌ವರ್ಡ್‌ಗಳು, ಬುಕ್‌ಮಾರ್ಕ್‌ಗಳು ಇತರ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಹಾಗೂ ಆ್ಯಪ್‍‍ ಡೇಟಾವನ್ನು ಬ್ಯಾಕಪ್‌‌‌ ಮಾಡುವುದನ್ನು ನಿಲ್ಲಿಸುವುದರ ಜೊತೆಗೆ Google ಸರ್ವರ್‌ಗಳಲ್ಲಿನ ಎಲ್ಲ ಪ್ರತಿಗಳನ್ನು ಅಳಿಸುವುದೇ?"</string>
     <string name="fullbackup_erase_dialog_message" msgid="2588536036471144070">"ಸಾಧನ ಡೇಟಾ (ವೈ-ಫೈ ಪಾಸ್‌ವರ್ಡ್‌ಗಳು ಮತ್ತು ಕರೆ ಇತಿಹಾಸದಂತಹ) ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾವನ್ನು (ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಮೂಲಕ ಸಂಗ್ರಹಿಸಲಾದ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಮತ್ತು ಫೈಲ್‌ಗಳಂತಹ) ಬ್ಯಾಕಪ್ ಮಾಡುವುದನ್ನು ನಿಲ್ಲಿಸುವುದೇ ಹಾಗೂ ರಿಮೋಟ್ ಸರ್ವರ್‌ಗಳಲ್ಲಿರುವ ಎಲ್ಲಾ ನಕಲುಗಳನ್ನು ಅಳಿಸುವುದೇ?"</string>
     <string name="fullbackup_data_summary" msgid="406274198094268556">"ಸಾಧನ ಡೇಟಾ (ವೈ-ಫೈ ಪಾಸ್‌ವರ್ಡ್‌ಗಳು ಮತ್ತು ಕರೆ ಇತಿಹಾಸದಂತಹವು) ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾವನ್ನು (ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಮೂಲಕ ಸಂಗ್ರಹಿಸಲಾದ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಮತ್ತು ಫೈಲ್‌ಗಳಂತಹವು) ರಿಮೋಟ್ ಮೂಲಕ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಬ್ಯಾಕಪ್ ಮಾಡಿ.\n\nನೀವು ಸ್ವಯಂಚಾಲಿತ ಬ್ಯಾಕಪ್ ಅನ್ನು ಆನ್ ಮಾಡಿದಾಗ, ಸಾಧನ ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾವನ್ನು ರಿಮೋಟ್ ಮೂಲಕ ನಿಯತಕಾಲಿಕವಾಗಿ ಉಳಿಸಲಾಗುವುದು. ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾ ಎಂದರೆ ಅಪ್ಲಿಕೇಶನ್ ಮೂಲಕ ಉಳಿಸಲಾಗಿರುವ (ಡೆವಲಪರ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಆಧರಿಸಿ) ಯಾವುದೇ ಡೇಟಾ ಆಗಿರಬಹುದು. ಇದು ಸಂಪರ್ಕಗಳು, ಸಂದೇಶಗಳು ಮತ್ತು ಫೋಟೋಗಳಂತಹ ಸಂಭವನೀಯ ಸೂಕ್ಷ್ಮ ಡೇಟಾವನ್ನು ಒಳಗೊಂಡಿರುತ್ತದೆ."</string>
     <string name="device_admin_settings_title" msgid="2074319456047334589">"ಸಾಧನದ ನಿರ್ವಾಹಕರ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
@@ -2696,7 +2696,7 @@
     <string name="data_roaming_enable_mobile" msgid="5886394350890765947">"ರೋಮಿಂಗ್"</string>
     <string name="data_usage_forground_label" msgid="8992577451178005406">"ಮುನ್ನೆಲೆ:"</string>
     <string name="data_usage_background_label" msgid="8460891123904985128">"ಹಿನ್ನೆಲೆ:"</string>
-    <string name="data_usage_app_settings" msgid="3276444867375694809">"ಅಪ್ಲಿಕೇಶನ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
+    <string name="data_usage_app_settings" msgid="3276444867375694809">"ಆ್ಯಪ್‍ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="data_usage_app_restrict_background" msgid="649167881583859169">"ಹಿನ್ನೆಲೆ ಡೇಟಾ"</string>
     <string name="data_usage_app_restrict_background_summary" msgid="2703967920234671881">"ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಮೊಬೈಲ್ ಡೇಟಾ ಬಳಕೆಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7211921499365814638">"ಈ ಅಪ್ಲಿಕೇಶನ್‌ಗಾಗಿ ಹಿನ್ನೆಲೆ ಡೇಟಾವನ್ನು ನಿರ್ಬಂಧಿಸಲು, ಮೊದಲಿಗೆ ಮೊಬೈಲ್ ಡೇಟಾ ಮಿತಿಯನ್ನು ಹೊಂದಿಸಿ."</string>
@@ -2891,16 +2891,16 @@
     <string name="work_profile_confirm_remove_title" msgid="3168910958076735800">"ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್‌ ತೆಗೆದುಹಾಕುವುದೇ?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="2889456786320157545">"ನೀವು ನಿಮ್ಮ ಸ್ಥಳ ಮತ್ತು ಡೇಟಾವನ್ನು ಈ ಟ್ಯಾಬ್ಲೆಟ್‌ನಿಂದ ಕಳೆದುಕೊಳ್ಳುತ್ತೀರಿ. ನೀವು ಈ ಕ್ರಿಯೆಯನ್ನು ರದ್ದು ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="8441729423565705183">"ನಿಮ್ಮ ಸ್ಥಳ ಮತ್ತು ಡೇಟಾವನ್ನು ಈ ಫೋನ್‌ನಲ್ಲಿ ನೀವು ಕಳೆದುಕೊಳ್ಳುತ್ತೀರಿ. ನಿಮಗೆ ಈ ಕ್ರಿಯೆಯನ್ನು ರದ್ದು ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
-    <string name="user_confirm_remove_message" msgid="5202150470271756013">"ಎಲ್ಲ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ."</string>
-    <string name="work_profile_confirm_remove_message" msgid="1220672284385083128">"ನೀವು ಮುಂದುವರಿಸಿದರೆ ಈ ಪ್ರೊಫೈಲ್‌ನಲ್ಲಿನ ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುವುದು."</string>
-    <string name="user_profile_confirm_remove_message" msgid="8376289888144561545">"ಎಲ್ಲ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ."</string>
+    <string name="user_confirm_remove_message" msgid="5202150470271756013">"ಎಲ್ಲಾ ಆ್ಯಪ್‍‍ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ."</string>
+    <string name="work_profile_confirm_remove_message" msgid="1220672284385083128">"ನೀವು ಮುಂದುವರಿಸಿದರೆ ಈ ಪ್ರೊಫೈಲ್‌ನಲ್ಲಿನ ಎಲ್ಲಾ ಆ್ಯಪ್‍‍ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುವುದು."</string>
+    <string name="user_profile_confirm_remove_message" msgid="8376289888144561545">"ಎಲ್ಲಾ ಆ್ಯಪ್‍‍ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ."</string>
     <string name="user_adding_new_user" msgid="381717945749193417">"ಹೊಸ ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಲಾಗುತ್ತಿದೆ…"</string>
     <string name="user_delete_user_description" msgid="3627684990761268859">"ಬಳಕೆದಾರರನ್ನು ಅಳಿಸಿ"</string>
     <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_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">"ಫೋನ್ ಕರೆಗಳು ಮತ್ತು ಎಸ್‌ಎಂಎಸ್‌ ಆನ್ ಮಾಡಿ"</string>
@@ -2934,7 +2934,7 @@
     <string name="restriction_settings_title" msgid="4143751894908963736">"ನಿರ್ಬಂಧಗಳು"</string>
     <string name="restriction_menu_reset" msgid="3642252461410370554">"ನಿರ್ಬಂಧಗಳನ್ನು ತೆಗೆದುಹಾಕಿ"</string>
     <string name="restriction_menu_change_pin" msgid="592512748243421101">"ಪಿನ್‌ ಬದಲಾಯಿಸಿ"</string>
-    <string name="app_notifications_switch_label" msgid="670683308275498821">"ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸು"</string>
+    <string name="app_notifications_switch_label" msgid="670683308275498821">"ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸಿ"</string>
     <string name="help_label" msgid="1296484776243905646">"ಸಹಾಯ,ಪ್ರತಿಕ್ರಿಯೆ"</string>
     <string name="support_summary" msgid="3278943815956130740">"ಸಹಾಯ ಲೇಖನಗಳು, ಫೋನ್, ಚಾಟ್‌ ಪ್ರಾರಂಭಿಸಲಾಗುತ್ತಿದೆ"</string>
     <string name="user_account_title" msgid="2108666882630552859">"ವಿಷಯಕ್ಕಾಗಿ ಖಾತೆ"</string>
@@ -2962,7 +2962,7 @@
     <string name="preferred_network_type_title" msgid="1980819233332592332">"ಪ್ರಾಶಸ್ತ್ಯದ ನೆಟ್‌ವರ್ಕ್‌ ಪ್ರಕಾರ"</string>
     <string name="preferred_network_type_summary" msgid="8828375904939960006">"LTE (ಶಿಫಾರಸು ಮಾಡಲಾಗಿದೆ)"</string>
     <string name="work_sim_title" msgid="2885654516046971985">"ಕೆಲಸದ ಸಿಮ್‌"</string>
-    <string name="user_restrictions_title" msgid="6454305007320972740">"ಅಪ್ಲಿಕೇಶನ್ &amp; ವಿಷಯ ಪ್ರವೇಶ"</string>
+    <string name="user_restrictions_title" msgid="6454305007320972740">"ಆ್ಯಪ್‍ &amp; ವಿಷಯ ಪ್ರವೇಶ"</string>
     <string name="user_rename" msgid="5624446289379780361">"ಮರುಹೆಸರಿಸು"</string>
     <string name="app_restrictions_custom_label" msgid="8791627858467265176">"ಅಪ್ಲಿಕೇಶನ್ ನಿರ್ಬಂಧಗಳನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="user_restrictions_controlled_by" msgid="3442508299902131033">"<xliff:g id="APP">%1$s</xliff:g> ಮೂಲಕ ನಿಯಂತ್ರಿಸಲಾಗುತ್ತಿದೆ"</string>
@@ -2979,7 +2979,7 @@
     <string name="restriction_location_enable_title" msgid="358506740636434856">"ಸ್ಥಳ"</string>
     <string name="restriction_location_enable_summary" msgid="4159500201124004463">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ನಿಮ್ಮ ಸ್ಥಳ ಮಾಹಿತಿಯನ್ನು ಬಳಸಲು ಅನುಮತಿಸಿ"</string>
     <string name="wizard_back" msgid="223654213898117594">"ಹಿಂದೆ"</string>
-    <string name="wizard_next" msgid="5239664512608113542">"ಮುಂದೆ"</string>
+    <string name="wizard_next" msgid="5239664512608113542">"ಮುಂದಿನದು"</string>
     <string name="wizard_finish" msgid="3742102879981212094">"ಪೂರ್ಣಗೊಳಿಸು"</string>
     <string name="user_image_take_photo" msgid="2000247510236178111">"ಫೋಟೋವನ್ನು ಸೆರೆಹಿಡಿಯಿರಿ"</string>
     <string name="user_image_choose_photo" msgid="4920315415203051898">"ಚಿತ್ರವನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
@@ -3137,12 +3137,12 @@
     <string name="media_volume_option_title" msgid="3553411883305505682">"ಮಾಧ್ಯಮ ವಾಲ್ಯೂಮ್"</string>
     <string name="remote_media_volume_option_title" msgid="6355710054191873836">"ವಾಲ್ಯೂಮ್ ಕ್ಯಾಸ್ಟ್ ಮಾಡಿ"</string>
     <string name="call_volume_option_title" msgid="5028003296631037334">"ಕರೆಯ ವಾಲ್ಯೂಮ್"</string>
-    <string name="alarm_volume_option_title" msgid="3184076022438477047">"ಅಲಾರಮ್ ವಾಲ್ಯೂಮ್"</string>
+    <string name="alarm_volume_option_title" msgid="3184076022438477047">"ಅಲಾರಂ ವಾಲ್ಯೂಮ್"</string>
     <string name="ring_volume_option_title" msgid="2038924918468372264">"ರಿಂಗ್ ವಾಲ್ಯೂಮ್"</string>
     <string name="notification_volume_option_title" msgid="1358512611511348260">"ಅಧಿಸೂಚನೆ ವಾಲ್ಯೂಮ್"</string>
     <string name="ringtone_title" msgid="1409086028485922583">"ಫೋನ್ ರಿಂಗ್‌ಟೋನ್"</string>
     <string name="notification_ringtone_title" msgid="2932960620843976285">"ಡೀಫಾಲ್ಟ್ ಅಧಿಸೂಚನೆ ಧ್ವನಿ"</string>
-    <string name="notification_unknown_sound_title" msgid="8043718667804838398">"ಅಪ್ಲಿಕೇಶನ್ ಒದಗಿಸಿರುವ ಧ್ವನಿ"</string>
+    <string name="notification_unknown_sound_title" msgid="8043718667804838398">"ಆ್ಯಪ್‍ ಒದಗಿಸಿರುವ ಧ್ವನಿ"</string>
     <string name="notification_sound_default" msgid="2664544380802426260">"ಡಿಫಾಲ್ಟ್ ಅಧಿಸೂಚನೆ ಧ್ವನಿ"</string>
     <string name="alarm_ringtone_title" msgid="6411326147408635902">"ಡೀಫಾಲ್ಟ್ ಅಲಾರಾಂ ಧ್ವನಿ"</string>
     <string name="vibrate_when_ringing_title" msgid="2757996559847126952">"ಕರೆಗಳಿಗಾಗಿ ವೈಬ್ರೇಟ್"</string>
@@ -3394,8 +3394,8 @@
     <string name="zen_access_detail_switch" msgid="8706332327904974500">"ಅಡಚಣೆ ಮಾಡಬೇಡ ಆಯ್ಕೆಯನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="zen_access_empty_text" msgid="7667538993781607731">"ಯಾವುದೇ ಸ್ಥಾಪಿಸಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಪ್ರವೇಶಿಸುವಿಕೆಯನ್ನು ವಿನಂತಿಸಿಲ್ಲ"</string>
     <string name="loading_notification_apps" msgid="1978345231934072091">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
-    <string name="app_notifications_off_desc" msgid="3904090905748895146">"ನಿಮ್ಮ ವಿನಂತಿಯ ಮೇರೆಗೆ, ಈ ಸಾಧನದಲ್ಲಿ ಗೋಚರವಾಗುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಅಧಿಸೂಚನೆಗಳನ್ನು Android ನಿರ್ಬಂಧಿಸುತ್ತದೆ"</string>
-    <string name="channel_notifications_off_desc" msgid="8005444443218306611">"ನಿಮ್ಮ ವಿನಂತಿಯ ಮೇರೆಗೆ ಈ ಸಾಧನದಲ್ಲಿ ಗೋಚರವಾಗುವ ಈ ಪ್ರಕಾರದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಅಧಿಸೂಚನೆಗಳನ್ನು Android ನಿರ್ಬಂಧಿಸುತ್ತದೆ"</string>
+    <string name="app_notifications_off_desc" msgid="3904090905748895146">"ನಿಮ್ಮ ವಿನಂತಿಯ ಮೇರೆಗೆ, ಈ ಸಾಧನದಲ್ಲಿ ಆ್ಯಪ್‌ಗಳ ಅಧಿಸೂಚನೆಗಳು ಕಾಣಿಸದಂತೆ Android ನಿರ್ಬಂಧಿಸುತ್ತದೆ"</string>
+    <string name="channel_notifications_off_desc" msgid="8005444443218306611">"ನಿಮ್ಮ ವಿನಂತಿಯ ಮೇರೆಗೆ, ಈ ಸಾಧನದಲ್ಲಿ ಆ್ಯಪ್‌ಗಳ ಅಧಿಸೂಚನೆಗಳು ಕಾಣಿಸದಂತೆ Android ನಿರ್ಬಂಧಿಸುತ್ತದೆ"</string>
     <string name="channel_group_notifications_off_desc" msgid="7154205544298672850">"ನಿಮ್ಮ ವಿನಂತಿಯ ಮೇರೆಗೆ, ಈ ಸಾಧನದಲ್ಲಿ ಗೋಚರವಾಗುವ ಈ ಅಧಿಸೂಚನೆಗಳ ಗುಂಪನ್ನು Android ನಿರ್ಬಂಧಿಸುತ್ತದೆ"</string>
     <string name="notification_channels" msgid="956764228116145956">"ವಿಭಾಗಗಳು"</string>
     <string name="notification_channels_other" msgid="1615988645667411530">"ಇತರೆ"</string>
@@ -3403,7 +3403,7 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ವರ್ಗಗಳು</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ವರ್ಗಗಳು</item>
     </plurals>
-    <string name="no_channels" msgid="8884254729302501652">"ಯಾವುದೇ ಅಧಿಸೂಚನೆಗಳನ್ನು ಈ ಅಪ್ಲಿಕೇಶನ್‌ ಪೋಸ್ಟ್‌ ಮಾಡಿಲ್ಲ"</string>
+    <string name="no_channels" msgid="8884254729302501652">"ಯಾವುದೇ ಅಧಿಸೂಚನೆಗಳನ್ನು ಈ ಆ್ಯಪ್‍‌ ಪೋಸ್ಟ್‌ ಮಾಡಿಲ್ಲ"</string>
     <string name="app_settings_link" msgid="8465287765715790984">"ಆ್ಯಪ್‍ನಲ್ಲಿ ಹೆಚ್ಚುವರಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="app_notification_listing_summary_zero" msgid="4047782719487686699">"ಎಲ್ಲ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಆನ್ ಮಾಡಲಾಗಿದೆ"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="1161774065480666519">
@@ -3418,7 +3418,7 @@
     <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="notification_content_block_title" msgid="2805138591864484587">"ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸು"</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>
     <string name="notification_channel_badge_title" msgid="8228215248332054612">"ಅಧಿಸೂಚನೆ ಡಾಟ್‌ ತೋರಿಸಿ"</string>
@@ -3643,9 +3643,9 @@
     <string name="filter_notif_blocked_channels" msgid="6110799550327612670">"ವರ್ಗಗಳು: ಆಫ್ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="filter_notif_dnd_channels" msgid="3251570137256371092">"ವರ್ಗಗಳು: ಅಡಚಣೆ ಮಾಡಬೇಡ ಓವರ್ರೈಡ್"</string>
     <string name="advanced_apps" msgid="6643869089344883537">"ಸುಧಾರಿತ"</string>
-    <string name="configure_apps" msgid="4066683118857400943">"ಅಪ್ಲಿಕೇಶನ್‌ ಕಾನ್ಫಿಗರ್‌"</string>
+    <string name="configure_apps" msgid="4066683118857400943">"ಆ್ಯಪ್‍ ಕಾನ್ಫಿಗರ್‌ ಮಾಡಿ"</string>
     <string name="unknown_app" msgid="2312052973570376877">"ಅಪರಿಚಿತ ಅಪ್ಲಿಕೇಶನ್"</string>
-    <string name="app_permissions" msgid="3215958256821756086">"ಅನುಮತಿ ನಿರ್ವಾಹಕರು"</string>
+    <string name="app_permissions" 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>
@@ -3680,7 +3680,7 @@
     <string name="apps_storage" msgid="5658466038269046038">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಸಂಗ್ರಹ"</string>
     <string name="usage_access" msgid="2023443456361489516">"ಬಳಕೆ ಪ್ರವೇಶ"</string>
     <string name="permit_usage_access" msgid="3321727608629752758">"ಬಳಕೆ ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸಿ"</string>
-    <string name="app_usage_preference" msgid="5691545073101551727">"ಅಪ್ಲಿಕೇಶನ್ ಬಳಕೆಯ ಪ್ರಾಶಸ್ತ್ಯಗಳು"</string>
+    <string name="app_usage_preference" msgid="5691545073101551727">"ಆ್ಯಪ್‌ ಬಳಕೆಯ ಪ್ರಾಶಸ್ತ್ಯಗಳು"</string>
     <string name="time_spent_in_app_pref_title" msgid="2803186835902798451">"ವೀಕ್ಷಣಾ ಅವಧಿ"</string>
     <string name="usage_access_description" msgid="2178083292760305207">"ಬಳಕೆ ಪ್ರವೇಶವು ನೀವು ಇತರ ಯಾವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಬಳಸುತ್ತಿರುವಿರಿ ಮತ್ತು ಎಷ್ಟು ಬಾರಿ ಎಂಬುದನ್ನು ಅಲ್ಲದೆ ನಿಮ್ಮ ವಾಹಕ, ಭಾಷೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಹಾಗೂ ಇತರ ವಿವರಗಳನ್ನು ಟ್ರ್ಯಾಕ್ ಮಾಡಲು ಅನುಮತಿಸುತ್ತದೆ."</string>
     <string name="memory_settings_title" msgid="7867148522014070721">"ಮೆಮೊರಿ"</string>
@@ -3716,7 +3716,7 @@
     <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>
-    <string name="app_notification_preferences" msgid="5154466638524523201">"ಅಪ್ಲಿಕೇಶನ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
+    <string name="app_notification_preferences" msgid="5154466638524523201">"ಆ್ಯಪ್‍ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="system_ui_settings" msgid="6751165163665775447">"SystemUI ಟ್ಯೂನರ್ ತೋರಿಸು"</string>
     <string name="additional_permissions" msgid="3142290772324571654">"ಹೆಚ್ಚುವರಿ ಅನುಮತಿಗಳು"</string>
     <string name="additional_permissions_more" msgid="714264060348056246">"<xliff:g id="COUNT">%1$d</xliff:g> ಇನ್ನಷ್ಟು"</string>
@@ -3768,7 +3768,7 @@
     <string name="average_memory_use" msgid="5333366040118953945">"ಸರಾಸರಿ ಮೆಮೊರಿ ಬಳಕೆ"</string>
     <string name="maximum_memory_use" msgid="6509872438499846077">"ಗರಿಷ್ಠ ಮೆಮೊರಿ ಬಳಕೆ"</string>
     <string name="memory_usage" msgid="7963253555330830906">"ಮೆಮೊರಿ ಬಳಕೆ"</string>
-    <string name="app_list_memory_use" msgid="356095943215944031">"ಅಪ್ಲಿಕೇಶನ್ ಬಳಕೆ"</string>
+    <string name="app_list_memory_use" msgid="356095943215944031">"ಆ್ಯಪ್‍ ಬಳಕೆ"</string>
     <string name="memory_details" msgid="5165105904103664110">"ವಿವರಗಳು"</string>
     <string name="memory_use_summary" msgid="7676311343819965850">"ಕಳೆದ 3 ಗಂಟೆಗಳಿಂದ ಬಳಸಲಾದ <xliff:g id="SIZE">%1$s</xliff:g> ಸರಾಸರಿ ಮೆಮೊರಿ"</string>
     <string name="no_memory_use_summary" msgid="3966550113388917978">"ಕಳೆದ 3 ಗಂಟೆಗಳಿಂದ ಯಾವುದೇ ಮೆಮೊರಿ ಬಳಸಲಾಗಿಲ್ಲ"</string>
@@ -3792,22 +3792,22 @@
     <string name="zen_access_revoke_warning_dialog_title" msgid="6850994585577513299">"<xliff:g id="APP">%1$s</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅಡಚಣೆ ಮಾಡಬೇಡಿಗೆ ಪ್ರವೇಶವನ್ನು ಹಿಂತೆಗೆದುಕೊಳ್ಳುವುದೇ?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="3487422193181311403">"ಈ ಅಪ್ಲಿಕೇಶನ್ ರಚಿಸಿರುವಂತಹ ಎಲ್ಲ ಅಡಚಣೆ ಮಾಡಬೇಡಿ ನಿಯಮಗಳನ್ನು ತೆಗೆದುಹಾಕಲಾಗುತ್ತದೆ."</string>
     <string name="ignore_optimizations_on" msgid="4373971641328943551">"ಆಪ್ಟಿಮೈಸ್ ಮಾಡಬೇಡಿ"</string>
-    <string name="ignore_optimizations_off" msgid="4372289432580282870">"ಆಪ್ಟಿಮೈಸ್ ಮಾಡಿ"</string>
+    <string name="ignore_optimizations_off" msgid="4372289432580282870">"Optimize"</string>
     <string name="ignore_optimizations_on_desc" msgid="2904484569799521559">"ನಿಮ್ಮ ಬ್ಯಾಟರಿಯನ್ನು ತ್ವರಿತವಾಗಿ ಬರಿದಾಗಿಸಬಹುದು. ಹಿನ್ನೆಲೆ ಬ್ಯಾಟರಿ ಬಳಸದಂತೆ ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಇನ್ನು ಮುಂದೆ ನಿರ್ಬಂಧಿಸಲಾಗುವುದಿಲ್ಲ."</string>
     <string name="ignore_optimizations_off_desc" msgid="5598702251817814289">"ಉತ್ತಮ ಬ್ಯಾಟರಿ ಬಾಳಿಕೆಗೆ ಶಿಫಾರಸು ಮಾಡಲಾಗಿದೆ"</string>
     <string name="ignore_optimizations_title" msgid="7924345545276166305">"ಬ್ಯಾಟರಿ ಆಪ್ಟಿಮೈಸೇಶನ್‌ಗಳನ್ನು ಕಡೆಗಣಿಸಲು <xliff:g id="APP">%s</xliff:g> ಗೆ ಅನುಮತಿಸುವುದೇ?"</string>
     <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="permit_draw_overlay" msgid="9039092257052422344">"‍ಇತರ ಆ್ಯಪ್‍‍ಗಳ ಮೇಲೆ ಡಿಸ್‌ಪ್ಲೇ ಮಾಡಲು ಅನುಮತಿಸಿ"</string>
     <string name="allow_overlay_description" msgid="6669524816705082807">"ನೀವು ಬಳಸುತ್ತಿರುವ ಇತರ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಮೇಲೆ ಪ್ರದರ್ಶಿಸಲು ಈ ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುಮತಿ ನೀಡಿ. ನೀವು ಆ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಬಳಸುವುದರ ಮೇಲೆ ಇದು ಪರಿಣಾಮ ಬೀರಬಹುದು ಅಥವಾ ಅವು ಕಾಣಿಸುವ ಅಥವಾ ವರ್ತಿಸುವ ರೀತಿಯನ್ನು ಬದಲಾಯಿಸಬಹುದು."</string>
     <string name="keywords_vr_listener" msgid="5312633527788917750">"ವಿಆರ್ ವರ್ಚುವಲ್ ರಿಯಾಲಿಟಿ ಕೇಳುವಿಕೆ ಸ್ಟೀರಿಯೊ ಸಹಾಯ ಸೇವೆ"</string>
     <string name="keywords_system_alert_window" msgid="3936658600272194599">"ಸಿಸ್ಟಂ ಅಲರ್ಟ್ ವಿಂಡೋ ಡಯಲಾಗ್ ಡಿಸ್‌ಪ್ಲೇ ಇತರ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಮೇಲೆ"</string>
-    <string name="overlay_settings" msgid="3325154759946433666">"ಇತರ ಅಪ್ಲಿಕೇಶನ್ ಮೇಲೆ ಡಿಸ್‌ಪ್ಲೇ"</string>
+    <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>
@@ -3877,7 +3877,7 @@
     <string name="disabled_by_policy_title_sms" msgid="1453236584236681105">"ಎಸ್ಎಂಎಸ್‌ಗೆ ಅನುಮತಿಯಿಲ್ಲ"</string>
     <string name="disabled_by_policy_title_camera" msgid="3741138901926111197">"ಕ್ಯಾಮರಾಗೆ ಅನುಮತಿಯಿಲ್ಲ"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="1856835333536274665">"ಸ್ಕ್ರೀನ್‌ಶಾಟ್‌ಗೆ ಅನುಮತಿಯಿಲ್ಲ"</string>
-    <string name="disabled_by_policy_title_suspend_packages" msgid="4254714213391802322">"ಈ ಅಪ್ಲಿಕೇಶನ್ ತೆರೆಯಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+    <string name="disabled_by_policy_title_suspend_packages" msgid="4254714213391802322">"ಈ ಆ್ಯಪ್‍‍ ತೆರೆಯಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="default_admin_support_msg" msgid="5789424433689798637">"ನಿಮಗೆ ಯಾವುದೇ ಪ್ರಶ್ನೆಗಳಿದ್ದರೆ, ನಿಮ್ಮ ಐಟಿ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ"</string>
     <string name="admin_support_more_info" msgid="8737842638087863477">"ಇನ್ನಷ್ಟು ವಿವರಗಳು"</string>
     <string name="admin_profile_owner_message" msgid="3199544166281052845">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಸೆಟ್ಟಿಂಗ್‌ಗಳು, ಅನುಮತಿಗಳು, ಕಾರ್ಪೊರೇಟ್‌ ಪ್ರವೇಶ, ನೆಟ್‌ವರ್ಕ್‌ ಚಟುವಟಿಕೆ ಮತ್ತು ಸಾಧನದ ಸ್ಥಳ ಮಾಹಿತಿಯನ್ನು ಒಳಗೊಂಡಂತೆ ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್‌ಗೆ ಸಂಬಂಧಿಸಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು ಮತ್ತು ನಿರ್ವಹಿಸಬಹುದು."</string>
@@ -3934,7 +3934,7 @@
     <string name="ota_disable_automatic_update_summary" msgid="5650682441097227162">"ಸಾಧನ ಮರುಪ್ರಾರಂಭಿಸಿದಾಗ ಅಪ್‌ಡೇಟ್‌ಗಳನ್ನು ಅನ್ವಯಿಸಿ"</string>
     <string name="usage" msgid="9172908720164431622">"ಬಳಕೆ"</string>
     <string name="cellular_data_usage" msgid="1236562234207782386">"ಮೊಬೈಲ್ ಡೇಟಾ ಬಳಕೆ"</string>
-    <string name="app_cellular_data_usage" msgid="8499761516172121957">"ಅಪ್ಲಿಕೇಶನ್‌ ಡೇಟಾ ಬಳಕೆ"</string>
+    <string name="app_cellular_data_usage" msgid="8499761516172121957">"ಆ್ಯಪ್‍ ಡೇಟಾ ಬಳಕೆ"</string>
     <string name="wifi_data_usage" msgid="275569900562265895">"ವೈ-ಫೈ ಡೇಟಾ ಬಳಕೆ"</string>
     <string name="ethernet_data_usage" msgid="747614925362556718">"ಇಥರ್ನೆಟ್ ಡೇಟಾ ಬಳಕೆ"</string>
     <string name="wifi" msgid="1586738489862966138">"ವೈ-ಫೈ"</string>
@@ -3993,7 +3993,7 @@
     <string name="data_saver_switch_title" msgid="8244008132112735207">"ಡೇಟಾ ಸೇವರ್ ಅನ್ನು ಬಳಸಿ"</string>
     <string name="unrestricted_app_title" msgid="4390661122069905122">"ಅನಿರ್ಬಂಧಿಸಿದ ಡೇಟಾ ಬಳಕೆ"</string>
     <string name="unrestricted_app_summary" msgid="2829141815077800483">"ಡೇಟಾ ಉಳಿಸುವಿಕೆಯು ಆನ್ ಆಗಿರುವಾಗ ಅನಿರ್ಬಂಧಿಸಿದ ಡೇಟಾ ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸಿ"</string>
-    <string name="home_app" msgid="3695063566006954160">"ಮುಖಪುಟ ಅಪ್ಲಿಕೇಶನ್"</string>
+    <string name="home_app" msgid="3695063566006954160">"Home ಆ್ಯಪ್‍"</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>
@@ -4052,7 +4052,7 @@
     <string name="display_cutout_emulation_keywords" msgid="6795671536772871439">"ಕಟ್ಔಟ್ ಪ್ರದರ್ಶನ, ನಾಚ್"</string>
     <string name="overlay_option_device_default" msgid="165508753381657697">"ಸಾಧನದ ಡೀಫಾಲ್ಟ್"</string>
     <string name="overlay_toast_failed_to_apply" msgid="5692251825129250040">"ಓವರ್‌ಲೇ ಅನ್ನು ಅನ್ವಯಿಸಲು ವಿಫಲವಾಗಿದೆ"</string>
-    <string name="special_access" msgid="1453926335914696206">"ವಿಶೇಷ ಅಪ್ಲಿಕೇಶನ್ ಪ್ರವೇಶ"</string>
+    <string name="special_access" msgid="1453926335914696206">"ವಿಶೇಷ ಆ್ಯಪ್‍ ಪ್ರವೇಶ"</string>
     <plurals name="special_access_summary" formatted="false" msgid="5182092345063909346">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳು, ಅನಿರ್ಬಂಧಿತ ಡೇಟಾ ಬಳಸಬಹುದು</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳು, ಅನಿರ್ಬಂಧಿತ ಡೇಟಾ ಬಳಸಬಹುದು</item>
@@ -4228,7 +4228,7 @@
       <item quantity="one">ಇಮೇಲ್ ಕ್ಲೈಂಟ್ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು</item>
       <item quantity="other">ಇಮೇಲ್ ಕ್ಲೈಂಟ್ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು</item>
     </plurals>
-    <string name="default_map_app_title" msgid="6919751358166607185">"ನಕ್ಷೆಯ ಅಪ್ಲಿಕೇಶನ್"</string>
+    <string name="default_map_app_title" msgid="6919751358166607185">"Map ಆ್ಯಪ್‍"</string>
     <plurals name="default_phone_app_title" formatted="false" msgid="7593838689002912108">
       <item quantity="one">ಫೋನ್ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು</item>
       <item quantity="other">ಫೋನ್ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು</item>
@@ -4243,7 +4243,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>
@@ -4284,7 +4284,7 @@
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"ಹಿನ್ನೆಲೆ ಚಟುವಟಿಕೆ ಪ್ರಾರಂಭಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"ಎಲ್ಲಾ ಹಿನ್ನೆಲೆ ಚಟುವಟಿಕೆ ಪ್ರಾರಂಭಿಸುವಿಕೆಗಳನ್ನು ಅನುಮತಿಸುತ್ತದೆ"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"ಯಾವಾಗಲೂ ಕ್ರ್ಯಾಶ್ ಸಂವಾದವನ್ನು ತೋರಿಸಿ"</string>
-    <string name="show_first_crash_dialog_summary" msgid="8197987550025401754">"ಅಪ್ಲಿಕೇಶನ್ ಕ್ರ್ಯಾಶ್ ಆಗುವಾಗ ಪ್ರತಿ ಬಾರಿ ಸಂವಾದವನ್ನು ತೋರಿಸಿ"</string>
+    <string name="show_first_crash_dialog_summary" msgid="8197987550025401754">"ಆ್ಯಪ್‍ ಕ್ರ್ಯಾಶ್ ಆಗುವ ಪ್ರತಿ ಬಾರಿ ಸಂವಾದವನ್ನು ತೋರಿಸಿ"</string>
     <string name="angle_enabled_app" msgid="4359266182151708733">"ANGLE ಸಕ್ರಿಯಗೊಳಿಸಿದ ಆ್ಯಪ್‌ ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="angle_enabled_app_not_set" msgid="7428910515748621910">"ಯಾವುದೇ ANGLE ಸಕ್ರಿಯಗೊಳಿಸದ ಆ್ಯಪ್‌ ಅನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="angle_enabled_app_set" msgid="7313088703610569320">"ANGLE ಸಕ್ರಿಯಗೊಳಿಸಿದ ಆ್ಯಪ್‌: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -4495,7 +4495,7 @@
       <item quantity="other"><xliff:g id="SERVICE_COUNT">%1$d</xliff:g> ಆ್ಯಪ್‌ಗಳು ನಿಮ್ಮ ಸಾಧನಕ್ಕೆ ಸಂಪೂರ್ಣ ಪ್ರವೇಶವನ್ನು ಹೊಂದಿವೆ</item>
     </plurals>
     <string name="manage_app_notification" msgid="9072118910762792295">"<xliff:g id="APP_NAME">%1$s</xliff:g>ಅಧಿಸೂಚನೆಗಳನ್ನು ನಿರ್ವಹಿಸಿ"</string>
-    <string name="no_suggested_app" msgid="509257628685025383">"ಸಲಹೆ ಮಾಡಲಾದ ಯಾವುದೇ ಅಪ್ಲಿಕೇಶನ್ ಇಲ್ಲ"</string>
+    <string name="no_suggested_app" msgid="509257628685025383">"ಸಲಹೆ ಮಾಡಲಾದ ಯಾವುದೇ ಆ್ಯಪ್‍ ಇಲ್ಲ"</string>
     <plurals name="notification_few_channel_count_summary" formatted="false" msgid="5165639207390218085">
       <item quantity="one"><xliff:g id="NOTIFICATION_CHANNEL_COUNT_1">%1$d</xliff:g> ಅಧಿಸೂಚನೆ ಚಾನಲ್‌ಗಳು.</item>
       <item quantity="other"><xliff:g id="NOTIFICATION_CHANNEL_COUNT_1">%1$d</xliff:g> ಅಧಿಸೂಚನೆ ಚಾನಲ್‌ಗಳು.</item>
diff --git a/tests/CarDeveloperOptions/res/values-ko/strings.xml b/tests/CarDeveloperOptions/res/values-ko/strings.xml
index 8d36e87..2ebb6c4 100644
--- a/tests/CarDeveloperOptions/res/values-ko/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ko/strings.xml
@@ -1844,7 +1844,7 @@
     <string name="default_emergency_app" msgid="286530070173495823">"긴급 앱"</string>
     <string name="reset_app_preferences" msgid="1426500030595212077">"앱 환경설정 초기화"</string>
     <string name="reset_app_preferences_title" msgid="792909865493673598">"앱 환경설정을 초기화하시겠습니까?"</string>
-    <string name="reset_app_preferences_desc" msgid="7935273005301096031">"이 작업을 수행하면 다음 환경설정이 초기화됩니다.\n\n "<li>"사용 중지된 앱"</li>\n" "<li>"사용 중지된 앱 알림"</li>\n" "<li>"작업에 사용하는 기본 애플리케이션"</li>\n" "<li>"앱에 대한 백그라운드 데이터 제한"</li>\n" "<li>"그 밖의 권한 제한"</li>\n\n" 앱 데이터는 손실되지 않습니다."</string>
+    <string name="reset_app_preferences_desc" msgid="7935273005301096031">"다음 환경설정이 초기화됩니다.\n\n "<li>"사용 중지된 앱"</li>\n" "<li>"사용 중지된 앱 알림"</li>\n" "<li>"작업에 사용하는 기본 애플리케이션"</li>\n" "<li>"앱의 백그라운드 데이터 제한"</li>\n" "<li>"그 밖의 권한 제한"</li>\n\n" 앱 데이터는 손실되지 않습니다."</string>
     <string name="reset_app_preferences_button" msgid="2041894727477934656">"앱 초기화"</string>
     <string name="manage_space_text" msgid="6166469422303124302">"공간 관리"</string>
     <string name="filter" msgid="2426943916212457962">"필터"</string>
@@ -2869,7 +2869,7 @@
     <string name="user_add_profile_item_summary" msgid="6386283837789573755">"내 계정의 앱 및 콘텐츠에 대한 액세스를 제한할 수 있습니다."</string>
     <string name="user_add_user_item_title" msgid="6835385073795492410">"사용자"</string>
     <string name="user_add_profile_item_title" msgid="4932743891449790664">"제한된 프로필"</string>
-    <string name="user_add_user_title" msgid="2320897397066676472">"새 사용자를 추가할까요?"</string>
+    <string name="user_add_user_title" msgid="2320897397066676472">"새 사용자를 추가하시겠습니까?"</string>
     <string name="user_add_user_message_long" msgid="686637203224195465">"추가 사용자를 만들어 다른 사용자와 기기를 공유할 수 있습니다. 각 사용자는 앱, 배경화면 등으로 맞춤설정할 수 있는 자신만의 공간을 갖게 됩니다. 또한 모든 사용자에게 영향을 미치는 Wi‑Fi와 같은 기기 설정도 조정할 수 있습니다.\n\n추가된 신규 사용자는 자신의 공간을 설정해야 합니다.\n\n모든 사용자가 앱을 업데이트할 수 있으며, 업데이트는 다른 사용자에게도 적용됩니다. 접근성 설정 및 서비스는 신규 사용자에게 이전되지 않을 수도 있습니다."</string>
     <string name="user_add_user_message_short" msgid="1802594476285458254">"추가된 새로운 사용자는 자신의 공간을 설정해야 합니다.\n\n모든 사용자는 다른 사용자들을 위하여 앱을 업데이트할 수 있습니다."</string>
     <string name="user_setup_dialog_title" msgid="6748950002206392396">"지금 사용자를 설정하시겠습니까?"</string>
@@ -3282,7 +3282,7 @@
     <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="7584229011611927613">"방해 금지 모드의 알림 설정을 변경하시겠습니까?"</string>
     <string name="sound_work_settings" msgid="4140215240360927923">"직장 프로필 사운드"</string>
     <string name="work_use_personal_sounds_title" msgid="531727195073003599">"개인 프로필 사운드 사용"</string>
-    <string name="work_use_personal_sounds_summary" msgid="2886871383995187441">"직장 프로필과 개인 프로필의 소리가 같습니다."</string>
+    <string name="work_use_personal_sounds_summary" msgid="2886871383995187441">"직장 프로필과 개인 프로필의 사운드가 같습니다."</string>
     <string name="work_ringtone_title" msgid="5499360583947410224">"직장 휴대전화 벨소리"</string>
     <string name="work_notification_ringtone_title" msgid="8059159087214025757">"기본 직장 알림 소리"</string>
     <string name="work_alarm_ringtone_title" msgid="5328487181385375130">"기본 직장 알람 소리"</string>
diff --git a/tests/CarDeveloperOptions/res/values-ky/strings.xml b/tests/CarDeveloperOptions/res/values-ky/strings.xml
index d694743..ec074c4 100644
--- a/tests/CarDeveloperOptions/res/values-ky/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ky/strings.xml
@@ -124,7 +124,7 @@
     <string name="progress_scanning" msgid="633923400401041181">"Изделүүдө"</string>
     <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_title" msgid="5090288898529286011">"Байланыштыруу өтүнүчү"</string>
     <string name="bluetooth_notif_message" msgid="6612367890895077938">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> менен жупташуу үчүн таптап коюңуз."</string>
     <string name="bluetooth_show_received_files" msgid="5060846395852236652">"Алынган файлдар"</string>
     <string name="bluetooth_show_files_received_via_bluetooth" msgid="1699095577431389560">"Bluetooth аркылуу алынган файлдар"</string>
@@ -178,7 +178,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">"Bluetooth жупташтыруу үчүн күйгүзүлөт"</string>
+    <string name="connected_device_add_device_summary" msgid="7960491471270158891">"Bluetooth күйгүзүлөт"</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>
@@ -289,7 +289,7 @@
     <string name="sd_card_settings_label" product="nosdcard" msgid="3433188145440984933">"USB сактагыч"</string>
     <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="cancel" msgid="2582602392048772404">"Жок"</string>
     <string name="okay" msgid="5838476766924989056">"OK"</string>
     <string name="forget" msgid="7735525146062672874">"Унутуу"</string>
     <string name="save" msgid="3418211178410498517">"Сактоо"</string>
@@ -350,7 +350,7 @@
     <string name="lock_after_timeout_summary" msgid="3160517585613694740">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> уктагандан кийин"</string>
     <string name="lock_immediately_summary_with_exception" msgid="6442552135409347556">"Көшүү режимине өтөөрү менен, кулпуланбаган экран <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> кызматында колдоого алынбаса"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="7218267834086717545">"Кулпуланбаган экран <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> кызматында колдоого алынбаса, көшүү режимине өткөндөн <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> кийин"</string>
-    <string name="show_owner_info_on_lockscreen_label" msgid="4510756693837171575">"Кулпуланган экрандан ээсинин маалыматы көрсөтүлсүн"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="4510756693837171575">"Кулпуланган экрандан ээсинин маалыматы көрүнсүн"</string>
     <string name="owner_info_settings_title" msgid="2537966178998339896">"Экрандагы текст"</string>
     <string name="security_enable_widgets_title" msgid="1701510007926738088">"Виджеттерди жандыруу"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="4408176087132339331">"Администратор өчүрүп койгон"</string>
@@ -442,7 +442,7 @@
     <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>
+    <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="9168637333731599827">"Жок"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="271662150372486535">"Улантуу"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="756928427429893070">"Өткөрүп жиберүү"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="4125977169169671144">"Кийинки"</string>
@@ -464,7 +464,7 @@
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="7835824123269738540">"Түзмөк жана манжа изи сенсорунун жайгашкан жери менен сүрөттөмө"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="3519748398694308901">"Аталышы"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="3428927518029038956">"Жарайт"</string>
-    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4312297515772004580">"Жок кылуу"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4312297515772004580">"Өчүрүү"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="1346287821809975177">"Сенсорго тийиңиз"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="750040530347336376">"Манжаңызды сенсорго коюп, дирилдегенин сезгенден кийин көтөрүңүз"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="1764145704166303842">"Көтөрүп, кайра тийип коюңуз"</string>
@@ -705,10 +705,10 @@
     <string name="lockpassword_password_blacklisted_by_admin" msgid="4988166770148440755">"Жөнөкөй сырсөздөрү коюу IT администраторуңуз тарабынан бөгөттөлгөн. Татаалыраак сырсөздү коюп көрүңүз."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="3902387296149848324">"Сандар чоңойгон, кичирейген же кайталанган ыраатта болбошу керек"</string>
     <string name="lockpassword_confirm_label" msgid="1512364313516715624">"Ырастоо"</string>
-    <string name="lockpassword_cancel_label" msgid="3799907375604482766">"Жокко чыгаруу"</string>
+    <string name="lockpassword_cancel_label" msgid="3799907375604482766">"Жок"</string>
     <string name="lockpassword_clear_label" msgid="3201458533657963554">"Тазалоо"</string>
     <string name="lockpassword_credential_changed" msgid="5183961439209866170">"Экранды бөгөттөө өзгөртүлгөн. Жаңы экранды бөгөттөө дайындары менен аракет кылып көрүңүз."</string>
-    <string name="lockpattern_tutorial_cancel_label" msgid="450401426127674369">"Жокко чыгаруу"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="450401426127674369">"Жок"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="8474690922559443018">"Кийинки"</string>
     <string name="lock_setup" msgid="8710689848703935088">"Орнотуу аяктады."</string>
     <string name="manage_device_admin" msgid="322047441168191695">"Түзмөктү башкарган колдонмолор"</string>
@@ -729,9 +729,9 @@
     <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_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">"16 сандан турушу керек"</string>
@@ -748,7 +748,7 @@
     <string name="bluetooth_searching_for_devices" msgid="7820814625522702494">"Изделүүдө…"</string>
     <string name="bluetooth_preference_device_settings" msgid="4247085616427015908">"Түзмөктүн жөндөөлөрү"</string>
     <string name="bluetooth_preference_paired_dialog_title" msgid="3567187438908143693">"Жупташкан түзмөк"</string>
-    <string name="bluetooth_preference_paired_dialog_internet_option" msgid="3693599743477470469">"Интернет байланышы"</string>
+    <string name="bluetooth_preference_paired_dialog_internet_option" msgid="3693599743477470469">"Интернет"</string>
     <string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="4627309436489645755">"Баскычтоп"</string>
     <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="5290994459307558039">"Байланыштар жана чалуу таржымалы"</string>
     <string name="bluetooth_pairing_dialog_title" msgid="7900515495932064945">"Бул түзмөк менен жупташасызбы?"</string>
@@ -759,7 +759,7 @@
     <string name="bluetooth_preference_no_found_devices" msgid="4190090666412408576">"Жеткиликтүү түзмөктөр жок"</string>
     <string name="bluetooth_device_context_connect" msgid="1812090541371432890">"Туташуу"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8085015949275771802">"Ажыратуу"</string>
-    <string name="bluetooth_device_context_pair_connect" msgid="1503322591778810032">"Жупташтыруу жана туташтыруу"</string>
+    <string name="bluetooth_device_context_pair_connect" msgid="1503322591778810032">"Байланыштыруу жана туташтыруу"</string>
     <string name="bluetooth_device_context_unpair" msgid="250588431708253041">"Жупташуудан чыгаруу"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="4519151805677280077">"Ажыратуу жана жупташуудан чыгаруу"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="423463405499392444">"Параметрлер…"</string>
@@ -854,8 +854,8 @@
     <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>
-    <string name="wifi_poor_network_detection_summary" msgid="5539951465985614590">"Жакшы Интернет байланышы болмоюнча, Wi‑Fi тармагы колдонулбасын"</string>
-    <string name="wifi_avoid_poor_network_detection_summary" msgid="1976503191780928104">"Интернет байланышы туруктуу тармактар гана колдонулат"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="5539951465985614590">"Жакшы Интернет болмоюнча, Wi‑Fi тармагы колдонулбасын"</string>
+    <string name="wifi_avoid_poor_network_detection_summary" msgid="1976503191780928104">"Интернети күчтүү тармактар гана колдонулсун"</string>
     <string name="use_open_wifi_automatically_title" msgid="3084513215481454350">"Ачык тармактарга туташуу"</string>
     <string name="use_open_wifi_automatically_summary" msgid="8338020172673161754">"Байланыш сигналы күчтүү жалпыга ачык тармактарга автоматтык түрдө туташат"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="1559329344492373028">"Пайдалануу үчүн тармактын рейтингин камсыздоочуну тандаңыз"</string>
@@ -1031,7 +1031,7 @@
     <string name="wifi_advanced_settings_label" msgid="9147669851658738784">"IP жөндөөлөрү"</string>
     <string name="wifi_advanced_not_available" msgid="5751084989400195009">"Бул колдонуучу үчүн Wi‑Fi өздөштүрүлгөн жөндөөлөрү жеткиликсиз"</string>
     <string name="wifi_ip_settings_menu_save" msgid="6557330818360425933">"Сактоо"</string>
-    <string name="wifi_ip_settings_menu_cancel" msgid="8098696509412462494">"Жокко чыгаруу"</string>
+    <string name="wifi_ip_settings_menu_cancel" msgid="8098696509412462494">"Жок"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="7764507690387286292">"Жарактуу IP-адрес териңиз."</string>
     <string name="wifi_ip_settings_invalid_gateway" msgid="7602732367437862422">"Жарактуу шлюз дарегин териңиз."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="4471473055625376300">"Жарактуу DNS дарегин териңиз."</string>
@@ -1068,7 +1068,7 @@
     <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_local_only" msgid="3339582350894639261">"Жакын жердеги түзмөктөр менен мазмунду бөлүшүү үчүн колдонмолор байланыш түйүнү болуп бере алышат."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="3339582350894639261">"Жакын жердеги түзмөктөр менен кандайдыр бир нерселерди бөлүшүү үчүн колдонмолор байланыш түйүнү болуп бере алышат."</string>
     <string name="wifi_hotspot_auto_off_title" msgid="7416022590415189590">"Байланыш түйүнү автоматтык түрдө өчөт"</string>
     <string name="wifi_hotspot_auto_off_summary" msgid="3866769400624802105">"Бир дагы түзмөк туташпаса, Wi‑Fi байланыш түйүнү автоматтык түрдө өчүп калат"</string>
     <string name="wifi_tether_starting" msgid="7676952148471297900">"Байланыш түйүнү жандырылууда…"</string>
@@ -1119,7 +1119,7 @@
     <string name="wifi_calling_turn_on" msgid="1212277809455062043">"Wi-Fi аркылуу чалууну күйгүзүү"</string>
     <string name="wifi_calling_not_supported" msgid="216781767605669775">"%1$s байланыш операторунда Wi-Fi аркылуу чалууга болбойт"</string>
     <string name="carrier" msgid="3413463182542176886">"Байланыш оператору"</string>
-    <string name="display_settings_title" msgid="1243571562133261601">"Көрүнүш"</string>
+    <string name="display_settings_title" msgid="1243571562133261601">"Экран"</string>
     <string name="sound_settings" msgid="3306063041029638807">"Үн"</string>
     <string name="all_volume_title" msgid="1750261506951315423">"Үн бийиктиги"</string>
     <string name="musicfx_title" msgid="6456079041566773649">"Музыка эффектилери"</string>
@@ -1293,7 +1293,7 @@
     <string name="sim_pin_disable_failed" msgid="6780973900290546751">"PIN код өчүрүлбөй жатат."</string>
     <string name="sim_pin_enable_failed" msgid="804897359922298792">"PIN код иштетилбей жатат."</string>
     <string name="sim_enter_ok" msgid="5103626479976731229">"Жарайт"</string>
-    <string name="sim_enter_cancel" msgid="2806801210236824592">"Жокко чыгаруу"</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>
     <string name="sim_change_data_title" msgid="2512227368681250054">"<xliff:g id="CARRIER">%1$s</xliff:g> Интернети колдонулсунбу?"</string>
@@ -1307,10 +1307,10 @@
       <item quantity="one">SIM PIN-коду туура эмес, түзмөк кулпусун ачуу үчүн операторуңузга кайрылуудан мурун <xliff:g id="NUMBER_0">%d</xliff:g> аракет калды.</item>
     </plurals>
     <string name="pin_failed" msgid="4877356137480446727">"SIM-карта PIN аракети кыйрады!"</string>
-    <string name="system_update_settings_list_item_title" msgid="1907497454722790033">"Тутум жаңыртуулары"</string>
+    <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>
@@ -1406,7 +1406,7 @@
     <string name="sd_ejecting_title" msgid="595074246815112145">"Ажыратылууда"</string>
     <string name="sd_ejecting_summary" msgid="5708943172014003213">"Ажыратылып жатат"</string>
     <string name="storage_low_title" msgid="6957178208426099592">"Сактагычта орун түгөнүп баратат"</string>
-    <string name="storage_low_summary" msgid="4475275204869514141">"Кээ бир системдик функциялар, мисалы, синхрондоо, туура эмес иштеши мүмкүн. Колдонмолор же медиа мазмундарды жок кылып орун бошотконго аракет кылыңыз."</string>
+    <string name="storage_low_summary" msgid="4475275204869514141">"Кээ бир системанын функциялары, мисалы, синхрондоо, туура эмес иштеши мүмкүн. Колдонмолор же медиа мазмундарды жок кылып орун бошотконго аракет кылыңыз."</string>
     <string name="storage_menu_rename" msgid="3731682449294417745">"Аталышын өзгөртүү"</string>
     <string name="storage_menu_mount" msgid="6395893560780365473">"Кошуу"</string>
     <string name="storage_menu_unmount" msgid="5041360076873514189">"Чыгаруу"</string>
@@ -1575,7 +1575,7 @@
     <string name="reset_esim_title" msgid="7630781767040831893">"Жүктөп алган SIM’дерди өчүрүү"</string>
     <string name="reset_esim_desc" msgid="433226911566802">"Ордуна башка SIM карта жүктөп алуу үчүн, операторуңуз менен байланышыңыз. Тарифтик пландарыңыз өзгөрбөйт."</string>
     <string name="reset_network_button_text" msgid="4293271046867912819">"Жөндөөлөрдү кайра коюу"</string>
-    <string name="reset_network_final_desc" msgid="2463817067048751373">"Тармак жөндөөлөрүнүн баары баштапкы абалга келтирилсинби? Бул аракетти кайра кайтара албайсыз."</string>
+    <string name="reset_network_final_desc" msgid="2463817067048751373">"Тармак жөндөөлөрүн баштапкы абалга келтирсеңиз, аларды артка кайтара албайсыз. Уланта бересизби?"</string>
     <string name="reset_network_final_desc_esim" msgid="4676436976372555750">"Тармак жөндөөлөрүнүн баарын баштапкы абалга келтирип, жүктөлүп алынган SIM карталарды өчүрөсүзбү? Бул аракетти артка кайтара албайсыз."</string>
     <string name="reset_network_final_button_text" msgid="345255333127794393">"Жөндөөлөрдү кайра коюу"</string>
     <string name="reset_network_confirm_title" msgid="2432145031070536008">"Кайра коесузбу?"</string>
@@ -1703,7 +1703,7 @@
     <string name="settings_license_activity_loading" msgid="7272151895113843742">"Жүктөлүүдө…"</string>
     <string name="settings_safetylegal_title" msgid="2681094772308772633">"Коопсуздук маалыматы"</string>
     <string name="settings_safetylegal_activity_title" msgid="8455437862683602240">"Коопсуздук маалыматы"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="3541894966476445833">"Учурда сизде мобилдик Интернет жок. Бул маалыматты азыр көрүү үчүн Интернет байланышы бар компьютерден %s баракчасына өтүңүз."</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="3541894966476445833">"Учурда сизде мобилдик Интернет жок. Бул маалыматты азыр көрүү үчүн Интернет бар компьютерден %s баракчасына өтүңүз."</string>
     <string name="settings_safetylegal_activity_loading" msgid="7680998654145172">"Жүктөлүүдө…"</string>
     <string name="confirm_device_credential_use_alternate_method" msgid="1279869272895739941">"Башка ыкманы колдонуу"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="6283518876031424798">"Экран кулпусун коюу"</string>
@@ -1748,7 +1748,7 @@
     <string name="lockpassword_invalid_password" msgid="8374331995318204099">"Сырсөз туура эмес"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1328670466959377948">"Үлгү туура эмес"</string>
     <string name="lock_settings_title" msgid="233657584969886812">"Түзмөктүн коопсуздугу"</string>
-    <string name="lockpattern_change_lock_pattern_label" msgid="333149762562581510">"Кулпуну ачуу үлгүсүн өзгөртүү"</string>
+    <string name="lockpattern_change_lock_pattern_label" msgid="333149762562581510">"Графикалык ачкычты өзгөртүү"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="3435796032210265723">"Кулпуну ачуу PIN кодун өзгөртүү"</string>
     <string name="lockpattern_recording_intro_header" msgid="2262005028838969839">"Кулпуну ачуучу графикалык ачкычты тартыңыз"</string>
     <string name="lockpattern_recording_intro_footer" msgid="5426745740754065099">"Жардам үчүн Менюну басыңыз."</string>
@@ -1758,20 +1758,20 @@
     <string name="lockpattern_need_to_confirm" msgid="4079482507985867389">"Ырастоо үчүн графикалык ачкычты дагы бир жолу тартыңыз"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="5603156929428721407">"Жаңы графикалык ачкычыңыз"</string>
     <string name="lockpattern_confirm_button_text" msgid="7059311304112902598">"Ырастоо"</string>
-    <string name="lockpattern_restart_button_text" msgid="4322968353922529868">"Кайра тартуу"</string>
+    <string name="lockpattern_restart_button_text" msgid="4322968353922529868">"Кайра тартам"</string>
     <string name="lockpattern_retry_button_text" msgid="5473976578241534298">"Тазалоо"</string>
     <string name="lockpattern_continue_button_text" msgid="3328913552656376892">"Улантуу"</string>
-    <string name="lockpattern_settings_title" msgid="5152005866870766842">"Кулпуну ачуу үлгүсү"</string>
+    <string name="lockpattern_settings_title" msgid="5152005866870766842">"Графикалык ачкыч"</string>
     <string name="lockpattern_settings_enable_title" msgid="8508410891939268080">"Үлгү талап кылынсын"</string>
     <string name="lockpattern_settings_enable_summary" msgid="8027605503917737512">"Экран кулпусун ачуу үчүн сүрөт үлгүсү тартылышы керек"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="4935583222709647096">"Үлгүнү көрсөтүү"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="5338893138982642228">"Профилдин графикалык ачкычы көрсөтүлсүн"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="5338893138982642228">"Профилдин графикалык ачкычы көрүнсүн"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="3203621862806531947">"Таптаганда дирилдесин"</string>
     <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5890335732200257777">"Кубат баскычы дароо кулпулайт"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="1279989004145567840">"Кулпуланбаган экран <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> кызматында колдоого алынбаса"</string>
-    <string name="lockpattern_settings_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_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="activity_not_found" msgid="3492413375341165453">"Колдонмо сиздин телефонуңузда орнотулган эмес."</string>
     <string name="lock_settings_profile_title" msgid="3928992050074556160">"Жумуш профилинин коопсуздугу"</string>
@@ -1844,7 +1844,7 @@
     <string name="default_emergency_app" msgid="286530070173495823">"Өзгөчө кырдаал колдонмосу"</string>
     <string name="reset_app_preferences" msgid="1426500030595212077">"Колдонмонун жөндөөлөрүн кайра коюу"</string>
     <string name="reset_app_preferences_title" msgid="792909865493673598">"Колдонмону кайра баштан жөндөйсүзбү?"</string>
-    <string name="reset_app_preferences_desc" msgid="7935273005301096031">"Ушуну менен төмөнкү жөндөөлөр жоюлат:\n\n "<li>"Өчүрүлгөн колдонмолор"</li>\n" "<li>"Өчүрүлгөн колдонмолордун билдирмелери"</li>\n" "<li>"Демейки колдонмолор"</li>\n" "<li>"Фондук дайындарга коюлган чектөөлөр"</li>\n" "<li>"Бардык уруксат чектөөлөрү"</li>\n\n"Колдонмолордун дайындары жоголбойт."</string>
+    <string name="reset_app_preferences_desc" msgid="7935273005301096031">"Ушуну менен төмөнкү жөндөөлөр жоюлат:\n\n "<li>"Өчүрүлгөн колдонмолор"</li>\n" "<li>"Өчүрүлгөн колдонмолордун билдирмелери"</li>\n" "<li>"Демейки колдонмолор"</li>\n" "<li>"Фондук режимде маалымат өткөрүүгө коюлган чектөөлөр"</li>\n" "<li>"Бардык уруксаттардын чектөөлөрү"</li>\n\n"Колдонмолордогу нерселер жоголбойт."</string>
     <string name="reset_app_preferences_button" msgid="2041894727477934656">"Баштапкы абалга келтирүү"</string>
     <string name="manage_space_text" msgid="6166469422303124302">"Бош орунду башкаруу"</string>
     <string name="filter" msgid="2426943916212457962">"Чыпка"</string>
@@ -1881,7 +1881,7 @@
     <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="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>
@@ -1937,7 +1937,7 @@
     <string name="main_running_process_description" msgid="7733268956566861797">"Колдонуудагы негизги процесс."</string>
     <string name="process_service_in_use_description" msgid="2253782391122637651">"<xliff:g id="COMP_NAME">%1$s</xliff:g> кызматы колдонулууда."</string>
     <string name="process_provider_in_use_description" msgid="7841332986505618569">"<xliff:g id="COMP_NAME">%1$s</xliff:g> провайдери колдонулууда."</string>
-    <string name="runningservicedetails_stop_dlg_title" msgid="6022380394950336262">"Тутум кызматы токтотулсунбу?"</string>
+    <string name="runningservicedetails_stop_dlg_title" msgid="6022380394950336262">"Системанын кызматы токтотулсунбу?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="7619909495973395025">"Бул кызматты токтотсоңуз, планшетиңизди өчүрүп, кайра жандырмайынча, анын кээ бир мүмкүнчүлүктөрү туура эмес иштеп калышы мүмкүн."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="8168850859827213988">"Бул кызматты токтотсоңуз, телефонуңузду өчүрүп, кайра жандырмайынча, анын кээ бир мүмкүнчүлүктөрү туура эмес иштеп калышы мүмкүн."</string>
     <string name="language_input_gesture_title" msgid="7547999017999159601">"Тилдер, киргизүү жана жаңсоолор"</string>
@@ -1958,7 +1958,7 @@
     <string name="auto_punctuate" msgid="8386007107100525931">"Автоматтык түрдө тыныш белгилерин коюу"</string>
     <string name="hardkeyboard_category" msgid="5937171470391551627">"Аппараттык баскычтоптун жөндөөлөрү"</string>
     <string name="auto_punctuate_summary" msgid="245694025030386370">"\".\" коюу үчүн боштук баскычын эки жолу басыңыз"</string>
-    <string name="show_password" msgid="620964020348073739">"Сырсөз көрсөтүлсүн"</string>
+    <string name="show_password" msgid="620964020348073739">"Сырсөз көрүнсүн"</string>
     <string name="show_password_summary" msgid="1403805089582258620">"Сырсөз терилип жатканда символдор бир саамга көрүнөт"</string>
     <string name="spellchecker_security_warning" msgid="792070474432612097">"Бул ката текшергич, сиз терген бардык тексттер, сырсөздөр жана кредиттик карталар сыяктуу жеке маалыматтарды кошо чогултушу мүмкүн. Бул <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> колдонмосу менен байланыштуу. Бул ката текшергич колдонулсунбу?"</string>
     <string name="spellchecker_quick_settings" msgid="5193036510190696655">"Жөндөөлөр"</string>
@@ -2001,7 +2001,7 @@
     <string name="user_dict_settings_add_shortcut_hint" msgid="2212771507741334156">"Кошумча ыкчам баскычтар"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="6492621665762797309">"Сөздү түзөтүү"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="4577283176672181497">"Түзөтүү"</string>
-    <string name="user_dict_settings_context_menu_delete_title" msgid="670470172230144069">"Жок кылуу"</string>
+    <string name="user_dict_settings_context_menu_delete_title" msgid="670470172230144069">"Өчүрүү"</string>
     <string name="user_dict_settings_empty_text" msgid="2774939221998982609">"Сөздүгүңүздө бир дагы сөз жок. Сөз кошуу үчүн кошуу (+) баскычын таптап коюңуз."</string>
     <string name="user_dict_settings_all_languages" msgid="8839702015353418176">"Бардык тилдер үчүн"</string>
     <string name="user_dict_settings_more_languages" msgid="8345984308635521364">"Дагы тилдер…"</string>
@@ -2013,7 +2013,7 @@
     <string name="current_input_method" msgid="4831870685505762355">"Учурдагы баскычтоп"</string>
     <string name="input_method_selector" msgid="2053594139601607047">"Киргизүү ыкмасын тандагыч"</string>
     <string name="input_method_selector_show_automatically_title" msgid="6641287899537973903">"Автоматтык"</string>
-    <string name="input_method_selector_always_show_title" msgid="214003059953067317">"Ар дайым көрсөтүлсүн"</string>
+    <string name="input_method_selector_always_show_title" msgid="214003059953067317">"Ар дайым көрүнсүн"</string>
     <string name="input_method_selector_always_hide_title" msgid="1080670736772135726">"Ар дайым жашырылсын"</string>
     <string name="configure_input_method" msgid="6706771182192135840">"Киргизүү ыкмаларын тууралоо"</string>
     <string name="input_method_settings" msgid="7992625764014725166">"Жөндөөлөр"</string>
@@ -2217,7 +2217,7 @@
     <string name="print_print_jobs" msgid="7357841034181762157">"Басып чыгаруу тапшырмалары"</string>
     <string name="print_print_job" msgid="6846889971435170443">"Бастыруу тапшырмасы"</string>
     <string name="print_restart" msgid="4090462480288441779">"Кайра баштоо"</string>
-    <string name="print_cancel" msgid="4567831028966698753">"Жокко чыгаруу"</string>
+    <string name="print_cancel" msgid="4567831028966698753">"Жок"</string>
     <string name="print_job_summary" msgid="438156926959424058">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="print_configuring_state_title_template" msgid="5052801061241050737">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> конфигурацияланууда"</string>
     <string name="print_printing_state_title_template" msgid="8796814912920963803">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> бастырылууда"</string>
@@ -2315,8 +2315,8 @@
     <string name="battery_tip_restrict_app_dialog_ok" msgid="2573410775701913487">"Чектөө"</string>
     <string name="battery_tip_unrestrict_app_dialog_title" msgid="812458516399125710">"Чектөөлөр өчүрүлсүнбү?"</string>
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="8120081438825031335">"Бул колдонмо батареяны фондо керектей берет. Батареяңыз күтүлгөндөн эртерээк отуруп калышы мүмкүн."</string>
-    <string name="battery_tip_unrestrict_app_dialog_ok" msgid="9154938931448151479">"Алып салуу"</string>
-    <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="7331148618292397166">"Жокко чыгаруу"</string>
+    <string name="battery_tip_unrestrict_app_dialog_ok" msgid="9154938931448151479">"Ооба"</string>
+    <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="7331148618292397166">"Жок"</string>
     <string name="battery_tip_dialog_summary_message" product="default" msgid="7244950433272770280">"Колдонмолоруңуз батареяны орточо деңгээлде керектеп жатышат. Эгер өтө көп керектеп жиберишсе, телефонуңуз ал боюнча чара көрүүнү сунуштайт.\n\nАл эми таптакыр калбай баратса, Батареяны үнөмдөгүчтү күйгүзүп койсоңуз болот."</string>
     <string name="battery_tip_dialog_summary_message" product="tablet" msgid="1721081030632329647">"Колдонмолоруңуз батареяны орточо деңгээлде керектеп жатышат. Эгер өтө көп керектеп жиберишсе, планшетиңиз ал боюнча чара көрүүнү сунуштайт.\n\nАл эми таптакыр калбай баратса, Батареяны үнөмдөгүчтү күйгүзүп койсоңуз болот."</string>
     <string name="battery_tip_dialog_summary_message" product="device" msgid="146872407040848465">"Колдонмолоруңуз батареяны орточо деңгээлде керектеп жатышат. Эгер өтө көп керектеп жиберишсе, түзмөгүңүз ал боюнча чара көрүүнү сунуштайт.\n\nАл эми таптакыр калбай баратса, Батареяны үнөмдөгүчтү күйгүзүп койсоңуз болот."</string>
@@ -2491,8 +2491,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>
@@ -2518,7 +2518,7 @@
     <string name="tts_install_voices_title" msgid="363811937643579286">"Үндөрдү орнотуу"</string>
     <string name="tts_install_voices_text" msgid="7464832428439739995">"Үндөрдү орнотуу үчүн <xliff:g id="TTS_APP_NAME">%s</xliff:g> колдонмосуна өтүңүз"</string>
     <string name="tts_install_voices_open" msgid="686776451008134790">"Колдонмону ачуу"</string>
-    <string name="tts_install_voices_cancel" msgid="1622512922523479646">"Жокко чыгаруу"</string>
+    <string name="tts_install_voices_cancel" msgid="1622512922523479646">"Жок"</string>
     <string name="tts_reset" msgid="8864073594540705579">"Баштапкы абалга келтирүү"</string>
     <string name="tts_play" msgid="9023430029380675514">"Угуу"</string>
     <string name="vpn_settings_title" msgid="7008219502396889192">"VPN"</string>
@@ -2626,7 +2626,7 @@
     <string name="header_data_and_synchronization" msgid="400831816068697286">"Дайын-даректер жана шайкештирүү"</string>
     <string name="preference_change_password_title" msgid="7243527448378789274">"Сызсөздү өзгөртүү"</string>
     <string name="header_account_settings" msgid="8586173964125512219">"Аккаунттун жөндөөлөрү"</string>
-    <string name="remove_account_label" msgid="5885425720323823387">"Аккаунтту алып салуу"</string>
+    <string name="remove_account_label" msgid="5885425720323823387">"Аккаунтту өчүрүү"</string>
     <string name="header_add_an_account" msgid="8482614556580804956">"Аккаунт кошуу"</string>
     <string name="really_remove_account_title" msgid="4166512362915154319">"Аккаунтту өчүрөсүзбү?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Бул аккаунтту өчүрсөңүз, планшеттеги бардык билдирүүлөр, байланыштар жана башка маалыматтар жок болот!"</string>
@@ -2643,7 +2643,7 @@
     <string name="cryptkeeper_wrong_pin" msgid="857757190077859245">"PIN код туура эмес"</string>
     <string name="checking_decryption" msgid="5927759912073053101">"Текшерүүдө…"</string>
     <string name="starting_android" msgid="4774187626261253089">"Android жүргүзүлүүдө…"</string>
-    <string name="delete" msgid="2325292565700865366">"Жок кылуу"</string>
+    <string name="delete" msgid="2325292565700865366">"Өчүрүү"</string>
     <string name="misc_files" msgid="1012397035001764693">"Башка файлдар"</string>
     <string name="misc_files_selected_count" msgid="1434146080729502726">"<xliff:g id="TOTAL">%2$d</xliff:g> ичинен <xliff:g id="NUMBER">%1$d</xliff:g> тандалды"</string>
     <string name="misc_files_selected_count_bytes" msgid="3752262902203465861">"<xliff:g id="TOTAL">%2$s</xliff:g> ичинен <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
@@ -2661,7 +2661,7 @@
     <string name="data_usage_menu_restrict_background" msgid="3539289148113800518">"Фондук дайындарга тыюу"</string>
     <string name="data_usage_menu_allow_background" msgid="2874898501715368528">"Фондук дайындарга уруксат берүү"</string>
     <string name="data_usage_menu_split_4g" msgid="2264683155484246409">"4G трафигин ажыратуу"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8444311679299008486">"Wi‑Fi көрсөтүлсүн"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8444311679299008486">"Wi‑Fi көрүнсүн"</string>
     <string name="data_usage_menu_hide_wifi" msgid="1808008314306824090">"Wi‑Fi жашырылсын"</string>
     <string name="data_usage_menu_show_ethernet" msgid="2130574690318410238">"Ethernet колднн көрсөтүү"</string>
     <string name="data_usage_menu_hide_ethernet" msgid="1191233197312414533">"Ethernet колдонулушу жашырылсын"</string>
@@ -2891,17 +2891,17 @@
     <string name="work_profile_confirm_remove_title" msgid="3168910958076735800">"Жумуш профили алынып салынсынбы?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="2889456786320157545">"Сиз бул планшеттеги мейкиндигиңизди жана берилиштериңизди жоготосуз. Сиз муну артка кайтара албайсыз."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="8441729423565705183">"Сиз бул телефондогу мейкиндигиңизди жана берилиштериңизди жоготосуз. Сиз муну артка кайтара албайсыз."</string>
-    <string name="user_confirm_remove_message" msgid="5202150470271756013">"Бардык колдонмолор жана дайындар жоголот."</string>
+    <string name="user_confirm_remove_message" msgid="5202150470271756013">"Бардык колдонмолор жана алардагы нерселер жоголот."</string>
     <string name="work_profile_confirm_remove_message" msgid="1220672284385083128">"Эгер улантсаңыз бул профилдеги колдонмолор менен дайындардын баары өчүрүлөт."</string>
-    <string name="user_profile_confirm_remove_message" msgid="8376289888144561545">"Бардык колдонмолор жана дайындар жоголот."</string>
+    <string name="user_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>
-    <string name="user_delete_button" msgid="6747802570634772774">"Жок кылуу"</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_exit_guest_confirm_message" msgid="6955182181145748919">"Бул сеанстагы бардык колдонмолор жана дайындар өчүрүлөт."</string>
-    <string name="user_exit_guest_dialog_remove" msgid="1878866060881115716">"Алып салуу"</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_remove_user" msgid="3687544420125911166">"Колдонуучуну жок кылуу"</string>
@@ -3028,8 +3028,8 @@
     <string name="sim_selection_channel_title" msgid="5671915549529226023">"SIM картаны тандоо"</string>
     <string name="dashboard_title" msgid="3343056553551876215">"Жөндөөлөр"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="4475734332610696843">
-      <item quantity="other">Жашырылган %d нерсе көрсөтүлсүн</item>
-      <item quantity="one">Жашырылган %d нерсе көрсөтүлсүн</item>
+      <item quantity="other">Жашырылган %d нерсе көрүнсүн</item>
+      <item quantity="one">Жашырылган %d нерсе көрүнсүн</item>
     </plurals>
     <string name="network_dashboard_title" msgid="8288134139584687806">"Тармак жана Интернет"</string>
     <string name="network_dashboard_summary_mobile" msgid="5560545061217580626">"мобилдик"</string>
@@ -3142,8 +3142,8 @@
     <string name="notification_volume_option_title" msgid="1358512611511348260">"Эскертме үнүнүн катуулугу"</string>
     <string name="ringtone_title" msgid="1409086028485922583">"Телефондун шыңгыры"</string>
     <string name="notification_ringtone_title" msgid="2932960620843976285">"Билдирменин демейки үнү"</string>
-    <string name="notification_unknown_sound_title" msgid="8043718667804838398">"Колдонмонун демейки добушу"</string>
-    <string name="notification_sound_default" msgid="2664544380802426260">"Билдирменин демейки добушу"</string>
+    <string name="notification_unknown_sound_title" msgid="8043718667804838398">"Колдонмонун демейки үнү"</string>
+    <string name="notification_sound_default" msgid="2664544380802426260">"Билдирменин демейки үнү"</string>
     <string name="alarm_ringtone_title" msgid="6411326147408635902">"Ойготкучтун демейки үнү"</string>
     <string name="vibrate_when_ringing_title" msgid="2757996559847126952">"Чалуу учурунда дирилдөө"</string>
     <string name="other_sound_settings" msgid="5250376066099818676">"Башка үндөр"</string>
@@ -3179,7 +3179,7 @@
     <string name="zen_mode_behavior_alarms_only" msgid="8406622989983047562">"Ойготкуч жана медиа эскертүүлөрүнөн башка эч добуш чыкпасын"</string>
     <string name="zen_mode_automation_settings_title" msgid="3916960043054489008">"Ырааттамалар"</string>
     <string name="zen_mode_delete_automatic_rules" msgid="2455264581527305755">"Ырааттамаларды өчүрүү"</string>
-    <string name="zen_mode_schedule_delete" msgid="7786092652527516740">"Жок кылуу"</string>
+    <string name="zen_mode_schedule_delete" msgid="7786092652527516740">"Өчүрүү"</string>
     <string name="zen_mode_rule_name_edit" msgid="5479435215341745578">"Түзөтүү"</string>
     <string name="zen_mode_automation_settings_page_title" msgid="3001783354881078983">"Ырааттамалар"</string>
     <string name="zen_mode_automatic_rule_settings_page_title" msgid="5272888746413504692">"Ырааттама"</string>
@@ -3284,8 +3284,8 @@
     <string name="work_use_personal_sounds_title" msgid="531727195073003599">"Жеке профилдин үндөрүн колдонуу"</string>
     <string name="work_use_personal_sounds_summary" msgid="2886871383995187441">"Жумуш жана жеке профилдер үчүн окшош добуштар колдонулат"</string>
     <string name="work_ringtone_title" msgid="5499360583947410224">"Жумуш телефонунун рингтону"</string>
-    <string name="work_notification_ringtone_title" msgid="8059159087214025757">"Жумуш жөнүндө эскертменин демейки добушу"</string>
-    <string name="work_alarm_ringtone_title" msgid="5328487181385375130">"Жумуш сигналынын демейки добушу"</string>
+    <string name="work_notification_ringtone_title" msgid="8059159087214025757">"Жумуш жөнүндө эскертменин демейки үнү"</string>
+    <string name="work_alarm_ringtone_title" msgid="5328487181385375130">"Жумуш сигналынын демейки үнү"</string>
     <string name="work_sound_same_as_personal" msgid="7728560881697159758">"Жеке профилдеги үндөргө окшош"</string>
     <string name="work_sync_dialog_title" msgid="4799120971202956837">"Добуштар алмаштырылсынбы?"</string>
     <string name="work_sync_dialog_yes" msgid="2110726233746476066">"Алмаштыруу"</string>
@@ -3328,7 +3328,7 @@
     <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_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>
@@ -3338,7 +3338,7 @@
     <string name="notification_importance_unspecified" msgid="2515778981253707724">"Добуш чыгарууга уруксат берүү"</string>
     <string name="notification_importance_blocked" msgid="446807935484629222">"Билдирмелер эч качан көрүнбөсүн"</string>
     <string name="notification_importance_min" msgid="4622854784474818944">"Үнсүз жана кичирейтип көрсөтүү"</string>
-    <string name="notification_importance_low" msgid="7609797151662295364">"Үнсүз көрсөтүлсүн"</string>
+    <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>
@@ -3433,7 +3433,7 @@
     <string name="notification_show_lights_title" msgid="5381920725933228542">"Жарык индикатору"</string>
     <string name="notification_vibrate_title" msgid="8221718258793835282">"Дирилдесин"</string>
     <string name="notification_channel_sound_title" msgid="7635366839003304745">"Добуш"</string>
-    <string name="zen_mode_rule_delete_button" msgid="6763486487220471193">"Жок кылуу"</string>
+    <string name="zen_mode_rule_delete_button" msgid="6763486487220471193">"Өчүрүү"</string>
     <string name="zen_mode_rule_rename_button" msgid="1428130397306726792">"Аталышын өзгөртүү"</string>
     <string name="zen_mode_rule_name" msgid="8583652780885724670">"Ырааттаманын аталышы"</string>
     <string name="zen_mode_rule_name_hint" msgid="6569877315858105901">"Аталышын киргизиңиз"</string>
@@ -3444,7 +3444,7 @@
     <string name="zen_mode_delete_rule" msgid="2292933835997203801">"Ырааттаманы жок кылуу"</string>
     <string name="zen_mode_choose_rule_type" msgid="8877138307319450306">"Ырааттаманын түрүн тандоо"</string>
     <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_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>
@@ -3544,7 +3544,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>
@@ -3666,7 +3666,7 @@
     <string name="assist_and_voice_input_title" msgid="324148194703846130">"Жардамчы жана үн буйруктары"</string>
     <string name="default_assist_title" msgid="2060846994203235317">"Көмөкчү колдонмо"</string>
     <string name="assistant_security_warning_title" msgid="8014460924169723059">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> сиздин көмөкчү колдонмоңуз болсунбу?"</string>
-    <string name="assistant_security_warning" msgid="1304057692847069938">"Жардамчы тутумуңузда иштеп жаткан программалар, ошондой эле экраныңызда көрүнүп турган же колдонмодогу маалыматты окуй алат."</string>
+    <string name="assistant_security_warning" msgid="1304057692847069938">"Жардамчы системаңызда иштеп жаткан программалар, ошондой эле экраныңызда көрүнүп турган же колдонмодогу маалыматты окуй алат."</string>
     <string name="assistant_security_warning_agree" msgid="5105692801460137289">"Макул"</string>
     <string name="assistant_security_warning_disagree" msgid="4217490999193100459">"Жок"</string>
     <string name="choose_voice_input_title" msgid="5369311838580756359">"Үн менен киргизүүнү тандаңыз"</string>
@@ -3726,7 +3726,7 @@
     <string name="sharing_remote_bugreport_dialog_message" msgid="3814787466701526359">"Мүчүлүштүк тууралуу бул баяндама IT администраторуңуз менен бөлүшүлүүдө. Көбүрөөк маалымат үчүн администраторуңузга кайрылыңыз."</string>
     <string name="share_remote_bugreport_action" msgid="8600797271670537888">"Бөлүшүү"</string>
     <string name="decline_remote_bugreport_action" msgid="706319275774199033">"Четке кагуу"</string>
-    <string name="usb_use_charging_only" msgid="2344625733377110164">"Дайындар өткөрүлбөйт"</string>
+    <string name="usb_use_charging_only" msgid="2344625733377110164">"Дайын-даректер өткөрүлбөйт"</string>
     <string name="usb_use_charging_only_desc" msgid="3283518562582478950">"Жөн гана бул түзмөктү кубаттоо"</string>
     <string name="usb_use_power_only" msgid="6595783381323810697">"Туташкан түзмөктү кубаттоо"</string>
     <string name="usb_use_file_transfers" msgid="6153021302176151884">"Файл өткөрүү"</string>
@@ -3813,16 +3813,16 @@
     <string name="app_permission_summary_allowed" msgid="6458476982015518778">"Уруксат берилген"</string>
     <string name="app_permission_summary_not_allowed" msgid="1171642541675462584">"Тыюу салынган"</string>
     <string name="keywords_install_other_apps" msgid="5383559540695847668">"белгисиз булактардан келген колдонмолорду орнотуу"</string>
-    <string name="write_settings" msgid="9009040811145552108">"Тутум жөндөөлөрүн өзгөртүү"</string>
-    <string name="keywords_write_settings" msgid="3450405263390246293">"тутум жөндөөлөрүн жазып өзгөртүү"</string>
-    <string name="write_settings_summary" msgid="4650251358459404247">"<xliff:g id="COUNT_1">%2$d</xliff:g> ичинен <xliff:g id="COUNT_0">%1$d</xliff:g> колдонмонун тутум жөндөөлөрүн өзгөртүүгө уруксаты бар"</string>
+    <string name="write_settings" msgid="9009040811145552108">"Системанын жөндөөлөрүн өзгөртүү"</string>
+    <string name="keywords_write_settings" msgid="3450405263390246293">"системанын жөндөөлөрүн жазып өзгөртүү"</string>
+    <string name="write_settings_summary" msgid="4650251358459404247">"<xliff:g id="COUNT_1">%2$d</xliff:g> ичинен <xliff:g id="COUNT_0">%1$d</xliff:g> колдонмонун системанын жөндөөлөрүн өзгөртүүгө уруксаты бар"</string>
     <string name="financial_apps_sms_access_title" msgid="3422655018008259655">"Каржы колдонмолоруна SMS аркылуу мүмкүнчүлүк берүү"</string>
     <string name="filter_install_sources_apps" msgid="4519839764020866701">"Башка колдонмолорду орното алат"</string>
-    <string name="filter_write_settings_apps" msgid="6864144615530081121">"Тутум жөндөөлөрүн өзгөртө алат"</string>
-    <string name="write_settings_title" msgid="5852614614193830632">"Тутум жөндөөлөрүн өзгөртө алат"</string>
-    <string name="write_system_settings" msgid="20450765210832463">"Тутум жөндөөлөрүн өзгөртүү"</string>
-    <string name="permit_write_settings" msgid="4198491281216818756">"Тутум жөндөөлөрүн өзгөртүүгө уруксат берүү"</string>
-    <string name="write_settings_description" msgid="2536706293042882500">"Колдонмо тутум жөндөөлөрүн өзгөртө алат."</string>
+    <string name="filter_write_settings_apps" msgid="6864144615530081121">"Системанын жөндөөлөрүн өзгөртө алат"</string>
+    <string name="write_settings_title" msgid="5852614614193830632">"Системанын жөндөөлөрүн өзгөртө алат"</string>
+    <string name="write_system_settings" msgid="20450765210832463">"Системанын жөндөөлөрүн өзгөртүү"</string>
+    <string name="permit_write_settings" msgid="4198491281216818756">"Системанын жөндөөлөрүн өзгөртүүгө уруксат берүү"</string>
+    <string name="write_settings_description" msgid="2536706293042882500">"Колдонмо системанын жөндөөлөрүн өзгөртө алат."</string>
     <string name="write_settings_on" msgid="7328986337962635118">"Ооба"</string>
     <string name="write_settings_off" msgid="5708257434958406202">"Жок"</string>
     <string name="external_source_switch_title" msgid="5947220058496373178">"Бул булактан алынган колдонмолорго ишеним көрсөтүү"</string>
@@ -4119,7 +4119,7 @@
     <string name="double_twist_for_camera_suggestion_title" msgid="5932411386316771246">"Селфилерди тез тартуу"</string>
     <string name="swipe_up_to_switch_apps_summary" msgid="4644068184114154787">"Башка колдонмого которулуу үчүн, Башкы бет баскычын басып, өйдө сүрүңүз. Бардык колдонмолорду көрүү үчүн, дагы бир жолу өйдө сүрүп коюңуз. Бул жаңсоо бардык экрандарда иштейт. Мындан ары экраныңыздын төмөнкү оң жагында Сереп салуу баскычы болбойт."</string>
     <string name="swipe_up_to_switch_apps_suggestion_title" msgid="7641846365137536128">"Жаңы Башкы бет баскычын колдонуп көрүңүз"</string>
-    <string name="swipe_up_to_switch_apps_suggestion_summary" msgid="7338653224520387852">"Башка колдонмого которулуу үчүн,, жаңы жаңсоону күйгүзүңүз"</string>
+    <string name="swipe_up_to_switch_apps_suggestion_summary" msgid="7338653224520387852">"Башка колдонмого которулуу үчүн жаңы жаңсоону күйгүзүңүз"</string>
     <string name="ambient_display_title" product="default" msgid="6785677099744344088">"Убакытты жана билдирмелерди текшерүү үчүн эки жолу басуу"</string>
     <string name="ambient_display_title" product="tablet" msgid="1106285490888683613">"Планшетти текшерүү үчүн эки жолу таптаңыз"</string>
     <string name="ambient_display_title" product="device" msgid="5064644474876041478">"Түзмөктү текшерүү үчүн эки жолу таптаңыз"</string>
@@ -4157,7 +4157,7 @@
     <string name="automatic_storage_manager_activation_warning" msgid="2630083316417707308">"Учурда сактагычыңыз сактагычты көзөмөлдөгүч тарабынан башкарылууда"</string>
     <string name="account_for_section_header" msgid="5975241715840642563">"<xliff:g id="USER_NAME">%1$s</xliff:g> таандык аккаунттар"</string>
     <string name="configure_section_header" msgid="6988981883075615136">"Конфигурациялоо"</string>
-    <string name="auto_sync_account_title" msgid="2394463123733529506">"Дайын-даректердин автоматтык түрдө шайкештирилиши"</string>
+    <string name="auto_sync_account_title" msgid="2394463123733529506">"Дайын-даректерди шайкештирүү"</string>
     <string name="auto_sync_personal_account_title" msgid="6844465157916100655">"Жеке дайындарды автоматтык түрдө шайкештирүү"</string>
     <string name="auto_sync_work_account_title" msgid="2403222633447522376">"Жумушка байланыштуу дайындарды автоматтык түрдө шайкештирүү"</string>
     <string name="auto_sync_account_summary" msgid="6316230976974033772">"Колдонмолордун маалыматы автоматтык түрдө жаңырып турат"</string>
@@ -4168,7 +4168,7 @@
     <string name="enterprise_privacy_settings" msgid="2777101678653072889">"Башкарылган түзмөк жөнүндө маалымат"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5557859169062703683">"Өзгөртүүлөр жана жөндөөлөр уюмуңуз тарабынан башкарылат"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4884479123751308407">"Өзгөртүүлөр жана жөндөөлөр <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> тарабынан башкарылат"</string>
-    <string name="enterprise_privacy_header" msgid="2680588186952421841">"Жумуш дайындарына кирүүгө уруксат берүү үчүн, уюмуңуз жөндөөлөрдү өзгөртүп, түзмөгүңүзгө программа орнотушу мүмкүн. \n\nКененирээк маалымат алуу үчүн уюмуңуздун администратору менен байланышыңыз."</string>
+    <string name="enterprise_privacy_header" msgid="2680588186952421841">"Жумуш дайындарына кирүүгө уруксат берүү үчүн, уюмуңуз жөндөөлөрдү өзгөртүп, түзмөгүңүзгө программа орнотушу мүмкүн. \n\nКененирээк маалымат алуу үчүн, уюмуңуздун администратору менен байланышыңыз."</string>
     <string name="enterprise_privacy_exposure_category" msgid="4474576266043636753">"Уюмуңуз көрө алган маалыматтын түрлөрү"</string>
     <string name="enterprise_privacy_exposure_changes_category" msgid="1877045221796512001">"Уюмуңуздун администратору киргизген өзгөртүүлөр"</string>
     <string name="enterprise_privacy_device_access_category" msgid="2967602674816237833">"Бул түзмөккө кирүү мүмкүнчүлүгүңүз"</string>
@@ -4208,8 +4208,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>
@@ -4263,7 +4263,7 @@
     <string name="device_theme" msgid="8992291311481135893">"Түзмөктүн темасы"</string>
     <string name="default_theme" msgid="5986996377385956138">"Демейки"</string>
     <string name="show_operator_name_title" msgid="5056163028128447308">"Тармактын аталышы"</string>
-    <string name="show_operator_name_summary" msgid="6352180285743777497">"Тармактын аталышы абал тилкесинде көрсөтүлсүн"</string>
+    <string name="show_operator_name_summary" msgid="6352180285743777497">"Тармактын аталышы абал тилкесинде көрүнсүн"</string>
     <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>
@@ -4413,8 +4413,8 @@
     <string name="mobile_network_sim_name_rename" msgid="4810736493612513152">"Аталышын өзгөртүү"</string>
     <string name="mobile_network_use_sim_on" msgid="1944823242539751387">"SIM картаны колдонуу"</string>
     <string name="mobile_network_use_sim_off" msgid="2077820358051946635">"Өчүк"</string>
-    <string name="mobile_network_esim_swap_confirm_title" msgid="6077154427380613615">"<xliff:g id="CARRIER">%1$s</xliff:g> операторуна которулсунбу?"</string>
-    <string name="mobile_network_esim_swap_confirm_body" msgid="1192274915146275063">"Бир учурда бир гана жүктөлүп алынган SIM карта активдүү болушу керек.\n\n<xliff:g id="CARRIER1">%1$s</xliff:g> операторуна которулсаңыз, <xliff:g id="CARRIER2">%2$s</xliff:g> кызматыңыз жокко чыгарылбайт."</string>
+    <string name="mobile_network_esim_swap_confirm_title" msgid="6077154427380613615">"<xliff:g id="CARRIER">%1$s</xliff:g> операторуна которуласызбы?"</string>
+    <string name="mobile_network_esim_swap_confirm_body" msgid="1192274915146275063">"Жүктөлүп алынган бир гана SIM карта колдонулушу керек.\n\n<xliff:g id="CARRIER1">%1$s</xliff:g> операторуна которулсаңыз, <xliff:g id="CARRIER2">%2$s</xliff:g> байланыш операторундагы тарифтик планыңыз өзгөрбөйт."</string>
     <string name="mobile_network_esim_swap_confirm_ok" msgid="4253442720111626242">"<xliff:g id="CARRIER">%1$s</xliff:g> операторуна которулуу"</string>
     <string name="mobile_network_erase_sim" msgid="7813251003613841044">"SIM картаны тазалоо"</string>
     <string name="mobile_network_erase_sim_dialog_title" msgid="3796268164204467499">"Бул жүктөлүп алынган SIM карта тазалансынбы?"</string>
@@ -4430,9 +4430,9 @@
     <string name="carrier_settings_version" msgid="2657511289029828425">"Жөндөөлөрдүн версиясы"</string>
     <string name="call_category" msgid="3418535202893644015">"Чалуулар"</string>
     <string name="video_calling_settings_title" msgid="8011841542502156112">"Видео чалуулар"</string>
-    <string name="cdma_system_select_title" msgid="5620679296177526467">"Тутум тандоо"</string>
+    <string name="cdma_system_select_title" msgid="5620679296177526467">"Системаны тандоо"</string>
     <string name="cdma_system_select_summary" msgid="6749131988334321244">"CDMA роуминг режимин алмаштыруу"</string>
-    <string name="cdma_system_select_dialogtitle" msgid="7489000866289285390">"Тутум тандоо"</string>
+    <string name="cdma_system_select_dialogtitle" msgid="7489000866289285390">"Системаны тандоо"</string>
     <string name="network_operator_category" msgid="9136988058829550510">"Тармак"</string>
     <string name="network_select_title" msgid="9176906726897071251">"Тармак"</string>
     <string name="cdma_subscription_title" msgid="4786411071861884105">"CDMA жазылуу"</string>
@@ -4463,7 +4463,7 @@
     <string name="bluetooth_right_name" msgid="8356091262762973801">"Оң"</string>
     <string name="bluetooth_middle_name" msgid="1489185200445352103">"Кутуча"</string>
     <string name="settings_panel_title" msgid="8181989386118232534">"Жөндөөлөр панели"</string>
-    <string name="internet_connectivity_panel_title" msgid="341712994620215750">"Интернет байланышы"</string>
+    <string name="internet_connectivity_panel_title" msgid="341712994620215750">"Интернет"</string>
     <string name="volume_connectivity_panel_title" msgid="4998755371496690971">"Үндүн катуулугу"</string>
     <string name="mobile_data_ap_mode_disabled" msgid="2452716524753472885">"Учак режиминде жеткиликсиз"</string>
     <string name="force_desktop_mode" msgid="6973100177551040740">"Иш такта режимин күйгүзүү"</string>
@@ -4517,7 +4517,7 @@
     <string name="capturing_system_heap_dump_message" msgid="5108339625760845950">"Тутумдун үймө дампы тартылып алынууда"</string>
     <string name="error_capturing_system_heap_dump_message" msgid="5431592130805893098">"Тутумдун үймө дампы сакталган жок"</string>
     <string name="automatic_system_heap_dump_title" msgid="2153897396923488317">"Тутумдардын үймө дамптарын автоматтык түрдө тартып алуу"</string>
-    <string name="automatic_system_heap_dump_summary" msgid="4962129546638974661">"Android тутуму өтө көп эстутумун колдоногондо, автоматтык түрдө анын үймө дампын тартып алуу"</string>
+    <string name="automatic_system_heap_dump_summary" msgid="4962129546638974661">"Android системасы өтө көп эстутумун колдоногондо, автоматтык түрдө анын үймө дампын тартып алуу"</string>
     <string name="wifi_disconnect_button_text" msgid="787688024070426706">"Ажыратуу"</string>
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="26884532087670844">"Шашылыш чалуулар"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="8726152486964822599">"Операторуңузда кырсыктаганда Wi‑Fi аркылуу чалуу мүмкүнчүлүгү каралган эмес.\nКырсыктаганда жардамга келчү кызматтарга чалганыңызда, түзмөгүңүз автоматтык түрдө мобилдик тармакка которулат.\nМындай кырдаалдарда мобилдик тармак кармаган аймактарда гана чала аласыз."</string>
diff --git a/tests/CarDeveloperOptions/res/values-lt/strings.xml b/tests/CarDeveloperOptions/res/values-lt/strings.xml
index 1c9d019..bf471f6 100644
--- a/tests/CarDeveloperOptions/res/values-lt/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-lt/strings.xml
@@ -1105,7 +1105,7 @@
     <string name="wifi_hotspot_ap_band_title" msgid="3485744480410441949">"Prieigos taško juosta"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="3876006922622827363">"Naudodami viešosios interneto prieigos tašką, galite sukurti „Wi‑Fi“ tinklą kitiems įrenginiams. Internetas teikiamas per viešosios interneto prieigos tašką naudojant mobiliųjų duomenų ryšį. Gali būti taikomi papildomi mobiliojo ryšio duomenų mokesčiai."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="3339582350894639261">"Programos gali sukurti viešosios interneto prieigos tašką ir bendrinti turinį su netoliese esančiais įrenginiais."</string>
-    <string name="wifi_hotspot_auto_off_title" msgid="7416022590415189590">"Išjungti viešosios interneto prieigos tašką automatiškai"</string>
+    <string name="wifi_hotspot_auto_off_title" msgid="7416022590415189590">"Automatiškai išjungti viešosios interneto prieigos tašką"</string>
     <string name="wifi_hotspot_auto_off_summary" msgid="3866769400624802105">"„Wi‑Fi“ viešosios interneto prieigos taškas bus išjungtas, jei nebus prijungta jokių įrenginių"</string>
     <string name="wifi_tether_starting" msgid="7676952148471297900">"Įjungiamas viešosios interneto prieigos taškas…"</string>
     <string name="wifi_tether_stopping" msgid="7478561853791953349">"Išjungiamas viešosios interneto prieigos taškas…"</string>
@@ -1606,7 +1606,7 @@
     <string name="restore_default_apn" msgid="7195266404077471007">"Atkuriami numatytieji APN nustatymai."</string>
     <string name="menu_restore" msgid="3799288817317293115">"Nustatyti iš naujo į numatytuosius nust."</string>
     <string name="restore_default_apn_completed" msgid="5671734152740058937">"Numatytųjų APN nustatymų nustatymas iš naujo baigtas."</string>
-    <string name="reset_dashboard_title" msgid="7084966342252178530">"Nustat. parinkt. iš naujo"</string>
+    <string name="reset_dashboard_title" msgid="7084966342252178530">"Nust. parinkt. iš naujo"</string>
     <string name="reset_dashboard_summary" msgid="8778383341461126642">"Tinklą, programas arba įrenginį galima nustatyti iš naujo"</string>
     <string name="reset_network_title" msgid="8944059136930806211">"Iš naujo nustatyti „Wi-Fi“, mobiliųjų duomenų ir „Bluetooth“ nustatymus"</string>
     <string name="reset_network_desc" msgid="4982633363916261109">"Bus iš naujo nustatyti visi tinklo nustatymai, įskaitant:\n\n"<li>"„Wi‑Fi“;"</li>\n<li>"mobiliojo ryšio duomenis;"</li>\n<li>"„Bluetooth“."</li></string>
diff --git a/tests/CarDeveloperOptions/res/values-lv/strings.xml b/tests/CarDeveloperOptions/res/values-lv/strings.xml
index 58022bf..944fd01 100644
--- a/tests/CarDeveloperOptions/res/values-lv/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-lv/strings.xml
@@ -1591,7 +1591,7 @@
     <string name="reset_dashboard_summary" msgid="8778383341461126642">"Var atiestatīt tīklu, lietotnes vai ierīci"</string>
     <string name="reset_network_title" msgid="8944059136930806211">"Atiestatīt Wi-Fi, mobilo datu un Bluetooth iestatījumus"</string>
     <string name="reset_network_desc" msgid="4982633363916261109">"Tādējādi tiks atiestatīti visi tīkla iestatījumi, tostarp:\n\n"<li>"Wi‑Fi;"</li>\n<li>"mobilie dati;"</li>\n<li>"Bluetooth."</li></string>
-    <string name="reset_esim_title" msgid="7630781767040831893">"Dzēst lejupielādētās SIM k."</string>
+    <string name="reset_esim_title" msgid="7630781767040831893">"Dzēst lejupielādētās SIM kartes"</string>
     <string name="reset_esim_desc" msgid="433226911566802">"Lai lejupielādētu nomaiņas SIM kartes, sazinieties ar mobilo sakaru operatoru. Ar šo darbību netiks anulēti mobilo sakaru pakalpojumu plāni."</string>
     <string name="reset_network_button_text" msgid="4293271046867912819">"Atiestatīt iestatījumus"</string>
     <string name="reset_network_final_desc" msgid="2463817067048751373">"Vai vēlaties atiestatīt visus tīkla iestatījumus? Šo darbību nevar atsaukt."</string>
@@ -2351,9 +2351,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="8120081438825031335">"Šī lietotne varēs izmantot akumulatora enerģiju fonā. Tādējādi akumulators var izlādēties ātrāk nekā parasti."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="9154938931448151479">"Noņemt"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="7331148618292397166">"Atcelt"</string>
-    <string name="battery_tip_dialog_summary_message" product="default" msgid="7244950433272770280">"Jūsu lietotnes patērē normālu akumulatora enerģijas apjomu. Ja lietotnes patērē pārāk daudz akumulatora enerģijas, jūsu tālrunī tiks parādītas ieteicamās darbības.\n\nJa akumulatora uzlādes līmenis ir zems, varat jebkurā laikā ieslēgt akumulatora jaudas taupīšanas režīmu."</string>
-    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="1721081030632329647">"Jūsu lietotnes patērē normālu akumulatora enerģijas apjomu. Ja lietotnes patērē pārāk daudz akumulatora enerģijas, jūsu planšetdatorā tiks parādītas ieteicamās darbības.\n\nJa akumulatora uzlādes līmenis ir zems, varat jebkurā laikā ieslēgt akumulatora jaudas taupīšanas režīmu."</string>
-    <string name="battery_tip_dialog_summary_message" product="device" msgid="146872407040848465">"Jūsu lietotnes patērē normālu akumulatora enerģijas apjomu. Ja lietotnes patērē pārāk daudz akumulatora enerģijas, jūsu ierīcē tiks parādītas ieteicamās darbības.\n\nJa akumulatora uzlādes līmenis ir zems, varat jebkurā laikā ieslēgt akumulatora jaudas taupīšanas režīmu."</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="7244950433272770280">"Jūsu lietotnes patērē normālu akumulatora enerģijas apjomu. Ja lietotnes patērē pārāk daudz akumulatora enerģijas, jūsu tālrunī tiks parādītas ieteicamās darbības.\n\nJa akumulatora uzlādes līmenis ir zems, varat jebkurā laikā ieslēgt akumulatora enerģijas taupīšanas režīmu."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="1721081030632329647">"Jūsu lietotnes patērē normālu akumulatora enerģijas apjomu. Ja lietotnes patērē pārāk daudz akumulatora enerģijas, jūsu planšetdatorā tiks parādītas ieteicamās darbības.\n\nJa akumulatora uzlādes līmenis ir zems, varat jebkurā laikā ieslēgt akumulatora enerģijas taupīšanas režīmu."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="146872407040848465">"Jūsu lietotnes patērē normālu akumulatora enerģijas apjomu. Ja lietotnes patērē pārāk daudz akumulatora enerģijas, jūsu ierīcē tiks parādītas ieteicamās darbības.\n\nJa akumulatora uzlādes līmenis ir zems, varat jebkurā laikā ieslēgt akumulatora enerģijas taupīšanas režīmu."</string>
     <string name="smart_battery_manager_title" msgid="5744035036663849515">"Akumulatora pārvaldnieks"</string>
     <string name="smart_battery_title" msgid="4919670408532804351">"Automātiska akumulatora enerģijas patēriņa pārvaldība"</string>
     <string name="smart_battery_summary" msgid="640027046471198174">"Ierobežojiet akumulatora enerģijas patēriņu tām lietotnēm, kuras neizmantojat bieži"</string>
@@ -2450,7 +2450,7 @@
     <string name="battery_sugg_bluetooth_headset" msgid="2421931037149315202">"Mēģiniet izveidot savienojumu ar citu Bluetooth ierīci"</string>
     <string name="battery_desc_apps" msgid="6826726880149226823">"Lietotnes darbībai izmantotā akumulatora enerģija"</string>
     <string name="battery_sugg_apps_info" msgid="9175761965559743977">"Apturiet lietotnes darbību vai atinstalējiet lietotni"</string>
-    <string name="battery_sugg_apps_gps" msgid="489694612870772770">"Atlasiet akumulatora jaudas taupīšanas režīmu"</string>
+    <string name="battery_sugg_apps_gps" msgid="489694612870772770">"Atlasiet akumulatora enerģijas taupīšanas režīmu"</string>
     <string name="battery_sugg_apps_settings" msgid="20465932930350295">"Lietotnē var būt pieejami iestatījumi akumulatora enerģijas patēriņa samazināšanai"</string>
     <string name="battery_desc_users" msgid="3736510265433457165">"Lietotāja patērētā akumulatora jauda"</string>
     <string name="battery_desc_unaccounted" msgid="1713437127406964501">"Dažādu avotu enerģijas patēriņš"</string>
@@ -2482,22 +2482,22 @@
     <string name="process_kernel_label" msgid="4175060316414593760">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="8591722404282619153">"Mediaserver"</string>
     <string name="process_dex2oat_label" msgid="8249082119748556085">"Lietotnes optimizācija"</string>
-    <string name="battery_saver" msgid="3989710213758938398">"Akumulatora jaudas taupīšanas režīms"</string>
+    <string name="battery_saver" msgid="3989710213758938398">"Akumulatora enerģijas taupīšanas režīms"</string>
     <string name="battery_saver_auto_title" msgid="4158659069641849952">"Automātiska ieslēgšana"</string>
     <string name="battery_saver_auto_no_schedule" msgid="739814529432092706">"Nav grafika"</string>
     <string name="battery_saver_auto_routine" msgid="886514412067906980">"Atbilstoši jūsu ikdienas grafikam"</string>
     <string name="battery_saver_auto_percentage" msgid="5791982309331921556">"Atbilstoši uzlādes līmenim"</string>
-    <string name="battery_saver_auto_routine_summary" msgid="9182044424547482889">"Akumulatora jaudas taupīšanas režīms ieslēgsies, ja akumulators var izlādēties vēl pirms ierastā uzlādes laika."</string>
+    <string name="battery_saver_auto_routine_summary" msgid="9182044424547482889">"Akumulatora enerģijas taupīšanas režīms ieslēgsies, ja akumulators var izlādēties vēl pirms ierastā uzlādes laika."</string>
     <string name="battery_saver_auto_percentage_summary" msgid="2036128588460338677">"Ieslēgsies uzlādes līmenim sasniedzot <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_saver_schedule_settings_title" msgid="574233428557678128">"Iestatīt grafiku"</string>
     <string name="battery_saver_sticky_title_new" msgid="5328707297110866082">"Izslēgt, kad akumulators ir pilnībā uzlādēts"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="3406582427270935879">"Akumulatora jaudas taupīšanas režīms tiek izslēgts, kad tālruņa uzlādes līmenis ir <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="3284967694001857194">"Akumulatora jaudas taupīšanas režīms tiek izslēgts, kad planšetdatora uzlādes līmenis ir <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="5056520668081504111">"Akumulatora jaudas taupīšanas režīms tiek izslēgts, kad ierīces uzlādes līmenis ir <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="3406582427270935879">"Akumulatora enerģijas taupīšanas režīms tiek izslēgts, kad tālruņa uzlādes līmenis ir <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="3284967694001857194">"Akumulatora enerģijas taupīšanas režīms tiek izslēgts, kad planšetdatora uzlādes līmenis ir <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="5056520668081504111">"Akumulatora enerģijas taupīšanas režīms tiek izslēgts, kad ierīces uzlādes līmenis ir <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (7607123201469333645) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="2321082163892561703">"Ieslēgt"</string>
-    <string name="battery_saver_master_switch_title" msgid="8241862826825517212">"Izmantot akumulatora jaudas taupīšanas režīmu"</string>
+    <string name="battery_saver_master_switch_title" msgid="8241862826825517212">"Izmantot akumulatora enerģijas taupīšanas režīmu"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="7316920304024245838">"Ieslēgt automātiski"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="2623381258359775227">"Nekad"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="434270432432390307">"ar akumulatora uzlādes līmeni <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -3168,7 +3168,7 @@
     <string name="keywords_touch_vibration" msgid="2081175517528255224">"haptisks, vibrēt, ekrāns, jutīgums"</string>
     <string name="keywords_ring_vibration" msgid="4210509151866460210">"skārienjutīgs, vibrācija, tālrunis, zvans, jutīgums, zvanīšana"</string>
     <string name="keywords_notification_vibration" msgid="1077515502086745166">"skārienjutīgs, vibrācija, jutīgums"</string>
-    <string name="keywords_battery_saver_sticky" msgid="8733804259716284872">"akumulatora jaudas taupīšanas režīms, fiksēts, saglabāties, jaudas taupīšanas režīms, akumulators"</string>
+    <string name="keywords_battery_saver_sticky" msgid="8733804259716284872">"akumulatora enerģijas taupīšanas režīms, fiksēts, saglabāties, enerģijas taupīšanas režīms, akumulators"</string>
     <string name="default_sound" msgid="6675629744816442953">"Noklusējuma skaņa"</string>
     <string name="sound_settings_summary" msgid="8467549670633195109">"Zvana skaļums: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="5187301919242823508">"Skaļums, vibrācija, režīms “Netraucēt”"</string>
@@ -3954,7 +3954,7 @@
     <string name="condition_zen_title" msgid="2128184708916052585">"Režīms “Netraucēt” ir ieslēgts"</string>
     <string name="condition_zen_summary_phone_muted" msgid="4396050395522974654">"Tālruņa skaņa izslēgta"</string>
     <string name="condition_zen_summary_with_exceptions" msgid="3435216391993785818">"Ar izņēmumiem"</string>
-    <string name="condition_battery_title" msgid="6704870010912986274">"Akumulatora jaudas taupīšana"</string>
+    <string name="condition_battery_title" msgid="6704870010912986274">"Akumulatora enerģijas taupīšana"</string>
     <string name="condition_battery_summary" msgid="1236078243905690620">"Funkcijas ir ierobežotas"</string>
     <string name="condition_cellular_title" msgid="6605277435894307935">"Mobilie dati ir izslēgti"</string>
     <string name="condition_cellular_summary" msgid="3607459310548343777">"Internets ir pieejams, izmantojot tikai Wi-Fi savienojumu"</string>
@@ -4367,12 +4367,12 @@
     <string name="angle_enabled_app_set" msgid="7313088703610569320">"Lietojumprogramma, kam ANGLE ir iespējots: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <string name="game_driver_dashboard_title" msgid="219443350404091201">"Game Driver preferences"</string>
     <string name="game_driver_dashboard_summary" msgid="1500674075618790528">"Mainīt Game Driver iestatījumus"</string>
-    <string name="game_driver_footer_text" msgid="1540158284161797913">"Kad lietotne Game Driver ir ieslēgta, varat izvēlēties izmantot atjaunināto grafikas dzini ierīcē instalētajām lietotnēm."</string>
+    <string name="game_driver_footer_text" msgid="1540158284161797913">"Kad lietotne Game Driver ir ieslēgta, varat izvēlēties izmantot atjaunināto grafikas draiveri ierīcē instalētajām lietotnēm."</string>
     <string name="game_driver_all_apps_preference_title" msgid="2453795714218707495">"Iespējot visām lietotnēm"</string>
-    <string name="game_driver_app_preference_title" msgid="7732401084883356004">"Grafikas dziņa atlase"</string>
+    <string name="game_driver_app_preference_title" msgid="7732401084883356004">"Grafikas draivera atlase"</string>
     <string name="game_driver_app_preference_default" msgid="7141877602592473729">"Noklusējums"</string>
     <string name="game_driver_app_preference_game_driver" msgid="879325851829463741">"Game Driver"</string>
-    <string name="game_driver_app_preference_system" msgid="2289297988130187480">"Sistēmas grafikas dzinis"</string>
+    <string name="game_driver_app_preference_system" msgid="2289297988130187480">"Sistēmas grafikas draiveris"</string>
     <!-- no translation found for game_driver_app_preference_values:0 (7987059854719029308) -->
     <!-- no translation found for game_driver_app_preference_values:1 (8222525327130471766) -->
     <!-- no translation found for game_driver_app_preference_values:2 (2739878257804927321) -->
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-b+sr+Latn/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-b+sr+Latn/strings.xml
index d7af2e2..78d9787 100644
--- a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-b+sr+Latn/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-b+sr+Latn/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Ne možete da upućujete hitne pozive pomoću pozivanja preko Wi-Fi-ja. Ako probate da uputite hitan poziv, uređaj će automatski koristiti mobilnu mrežu. Hitni pozivi mogu da se upućuju samo u oblastima pokrivenim mobilnom mrežom."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Ne možete da upućujete hitne pozive pomoću pozivanja preko WiFi-a. Ako probate da uputite hitan poziv, uređaj će automatski koristiti mobilnu mrežu. Hitni pozivi mogu da se upućuju samo u oblastima pokrivenim mobilnom mrežom."</string>
 </resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-eu/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-eu/strings.xml
index 22232c1..fefb4fe 100644
--- a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-eu/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-eu/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Ezin duzu egin larrialdi-deirik Wi-Fi bidez. Larrialdi-dei bat egiten saiatzen bazara, gailua sare mugikorrera aldatuko da automatikoki. Sare mugikorren estaldura-eremuetan bakarrik egin daitezke larrialdi-deiak."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Ezin duzu egin larrialdi-deirik wifi bidez. Larrialdi-dei bat egiten saiatzen bazara, gailua sare mugikorrera aldatuko da automatikoki. Sare mugikorren estaldura-eremuetan bakarrik egin daitezke larrialdi-deiak."</string>
 </resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-gu/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-gu/strings.xml
index 54222b5..8410425 100644
--- a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-gu/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-gu/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"તમે વાઇ-ફાઇ કૉલિંગ મારફતે કટોકટીનો કૉલ કરી શકતા નથી. જો તમે કોઈ કટોકટીનો કૉલ કરવાનો પ્રયાસ કરો છો, તો તમારું ઉપકરણ આપમેળે મોબાઇલ નેટવર્કનો ઉપયોગ કરશે. માત્ર મોબાઇલ નેટવર્ક કવરેજવાળા વિસ્તારમાં જ કટોકટીનો કૉલ કરી શકાય છે."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"તમે વાઇ-ફાઇ કૉલિંગ મારફતે ઇમર્જન્સી કૉલ કરી શકતા નથી. જો તમે કોઈ ઇમર્જન્સી કૉલ કરવાનો પ્રયાસ કરો છો, તો તમારું ડિવાઇસ ઑટોમૅટિક રીતે મોબાઇલ નેટવર્કનો ઉપયોગ કરશે. માત્ર મોબાઇલ નેટવર્ક કવરેજવાળા વિસ્તારમાં જ ઇમર્જન્સી કૉલ કરી શકાય છે."</string>
 </resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ne/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ne/strings.xml
index 51ca01e..48022a0 100644
--- a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ne/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ne/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"तपाईं Wi-Fi को कल गर्ने सुविधामार्फत आपतकालीन कलहरू गर्न सक्नुहुन्न। तपाईंले आपतकालीन कल गर्न खोज्नुभयो भने तपाईंको यन्त्रले स्वतः मोबाइल नेटवर्कको प्रयोग गर्ने छ। मोबाइल नेटवर्क उपलब्ध भएका क्षेत्रहरूबाट मात्र आपतकालीन कलहरू गर्न सकिन्छ।"</string>
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"तपाईं Wi-Fi को कल गर्ने सुविधामार्फत आपत्‌कालीन कलहरू गर्न सक्नुहुन्न। तपाईंले आपत्‌कालीन कल गर्न खोज्नुभयो भने तपाईंको यन्त्रले स्वतः मोबाइल नेटवर्कको प्रयोग गर्ने छ। मोबाइल नेटवर्क उपलब्ध भएका क्षेत्रहरूबाट मात्र आपत्‌कालीन कलहरू गर्न सकिन्छ।"</string>
 </resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-sr/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-sr/strings.xml
index e1618bd..65c98f9 100644
--- a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-sr/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-sr/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Не можете да упућујете хитне позиве помоћу позивања преко Wi-Fi-ја. Ако пробате да упутите хитан позив, уређај ће аутоматски користити мобилну мрежу. Хитни позиви могу да се упућују само у областима покривеним мобилном мрежом."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Не можете да упућујете хитне позиве помоћу позивања преко WiFi-а. Ако пробате да упутите хитан позив, уређај ће аутоматски користити мобилну мрежу. Хитни позиви могу да се упућују само у областима покривеним мобилном мрежом."</string>
 </resources>
diff --git a/tests/CarDeveloperOptions/res/values-mk/strings.xml b/tests/CarDeveloperOptions/res/values-mk/strings.xml
index 8aa9d8a..e06a0b8 100644
--- a/tests/CarDeveloperOptions/res/values-mk/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-mk/strings.xml
@@ -209,8 +209,8 @@
     <string name="proxy_error_invalid_port" msgid="4046559920586100637">"Внесениот порт не е исправен."</string>
     <string name="proxy_warning_limited_support" msgid="9026539134219095768">"Прелистувачот користи HTTP-прокси, но не може да го користат и другите апликации."</string>
     <string name="proxy_url_title" msgid="882042361706435904">"PAC URL: "</string>
-    <string name="radio_info_dl_kbps" msgid="2903778264453410272">"Брзина на пренос при преземање (кбит/с):"</string>
-    <string name="radio_info_ul_kbps" msgid="3802245899811732716">"Брзина на пренос при прикачување (кбит/с):"</string>
+    <string name="radio_info_dl_kbps" msgid="2903778264453410272">"Брзина на пренос при преземање (kbps):"</string>
+    <string name="radio_info_ul_kbps" msgid="3802245899811732716">"Брзина на пренос при прикачување (kbps):"</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>
@@ -742,7 +742,7 @@
     <string name="bluetooth_display_passkey_pin_msg" msgid="5909423849232791647">"За да се спари со:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Напишете на него:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, потоа притиснете „Врати“ или „Внеси“."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="7474404818877079813">"Дозволете пристап до вашите контакти и историјата на повици"</string>
     <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_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_searching_for_devices" msgid="7820814625522702494">"Пребарување..."</string>
@@ -768,7 +768,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>
@@ -871,7 +871,7 @@
     <string name="wifi_suspend_optimizations" msgid="8826033336622472222">"Оптимизација на 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_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>
@@ -942,7 +942,7 @@
     <string name="wifi_dpp_share_wifi" msgid="1724161216219646284">"Споделете Wi‑Fi"</string>
     <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4357387474444884759">"Скенирајте го овој QR-код за да се поврзете со „<xliff:g id="SSID">%1$s</xliff:g>“ и да ја споделите лозинката"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="572011882416511818">"Скенирајте го овој QR-код за да се поврзете со „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
-    <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="27667719861826438">"Не можеше да се прочита 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_not_compatible" msgid="4320027179973678283">"Нешто тргна наопаку"</string>
     <string name="wifi_dpp_failure_timeout" msgid="5060065168142109420">"Проверете дали уредот е приклучен, наполнет и вклучен"</string>
@@ -955,7 +955,7 @@
     <string name="wifi_dpp_wifi_shared_with_device" msgid="5713765471758272471">"Wi‑Fi е споделена со уредот"</string>
     <string name="wifi_dpp_add_another_device" msgid="3698441567235301565">"Додај друг уред"</string>
     <string name="wifi_dpp_choose_different_network" msgid="128515107488187050">"Изберете друга мрежа"</string>
-    <string name="wifi_dpp_could_not_add_device" msgid="4966109556543584813">"Не можеше да се додаде уредот"</string>
+    <string name="wifi_dpp_could_not_add_device" msgid="4966109556543584813">"Не може да се додаде уредот"</string>
     <string name="wifi_dpp_device_found" msgid="6488461467496850841">"Најден е уред"</string>
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="2540529164687476827">"Се споделува Wi‑Fi со уредов…"</string>
     <string name="wifi_dpp_connecting" msgid="4229290407210299897">"Се поврзува…"</string>
@@ -1048,7 +1048,7 @@
     <string name="wifi_p2p_menu_rename" msgid="2129974878377065488">"Преименувај уред"</string>
     <string name="wifi_p2p_peer_devices" msgid="8232126067045093382">"Спарени уреди"</string>
     <string name="wifi_p2p_remembered_groups" msgid="1356458238836730346">"Запаметени групи"</string>
-    <string name="wifi_p2p_failed_connect_message" msgid="6103436959132424093">"Не можеше да се поврзе."</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="6103436959132424093">"Не може да се поврзе."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="638656605352538706">"Не успеа да го преименува уредот."</string>
     <string name="wifi_p2p_disconnect_title" msgid="915880461655863812">"Исклучи?"</string>
     <string name="wifi_p2p_disconnect_message" msgid="3745286932812740784">"Ако се исклучите, вашата врска со <xliff:g id="PEER_NAME">%1$s</xliff:g> ќе заврши."</string>
@@ -1399,7 +1399,7 @@
     <string name="dlg_confirm_unmount_text" product="default" msgid="4099391737780732622">"Ако ја одмонтирате СД картичката, некои од апликациите што ги користите ќе запрат и може да се недостапни, додека повторно не ја монтирате СД картичката."</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="nosdcard" msgid="4710773826053117136">"Не може да се одмонтира USB меморијата. Обидете се повторно подоцна."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="8243603872321575219">"СД картичката не може да се одмонтира. Обидете се повторно подоцна."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="2460118115494815052">"USB меморијата ќе се одмонтира."</string>
     <string name="unmount_inform_text" product="default" msgid="6467461731634304997">"СД картичката ќе се одмонтира."</string>
@@ -1861,16 +1861,16 @@
     <string name="internal_storage" msgid="7392373600013294853">"Внатрешен капацитет"</string>
     <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="clear_data_dlg_text" msgid="6849657743695013414">"Сите податоци на оваа апликација ќе бидат трајно избришани. Ова ги опфаќа сите датотеки, поставки, сметки, бази на податоци итн."</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>
-    <string name="invalid_size_value" msgid="1202239724000802296">"Не можеше да се пресмета големината на пакетот."</string>
+    <string name="invalid_size_value" msgid="1202239724000802296">"Не може да се пресмета големината на пакетот."</string>
     <string name="version_text" msgid="5421619604445758652">"верзија <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5400135231255614785">"Премести"</string>
     <string name="move_app_to_internal" product="tablet" msgid="8658767231643024635">"Премести во таблет"</string>
@@ -1887,7 +1887,7 @@
     <string name="force_stop_dlg_text" msgid="7435245769456493398">"Ако присилно запрете апликација, таа може да не се однесува правилно."</string>
     <string name="app_install_location_title" msgid="5121617802063021720">"Претпочиана локација на инсталирање"</string>
     <string name="app_install_location_summary" msgid="109719780117187797">"Променете ја претпочитаната локација на инсталирање за нови апликации."</string>
-    <string name="app_disable_dlg_positive" msgid="5508828271100168073">"Оневозможете ја апликацијата"</string>
+    <string name="app_disable_dlg_positive" msgid="5508828271100168073">"Оневозможи ја апликацијата"</string>
     <string name="app_disable_dlg_text" msgid="9221864774943530281">"Ако ја оневозможите оваа апликација, Android и другите апликации можеби веќе нема да функционираат како што треба. Имајте предвид, не може да ја избришете апликацијава бидејќи е однапред инсталирана на уредот. Ако ја оневозможите, ќе ја исклучите и ќе ја сокриете на уредот."</string>
     <string name="app_disable_notifications_dlg_title" msgid="699530661413553928">"Исклучи известувања?"</string>
     <string name="app_install_details_group_title" msgid="2909597319422976921">"Продавница"</string>
@@ -2926,7 +2926,7 @@
     <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_got_it" msgid="2432535672153247411">"Разбрав"</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>
     <string name="nfc_payment_set_default" msgid="1186837502664412132">"Секогаш користи <xliff:g id="APP">%1$s</xliff:g> кога користиш Допри и плати?"</string>
@@ -2952,7 +2952,7 @@
     <!-- no translation found for call_manager_summary (1232655174841493040) -->
     <skip />
     <string name="cell_broadcast_settings" msgid="5750066270993255966">"Предупредувања за итни случаи"</string>
-    <string name="network_operators_settings" msgid="7822337582828465633">"Оператори на мрежа"</string>
+    <string name="network_operators_settings" msgid="7822337582828465633">"Мрежни оператори"</string>
     <string name="access_point_names" msgid="7992382237358800596">"Имиња на пристапни точки"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="1624079276378568594">"VoLTE"</string>
     <string name="enhanced_4g_lte_mode_title_advanced_calling" msgid="5155507161065290507">"Напредно повикување"</string>
@@ -3296,7 +3296,7 @@
     <string name="other_sound_category_preference_title" msgid="2045757472469840859">"Други звуци и вибрации"</string>
     <string name="configure_notification_settings" msgid="291914315140851270">"Известувања"</string>
     <string name="recent_notifications" msgid="8125865995065032049">"Неодамна испратени"</string>
-    <string name="recent_notifications_see_all_title" msgid="4089007770442871469">"Приказ на сите од последните 7 дена"</string>
+    <string name="recent_notifications_see_all_title" msgid="4089007770442871469">"Преглед на сите од минатите 7 дена"</string>
     <string name="advanced_section_header" msgid="984680389373090015">"Напредни"</string>
     <string name="profile_section_header" msgid="5471479005472037417">"Известувања за работен профил"</string>
     <string name="asst_capability_prioritizer_title" msgid="3488284760645922160">"Автоматско доделување предност на известувањата"</string>
@@ -3726,7 +3726,7 @@
     <string name="sharing_remote_bugreport_dialog_message" msgid="3814787466701526359">"Извештајот за грешки е споделен со вашиот администратор за информатичка технологија. За повеќе детали, контактирајте со него."</string>
     <string name="share_remote_bugreport_action" msgid="8600797271670537888">"Сподели"</string>
     <string name="decline_remote_bugreport_action" msgid="706319275774199033">"Одбиј"</string>
-    <string name="usb_use_charging_only" msgid="2344625733377110164">"Нема пренос на податоци"</string>
+    <string name="usb_use_charging_only" msgid="2344625733377110164">"Без пренос на податоци"</string>
     <string name="usb_use_charging_only_desc" msgid="3283518562582478950">"Само ја полни батеријата"</string>
     <string name="usb_use_power_only" msgid="6595783381323810697">"Полнење на поврзаниот уред"</string>
     <string name="usb_use_file_transfers" msgid="6153021302176151884">"Пренос на датотеки"</string>
@@ -3745,7 +3745,7 @@
     <string name="usb_control_host" msgid="193292043691034178">"Поврзан уред"</string>
     <string name="usb_control_device" msgid="9154790265254725254">"Овој уред"</string>
     <string name="usb_switching" msgid="1230386065163529904">"Префрлање…"</string>
-    <string name="usb_switching_failed" msgid="6857722544186145439">"Не можеше да се префрли"</string>
+    <string name="usb_switching_failed" msgid="6857722544186145439">"Не може да се префрли"</string>
     <string name="usb_summary_charging_only" msgid="4118449308708872339">"Полнење на уредот"</string>
     <string name="usb_summary_power_only" msgid="3552240122641051107">"Се полни поврзаниот уред"</string>
     <string name="usb_summary_file_transfers" msgid="7805342797099821502">"Пренос на датотеки"</string>
@@ -4515,7 +4515,7 @@
     <string name="content_capture_summary" msgid="2675659095218714681">"Дозволете Android да зачувува информации видени на екранот или слушнати во видео или аудиосодржини. Android дава корисни предлози според вашата активност на уредот."</string>
     <string name="capture_system_heap_dump_title" msgid="7417508823603305421">"Сними слика од меморијата на системот"</string>
     <string name="capturing_system_heap_dump_message" msgid="5108339625760845950">"Се снима слика од меморијата на системот"</string>
-    <string name="error_capturing_system_heap_dump_message" msgid="5431592130805893098">"Не можеше да се сними слика од меморијата на системот"</string>
+    <string name="error_capturing_system_heap_dump_message" msgid="5431592130805893098">"Не може да се сними слика од меморијата на системот"</string>
     <string name="automatic_system_heap_dump_title" msgid="2153897396923488317">"Автоматски снимај слики од меморијата на системот"</string>
     <string name="automatic_system_heap_dump_summary" msgid="4962129546638974661">"Автоматски снимај слика од меморијата за системот Android кога користи премногу меморија"</string>
     <string name="wifi_disconnect_button_text" msgid="787688024070426706">"Исклучи"</string>
diff --git a/tests/CarDeveloperOptions/res/values-ml/strings.xml b/tests/CarDeveloperOptions/res/values-ml/strings.xml
index f068854..ac1cad5 100644
--- a/tests/CarDeveloperOptions/res/values-ml/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ml/strings.xml
@@ -1168,7 +1168,7 @@
     <string name="accessibility_category_personal" msgid="1423427301759058762">"വ്യക്തിഗത പ്രൊഫൈൽ അക്കൗണ്ടുകൾ"</string>
     <string name="accessibility_work_account_title" msgid="3195468574776888011">"ഔദ്യോഗിക അക്കൗണ്ട് - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_personal_account_title" msgid="7251761883688839354">"വ്യക്തിഗത അക്കൗണ്ട് - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
-    <string name="search_settings" msgid="5809250790214921377">"തിരയൽ"</string>
+    <string name="search_settings" msgid="5809250790214921377">"Search"</string>
     <string name="display_settings" msgid="1045535829232307190">"ഡിസ്പ്ലേ"</string>
     <string name="accelerometer_title" msgid="2427487734964971453">"സ്‌ക്രീൻ സ്വയമേവ തിരിക്കുക"</string>
     <string name="color_mode_title" msgid="8164858320869449142">"നിറങ്ങൾ"</string>
@@ -1450,7 +1450,7 @@
     <string name="storage_internal_forget_confirm_title" msgid="331032276130605241">"<xliff:g id="NAME">^1</xliff:g> മറക്കണോ?"</string>
     <string name="storage_internal_forget_confirm" msgid="3052483375203727176">"<xliff:g id="NAME">^1</xliff:g> എന്നതിൽ സംഭരിച്ചിരിക്കുന്ന എല്ലാ ആപ്സും ഫോട്ടോകളും ഡാറ്റയും ശാശ്വതമായി നഷ്ടപ്പെടും."</string>
     <string name="storage_detail_apps" msgid="8154648512504196820">"ആപ്സ്"</string>
-    <string name="storage_detail_images" msgid="6996202225684468964">"ചിത്രങ്ങൾ"</string>
+    <string name="storage_detail_images" msgid="6996202225684468964">"Images"</string>
     <string name="storage_detail_videos" msgid="6030983354721080849">"വീഡിയോകൾ"</string>
     <string name="storage_detail_audio" msgid="6011098436589663944">"ഓഡിയോ"</string>
     <string name="storage_detail_cached" msgid="5761648455067920683">"കാഷെ ചെയ്‌ത ഡാറ്റ"</string>
@@ -1572,7 +1572,7 @@
     <string name="reset_dashboard_summary" msgid="8778383341461126642">"നെറ്റ്‌വർക്കോ ആപ്പുകളോ ഉപകരണമോ റീസെറ്റുചെയ്യാം"</string>
     <string name="reset_network_title" msgid="8944059136930806211">"വൈഫൈ, മൊബൈൽ, Bluetooth റീസെറ്റ് ചെയ്യുക"</string>
     <string name="reset_network_desc" msgid="4982633363916261109">"ഇങ്ങനെ ചെയ്താൽ ഇനിപ്പറയുന്നവ ഉൾപ്പെടെയുള്ള എല്ലാ നെറ്റ്‍വർക്ക് ക്രമീകരണവും പുനഃക്രമീകരിക്കപ്പെടും:\n\n"<li>"വൈഫൈ"</li>\n<li>"മൊബൈൽ ഡാറ്റ"</li>\n<li>"Bluetooth"</li></string>
-    <string name="reset_esim_title" msgid="7630781767040831893">"ഡൗൺലോഡ് ചെയ്‌ത SIM-കൾ മായ്ക്കൂ"</string>
+    <string name="reset_esim_title" msgid="7630781767040831893">"ഡൗൺലോഡ് ചെയ്‌ത SIM-കൾ മായ്ക്കുക"</string>
     <string name="reset_esim_desc" msgid="433226911566802">"പകരം വയ്ക്കാനുള്ള SIM-കൾ ഡൗൺലോഡ് ചെയ്യാൻ, നിങ്ങളുടെ സേവനദാതാവിനെ ബന്ധപ്പെടുക. ഇത് മൊബൈൽ സേവന പ്ലാനുകളൊന്നും റദ്ദാക്കില്ല."</string>
     <string name="reset_network_button_text" msgid="4293271046867912819">"ക്രമീകരണം റീസെറ്റ് ചെയ്യുക"</string>
     <string name="reset_network_final_desc" msgid="2463817067048751373">"എല്ലാ നെറ്റ്‌വർക്കിംഗ് ക്രമീകരണവും പുനഃസജ്ജീകരിക്കണോ? നിങ്ങൾക്ക് ഈ പ്രവർത്തനം പഴയപടിയാക്കാനാവില്ല."</string>
@@ -1600,8 +1600,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">"സി‌സ്റ്റം മായ്ക്കുക സേവനം ലഭ്യമല്ലാത്തതിനാൽ പുനഃസജ്ജീകരണമൊന്നും നടത്തിയില്ല."</string>
     <string name="master_clear_confirm_title" msgid="698328669893512402">"എല്ലാ ഡാറ്റയും മായ്‌ക്കണോ?"</string>
@@ -1890,7 +1890,7 @@
     <string name="app_disable_dlg_positive" msgid="5508828271100168073">"ആപ്പ് പ്രവർത്തനരഹിതമാക്കുക"</string>
     <string name="app_disable_dlg_text" msgid="9221864774943530281">"നിങ്ങൾ ഈ ആപ്പ് പ്രവർത്തനരഹിതമാക്കിയാൽ, Android-ഉം മറ്റ് ആപ്പുകളും ഇനി ഉദ്ദേശിച്ചത് പോലെ പ്രവർത്തിച്ചേക്കില്ല. ശ്രദ്ധിക്കുക, നിങ്ങളുടെ ഉപകരണത്തിൽ മുമ്പേ ഇൻസ്‌റ്റാൾ ചെയ്‌തതായതിനാൽ ഈ ആപ്പ് നിങ്ങൾക്ക് ഇല്ലാതാക്കാനാവില്ല. പ്രവർത്തനരഹിതമാക്കുന്നത് വഴി, ഈ ആപ്പ് ഓഫാക്കി നിങ്ങൾക്കിത് ഉപകരണത്തിൽ മറച്ചു വയ്ക്കാം."</string>
     <string name="app_disable_notifications_dlg_title" msgid="699530661413553928">"അറിയിപ്പുകൾ ഓഫാക്കണോ?"</string>
-    <string name="app_install_details_group_title" msgid="2909597319422976921">"സ്റ്റോർ"</string>
+    <string name="app_install_details_group_title" msgid="2909597319422976921">"Store"</string>
     <string name="app_install_details_title" msgid="6954953384372934881">"ആപ്പ് വിശദാംശങ്ങൾ"</string>
     <string name="app_install_details_summary" msgid="6612222941121363940">"<xliff:g id="APP_STORE">%1$s</xliff:g> എന്നതിൽ നിന്ന് ആപ്പ് ഇൻസ്റ്റാൾ ചെയ്തു"</string>
     <string name="instant_app_details_summary" msgid="6384264315914966114">"<xliff:g id="APP_STORE">%1$s</xliff:g> സംബന്ധിച്ച കൂടുതൽ ‌വിവരങ്ങൾ"</string>
@@ -2211,7 +2211,7 @@
     <string name="print_feature_state_off" msgid="208580346723223688">"ഓഫ്"</string>
     <string name="print_menu_item_add_service" msgid="6803000110578493782">"സേവനം ചേർക്കുക"</string>
     <string name="print_menu_item_add_printer" msgid="8529196211179574921">"പ്രിന്റർ ചേർക്കുക"</string>
-    <string name="print_menu_item_search" msgid="1165316329772287360">"തിരയൽ"</string>
+    <string name="print_menu_item_search" msgid="1165316329772287360">"Search"</string>
     <string name="print_searching_for_printers" msgid="6538687129687642542">"പ്രിന്ററുകൾക്കായി തിരയുന്നു"</string>
     <string name="print_service_disabled" msgid="6376344992705893436">"സേവനം പ്രവർത്തനരഹിതമാക്കി"</string>
     <string name="print_print_jobs" msgid="7357841034181762157">"പ്രിന്റ് ജോലികൾ"</string>
@@ -3282,7 +3282,7 @@
     <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="7584229011611927613">"ശല്ല്യപ്പെടുത്തരുത് അറിയിപ്പ് ക്രമീകരണം മാറ്റണോ?"</string>
     <string name="sound_work_settings" msgid="4140215240360927923">"ഔദ്യോഗിക പ്രൊഫൈൽ ശബ്ദങ്ങൾ"</string>
     <string name="work_use_personal_sounds_title" msgid="531727195073003599">"സ്വകാര്യ പ്രൊഫൈൽ ശബ്ദങ്ങൾ ഉപയോഗിക്കുക"</string>
-    <string name="work_use_personal_sounds_summary" msgid="2886871383995187441">"ഔദ്യോഗിക പ്രൊഫൈലുകൾക്കും വ്യക്തിഗത പ്രൊഫൈലുകൾക്കുമുള്ള ശബ്ദങ്ങൾ ഒന്നുതന്നെ ആയിരിക്കും"</string>
+    <string name="work_use_personal_sounds_summary" msgid="2886871383995187441">"ഔദ്യോഗിക പ്രൊഫൈലുകൾക്കും സ്വകാര്യ പ്രൊഫൈലുകൾക്കുമുള്ള ശബ്ദങ്ങൾ ഒന്നുതന്നെ ആയിരിക്കും"</string>
     <string name="work_ringtone_title" msgid="5499360583947410224">"ഔദ്യോഗിക ഫോൺ റിംഗ്‌ടോൺ"</string>
     <string name="work_notification_ringtone_title" msgid="8059159087214025757">"ഡിഫോൾട്ട് ഔദ്യോഗിക അറിയിപ്പ് ശബ്‌ദം"</string>
     <string name="work_alarm_ringtone_title" msgid="5328487181385375130">"ഡിഫോൾട്ട് ഔദ്യോഗിക അലാറം ശബ്‌ദം"</string>
@@ -3371,9 +3371,9 @@
     <string name="no_notification_assistant" msgid="9140123568386413264">"അസിസ്‌റ്റന്റ് ഇല്ല"</string>
     <string name="no_notification_listeners" msgid="1366386609506834717">"ഇൻസ്റ്റാളുചെയ്തിട്ടുള്ള ആപ്സൊന്നും അറിയിപ്പ് ആക്‌സസ് അഭ്യർത്ഥിച്ചിട്ടില്ല."</string>
     <string name="notification_assistant_security_warning_title" msgid="4190584438086738496">"<xliff:g id="SERVICE">%1$s</xliff:g>-ന് അറിയിപ്പ് ആക്‌സസ് അനുവദിക്കണോ?"</string>
-    <string name="notification_assistant_security_warning_summary" msgid="6924513399671031930">"കോൺടാക്റ്റ് പേരുകൾ, നിങ്ങൾക്ക് ലഭിക്കുന്ന സന്ദേശങ്ങൾ എന്നിവ പോലുള്ള വ്യക്തിഗത വിവരങ്ങൾ ഉൾപ്പെടെ എല്ലാ അറിയിപ്പുകളും <xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g>-ന് വായിക്കാൻ കഴിയും. അറിയിപ്പുകൾ പരിഷ്‌ക്കരിക്കാനോ ഡിസ്‍മിസ് ചെയ്യാനോ അവയിലടങ്ങിയിരിക്കുന്ന പ്രവർത്തന ബട്ടണുകൾ ട്രിഗർ ചെയ്യാനോ ഇതിന് കഴിയും. \n\nആപ്പിന് \'ശല്യപ്പെടുത്തരുത്\' ഓണോ ഓഫോ ആക്കാനും ബന്ധപ്പെട്ട ക്രമീകരണം മാറ്റാനുമുള്ള ശേഷിയും ഇത് നൽകും."</string>
+    <string name="notification_assistant_security_warning_summary" msgid="6924513399671031930">"കോൺടാക്റ്റ് പേരുകൾ, നിങ്ങൾക്ക് ലഭിക്കുന്ന സന്ദേശങ്ങൾ എന്നിവ പോലുള്ള വ്യക്തിപരമായ വിവരങ്ങൾ ഉൾപ്പെടെ എല്ലാ അറിയിപ്പുകളും <xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g>-ന് വായിക്കാൻ കഴിയും. അറിയിപ്പുകൾ പരിഷ്‌ക്കരിക്കാനോ ഡിസ്‍മിസ് ചെയ്യാനോ അവയിലടങ്ങിയിരിക്കുന്ന പ്രവർത്തന ബട്ടണുകൾ ട്രിഗർ ചെയ്യാനോ ഇതിന് കഴിയും. \n\nആപ്പിന് \'ശല്യപ്പെടുത്തരുത്\' ഓണോ ഓഫോ ആക്കാനും ബന്ധപ്പെട്ട ക്രമീകരണം മാറ്റാനുമുള്ള ശേഷിയും ഇത് നൽകും."</string>
     <string name="notification_listener_security_warning_title" msgid="4902253246428777797">"<xliff:g id="SERVICE">%1$s</xliff:g>-ന് അറിയിപ്പ് ആക്സസ് അനുവദിക്കണോ?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="4454702907350100288">"കോൺടാക്റ്റ് പേരുകളും നിങ്ങൾ സ്വീകരിക്കുന്ന സന്ദേശങ്ങളുടെ ടെക്സ്റ്റും പോലുള്ള വ്യക്തിഗത വിവരങ്ങൾ ഉൾപ്പെടെ, എല്ലാ അറിയിപ്പുകളും വായിക്കുന്നതിന് <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> എന്നതിനാകും. അറിയിപ്പുകൾ നിരാകരിക്കാനോ അറിയിപ്പുകളിൽ അടങ്ങിയിരിക്കുന്ന പ്രവർത്തന ബട്ടണുകൾ സജീവമാക്കാനോ ഇതിനാകും. \n\nആപ്പിന് \'ശല്യപ്പെടുത്തരുത്\' ഓണോ ഓഫോ ആക്കാനും ബന്ധപ്പെട്ട ക്രമീകരണം മാറ്റാനുമുള്ള ശേഷിയും ഇത് നൽകും."</string>
+    <string name="notification_listener_security_warning_summary" msgid="4454702907350100288">"കോൺടാക്റ്റ് പേരുകളും നിങ്ങൾ സ്വീകരിക്കുന്ന സന്ദേശങ്ങളുടെ ടെക്സ്റ്റും പോലുള്ള വ്യക്തിപരമായ വിവരങ്ങൾ ഉൾപ്പെടെ, എല്ലാ അറിയിപ്പുകളും വായിക്കുന്നതിന് <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> എന്നതിനാകും. അറിയിപ്പുകൾ നിരാകരിക്കാനോ അറിയിപ്പുകളിൽ അടങ്ങിയിരിക്കുന്ന പ്രവർത്തന ബട്ടണുകൾ സജീവമാക്കാനോ ഇതിനാകും. \n\nആപ്പിന് \'ശല്യപ്പെടുത്തരുത്\' ഓണോ ഓഫോ ആക്കാനും ബന്ധപ്പെട്ട ക്രമീകരണം മാറ്റാനുമുള്ള ശേഷിയും ഇത് നൽകും."</string>
     <string name="notification_listener_disable_warning_summary" msgid="162165151519082978">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> എന്നതിനായുള്ള അറിയിപ്പ് ആക്സസ്സ് നിങ്ങൾ ഓഫാക്കുന്നുവെങ്കിൽ, \'ശല്യപ്പെടുത്തരുത്\' ആക്സസ്സും ഓഫാക്കപ്പെട്ടേക്കാം."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="7863495391671154188">"ഓഫാക്കുക"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="6264631825225298458">"റദ്ദാക്കുക"</string>
@@ -3792,7 +3792,7 @@
     <string name="zen_access_revoke_warning_dialog_title" msgid="6850994585577513299">"\'ശല്യപ്പെടുത്തരുത്\' എന്നതിലേക്ക് <xliff:g id="APP">%1$s</xliff:g> ആപ്പിനുള്ള ആക്സസ് പിൻവലിക്കണോ?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="3487422193181311403">"ഈ ആപ്പ് സൃഷ്ടിച്ചിട്ടുള്ള എല്ലാ \'ശല്യപ്പെടുത്തരുത്\' നിയമങ്ങളും നീക്കംചെയ്യപ്പെടും."</string>
     <string name="ignore_optimizations_on" msgid="4373971641328943551">"ഓപ്റ്റിമൈസ് ചെയ്യരുത്"</string>
-    <string name="ignore_optimizations_off" msgid="4372289432580282870">"ഓപ്‌റ്റിമൈസ് ചെയ്യുക"</string>
+    <string name="ignore_optimizations_off" msgid="4372289432580282870">"Optimize"</string>
     <string name="ignore_optimizations_on_desc" msgid="2904484569799521559">"നിങ്ങളുടെ ബാറ്ററി ചാർജ് കൂടുതൽ വേഗത്തിൽ തീർന്നേക്കാം. പശ്ചാത്തലത്തിൽ ബാറ്ററി ഉപയോഗിക്കുന്നതിൽ നിന്ന് ആപ്പ് ഇനി നിയന്ത്രിക്കപ്പെടില്ല."</string>
     <string name="ignore_optimizations_off_desc" msgid="5598702251817814289">"ബാറ്ററിക്ക് കൂടുതൽ ഈടുകിട്ടുന്നതിന് ശുപാർശ ചെയ്യുന്നു"</string>
     <string name="ignore_optimizations_title" msgid="7924345545276166305">"ബാറ്ററി ഒപ്റ്റിമൈസേഷനുകൾ അവഗണിക്കാൻ <xliff:g id="APP">%s</xliff:g> എന്നതിനെ അനുവദിക്കണോ?"</string>
diff --git a/tests/CarDeveloperOptions/res/values-mn/arrays.xml b/tests/CarDeveloperOptions/res/values-mn/arrays.xml
index 41cc6ae..9777f7c 100644
--- a/tests/CarDeveloperOptions/res/values-mn/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-mn/arrays.xml
@@ -152,7 +152,7 @@
     <item msgid="7122038588318037831">"Аль нь ч биш"</item>
     <item msgid="212906109313512425">"MSCHAPV2"</item>
     <item msgid="6333849991499980140">"GTC"</item>
-    <item msgid="6226796534844879034">"СИМ"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
     <item msgid="4600011056049114926">"AKA"</item>
     <item msgid="5244120184217604552">"AKA\'"</item>
   </string-array>
@@ -215,7 +215,7 @@
   <string-array name="app_ops_categories">
     <item msgid="1102693344156734891">"Байршил"</item>
     <item msgid="6842381562497597649">"Хувийн"</item>
-    <item msgid="3966700236695683444">"Зурвас"</item>
+    <item msgid="3966700236695683444">"Мессеж"</item>
     <item msgid="8563996233342430477">"Медиа"</item>
     <item msgid="5323851085993963783">"Төхөөрөмж"</item>
   </string-array>
@@ -268,7 +268,7 @@
     <item msgid="6880736730520126864">"toast харуулах"</item>
     <item msgid="4933375960222609935">"төслийн медиа"</item>
     <item msgid="8357907018938895462">"VPN идэвхжүүлэх"</item>
-    <item msgid="8143812849911310973">"ханын зураг бичих"</item>
+    <item msgid="8143812849911310973">"дэлгэцийн зураг бичих"</item>
     <item msgid="6266277260961066535">"бүтцийг өөрчлөх"</item>
     <item msgid="7715498149883482300">"дэлгэцийн агшинг өөрчлөх"</item>
     <item msgid="4046679376726313293">"гар утасны төлөвийг унших"</item>
@@ -335,7 +335,7 @@
     <item msgid="4199297950608622850">"toast харуулах"</item>
     <item msgid="2527962435313398821">"Төслийн медиа"</item>
     <item msgid="5117506254221861929">"VPN идэвхжүүлэх"</item>
-    <item msgid="8291198322681891160">"Ханын зураг бичих"</item>
+    <item msgid="8291198322681891160">"Дэлгэцийн зураг бичих"</item>
     <item msgid="7106921284621230961">"Бүтцийг өөрчлөх"</item>
     <item msgid="4496533640894624799">"Дэлгэцийн агшинг өөрчлөх"</item>
     <item msgid="2598847264853993611">"Гар утасны төлөвийг унших"</item>
diff --git a/tests/CarDeveloperOptions/res/values-mn/strings.xml b/tests/CarDeveloperOptions/res/values-mn/strings.xml
index 004e3fe..8e847cc 100644
--- a/tests/CarDeveloperOptions/res/values-mn/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-mn/strings.xml
@@ -158,10 +158,10 @@
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="2880630715123354820">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> таны харилцагчид болон дуудлагын түүхэнд хандах хүсэлтэй байна. <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>-д хандах зөвшөөрөл олгох уу?"</string>
     <string name="bluetooth_remember_choice" msgid="5557832673688613557">"Дахиж үл асуух"</string>
     <string name="bluetooth_pb_remember_choice" msgid="3983194742712379543">"Дахиж үл асуух"</string>
-    <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">"СИМ хандалтын хүсэлт"</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_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> нь таны SIM картанд хандах хүсэлтэй байна. SIM картанд хандалтыг нээж өгснөөр холболтын хугацааны туршид төхөөрөмжийн дата холболтыг идэвхгүй болгоно. <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">"Бусад төхөөрөмжид холбогдохын тулд Bluetooth-г асаана уу."</string>
     <string name="bluetooth_paired_device_title" msgid="8361860197780425286">"Таны төхөөрөмж"</string>
@@ -209,8 +209,8 @@
     <string name="proxy_error_invalid_port" msgid="4046559920586100637">"Таны оруулсан порт буруу байна."</string>
     <string name="proxy_warning_limited_support" msgid="9026539134219095768">"HTTP проксиг хөтөч ашиглаж байгаа боловч бусад апп ашиглахгүй байж магадгүй."</string>
     <string name="proxy_url_title" msgid="882042361706435904">"PAC URL: "</string>
-    <string name="radio_info_dl_kbps" msgid="2903778264453410272">"DL Зурвасын өргөн (kbps):"</string>
-    <string name="radio_info_ul_kbps" msgid="3802245899811732716">"UL Зурвасын өргөн (kbps):"</string>
+    <string name="radio_info_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_phy_chan_config" msgid="1184401689381480522">"LTE Сувгийн бодит тохиргоо:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="3557422342215875913">"Үүрэн мэдээлэл сэргээх үнэлгээ:"</string>
@@ -226,9 +226,9 @@
     <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>
+    <string name="radio_info_message_waiting_label" msgid="2660886722520568584">"Мессежийг хүлээж байна:"</string>
     <string name="radio_info_phone_number_label" msgid="6929685578956565642">"Утасны дугаар:"</string>
-    <string name="radio_info_band_mode_label" msgid="9181607879920091762">"Радио зурвасыг сонгох"</string>
+    <string name="radio_info_band_mode_label" msgid="9181607879920091762">"Радио мессежийг сонгох"</string>
     <string name="radio_info_voice_network_type_label" msgid="3686471589514241007">"Дуут сүлжээний төрөл:"</string>
     <string name="radio_info_data_network_type_label" msgid="5108279335070879015">"Дата сүлжээний төрөл:"</string>
     <string name="radio_info_set_perferred_label" msgid="1447353131819041587">"Давуу сүлжээний төрлийг тохируулна уу:"</string>
@@ -239,10 +239,10 @@
     <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_toggle_dns_check_label" msgid="3058615074503857400">"DNS шалгалтыг унтраах/асаах"</string>
+    <string name="radio_info_toggle_dns_check_label" msgid="3058615074503857400">"DNS шалгалтыг асаах/унтраах"</string>
     <string name="oem_radio_info_label" msgid="8679815523111164378">"OEM-бүрээр Мэдээлэл/Тохиргоо"</string>
-    <string name="band_mode_title" msgid="8180320100446559884">"Радио зурвасын горимыг тохируулах"</string>
-    <string name="band_mode_loading" msgid="918672949915983700">"Зурвасын жагсаалтыг ачаалж байна..."</string>
+    <string name="band_mode_title" msgid="8180320100446559884">"Радио мессежийн горимыг тохируулах"</string>
+    <string name="band_mode_loading" msgid="918672949915983700">"Мессежийн жагсаалтыг ачаалж байна..."</string>
     <string name="band_mode_set" msgid="4962130364076526789">"Тохируулах"</string>
     <string name="band_mode_failed" msgid="8350123391471974137">"Амжилтгүй"</string>
     <string name="band_mode_succeeded" msgid="5516613616395402809">"Амжилттай"</string>
@@ -351,7 +351,7 @@
     <string name="lock_immediately_summary_with_exception" msgid="6442552135409347556">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> түгжээгүй байлгаснаас бусад тохиолдолд унтах горимд шилжсэн дариуд"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="7218267834086717545">"<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>-с түгжээгүй байлгаснаас бусад үед <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>-ийн дараа унтах горимд шилжих"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="4510756693837171575">"Дэлгэц түгжигдэхэд эзэмшигчийн мэдээллийг харуулах"</string>
-    <string name="owner_info_settings_title" msgid="2537966178998339896">"Дэлгэц түгжих зурвас"</string>
+    <string name="owner_info_settings_title" msgid="2537966178998339896">"Дэлгэц түгжих мессеж"</string>
     <string name="security_enable_widgets_title" msgid="1701510007926738088">"Хэрэгсэл идэвхжүүлэх"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="4408176087132339331">"Админ цуцалсан"</string>
     <string name="lockdown_settings_title" msgid="4534779922580115990">"Аюулгүйгээр түгжих (lockdown) сонголтыг харуулах"</string>
@@ -863,7 +863,7 @@
     <string name="wifi_install_credentials" msgid="5650088113710858289">"Сертификат суулгах"</string>
     <string name="wifi_scan_notify_text" msgid="7614101215028336927">"Байршлын нарийвчлалыг сайжруулахын тулд апп, үйлчилгээ нь Wi-Fi сүлжээг хүссэн үедээ буюу 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_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_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_sleep_policy_error" msgid="9029652631829560733">"Тохиргоог өөрчлөхөд асуудал гарлаа"</string>
@@ -925,12 +925,12 @@
     <string name="wifi_show_password" msgid="7878398590772942202">"Нууц үгийг харуулах"</string>
     <string name="wifi_ap_band_config" msgid="6565016368079288433">"AP Band сонгох"</string>
     <string name="wifi_ap_choose_auto" msgid="7927637960569365785">"Автомат"</string>
-    <string name="wifi_ap_choose_2G" msgid="43198403259714736">"2.4 ГГц зурвас"</string>
-    <string name="wifi_ap_choose_5G" msgid="2624859713183683146">"5.0 Гц зурвас"</string>
-    <string name="wifi_ap_prefer_5G" msgid="8339172330471170142">"5.0 Гц Зурвасыг тохиромжтой гэж үздэг"</string>
+    <string name="wifi_ap_choose_2G" msgid="43198403259714736">"2.4 ГГц мессеж"</string>
+    <string name="wifi_ap_choose_5G" msgid="2624859713183683146">"5.0 Гц мессеж"</string>
+    <string name="wifi_ap_prefer_5G" msgid="8339172330471170142">"5.0 Гц Мессежийг тохиромжтой гэж үздэг"</string>
     <string name="wifi_ap_2G" msgid="5793110086517338494">"2.4 Гц"</string>
     <string name="wifi_ap_5G" msgid="4584892544393675403">"5.0 Гц"</string>
-    <string name="wifi_ap_band_select_one" msgid="4409754936554360355">"Wi-Fi сүлжээний цэгт хамгийн багадаа нэг зурвасыг сонгоно уу:"</string>
+    <string name="wifi_ap_band_select_one" msgid="4409754936554360355">"Wi-Fi сүлжээний цэгт хамгийн багадаа нэг мессежийг сонгоно уу:"</string>
     <string name="wifi_ip_settings" msgid="4636102290236116946">"IP тохиргоо"</string>
     <string name="wifi_privacy_settings" msgid="4462092795794247809">"Нууцлал"</string>
     <string name="wifi_privacy_settings_ephemeral_summary" msgid="2411375348287064283">"Санамсаргүй сонгосон MAC"</string>
@@ -1066,7 +1066,7 @@
     <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">"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>
@@ -1178,10 +1178,10 @@
     <string name="color_mode_option_automatic" msgid="6572718611315165117">"Дасан зохицох"</string>
     <string name="color_mode_summary_natural" msgid="1247153893843263340">"Зөвхөн оновчтой өнгийг ашиглах"</string>
     <string name="color_mode_summary_automatic" msgid="6066740785261330514">"Тод болон оновчтой өнгө хооронд тохируулах"</string>
-    <string name="accelerometer_summary_on" product="tablet" msgid="5750977897791656412">"Таблетыг эргүүлбэл харагдацыг автоматаар эргүүлэх"</string>
-    <string name="accelerometer_summary_on" product="default" msgid="6454733048264875491">"Утсыг эргүүлбэл харагдацыг автоматаар эргүүлэх"</string>
-    <string name="accelerometer_summary_off" product="tablet" msgid="2663240868158338608">"Таблетыг эргүүлбэл харагдацыг автоматаар эргүүлэх"</string>
-    <string name="accelerometer_summary_off" product="default" msgid="3366996018631557687">"Утсыг эргүүлбэл харагдацыг автоматаар эргүүлэх"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="5750977897791656412">"Таблетыг эргүүлбэл харагдцыг автоматаар эргүүлэх"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="6454733048264875491">"Утсыг эргүүлбэл харагдцыг автоматаар эргүүлэх"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="2663240868158338608">"Таблетыг эргүүлбэл харагдцыг автоматаар эргүүлэх"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="3366996018631557687">"Утсыг эргүүлбэл харагдцыг автоматаар эргүүлэх"</string>
     <string name="brightness" msgid="7309120144111305275">"Гэрэлтүүлгийн түвшин"</string>
     <string name="brightness_title" msgid="5660190946911149690">"Тодролт"</string>
     <string name="brightness_summary" msgid="8687101964451818730">"Дэлгэцийн тодролыг тохируулах"</string>
@@ -1238,13 +1238,13 @@
     <string name="screen_timeout" msgid="1700950247634525588">"Идэвхгүй"</string>
     <string name="screen_timeout_title" msgid="150117777762864112">"Дэлгэц унтарна"</string>
     <string name="screen_timeout_summary" msgid="8644192861778491060">"Идвэхгүй <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> болсны дараа"</string>
-    <string name="wallpaper_settings_title" msgid="347390905813529607">"Ханын зураг"</string>
-    <string name="style_and_wallpaper_settings_title" msgid="8898539141152705754">"Загвар ба ханын зураг"</string>
+    <string name="wallpaper_settings_title" msgid="347390905813529607">"Дэлгэцийн зураг"</string>
+    <string name="style_and_wallpaper_settings_title" msgid="8898539141152705754">"Загвар ба дэлгэцийн зураг"</string>
     <string name="wallpaper_settings_summary_default" msgid="2626880032742784599">"Өгөгдмөл"</string>
     <string name="wallpaper_settings_summary_custom" msgid="8950504698015331202">"Захиалгат"</string>
-    <string name="wallpaper_suggestion_title" msgid="3012130414886743201">"Ханын зураг солих"</string>
+    <string name="wallpaper_suggestion_title" msgid="3012130414886743201">"Дэлгэцийн зураг солих"</string>
     <string name="wallpaper_suggestion_summary" msgid="4247262938988875842">"Дэлгэцээ өөрчлөх"</string>
-    <string name="wallpaper_settings_fragment_title" msgid="1503701065297188901">"Ханын зураг сонгох"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="1503701065297188901">"Дэлгэцийн зураг сонгох"</string>
     <string name="screensaver_settings_title" msgid="7720091234133721021">"Дэлгэц амраагч"</string>
     <string name="screensaver_settings_summary_either_long" msgid="6078038506795498288">"Цэнэглэх эсвэл суурилуулах үед"</string>
     <string name="screensaver_settings_summary_either_short" msgid="2453772128682850053">"Аль аль нь"</string>
@@ -1300,13 +1300,13 @@
     <string name="sim_change_data_message" msgid="51004703157782900">"Та <xliff:g id="CARRIER2_0">%2$s</xliff:g>-г мобайл датад ашиглаж байна. Хэрэв та <xliff:g id="CARRIER1">%1$s</xliff:g> руу сэлгэвэл <xliff:g id="CARRIER2_1">%2$s</xliff:g>-г мобайл датад ашиглах боломжгүй."</string>
     <string name="sim_change_data_ok" msgid="7491552537317573235">"<xliff:g id="CARRIER">%1$s</xliff:g>-г ашиглах"</string>
     <string name="sim_preferred_title" msgid="3389680276182899407">"Өөрийн сонгосон SIM картаа шинэчлэх үү?"</string>
-    <string name="sim_preferred_message" msgid="3751011329746359050">"Таны төхөөрөмжид зөвхөн <xliff:g id="NEW_SIM">%1$s</xliff:g> SIM байна. Та мобайл дата ашиглах, дуудлага хийх, SMS зурвасын үйлчилгээ авахын тулд энэ SIM-г ашиглах уу?"</string>
-    <string name="wrong_pin_code_pukked" msgid="3214670264775760428">"СИМ ПИН код буруу, та төхөөрөмжийн түгжээх тайлахын тулд өөрийн оператор компанитай холбоо барина уу."</string>
+    <string name="sim_preferred_message" msgid="3751011329746359050">"Таны төхөөрөмжид зөвхөн <xliff:g id="NEW_SIM">%1$s</xliff:g> SIM байна. Та мобайл дата ашиглах, дуудлага хийх, SMS мессежийн үйлчилгээ авахын тулд энэ SIM-г ашиглах уу?"</string>
+    <string name="wrong_pin_code_pukked" msgid="3214670264775760428">"SIM ПИН код буруу, та төхөөрөмжийн түгжээх тайлахын тулд өөрийн оператор компанитай холбоо барина уу."</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="2934318793525717627">
-      <item quantity="other">СИМ-ны ПИН код буруу байна. Та <xliff:g id="NUMBER_1">%d</xliff:g> удаа оролдлого хийх боломжтой байна.</item>
-      <item quantity="one">СИМ-ны ПИН код буруу байна. Танд мобайл оператортойгоо холбогдохгүйгээр төхөөрөмжийн түгжээг тайлахад <xliff:g id="NUMBER_0">%d</xliff:g> оролдлого хийх боломж үлдсэн байна.</item>
+      <item quantity="other">SIM-ны ПИН код буруу байна. Та <xliff:g id="NUMBER_1">%d</xliff:g> удаа оролдлого хийх боломжтой байна.</item>
+      <item quantity="one">SIM-ны ПИН код буруу байна. Танд мобайл оператортойгоо холбогдохгүйгээр төхөөрөмжийн түгжээг тайлахад <xliff:g id="NUMBER_0">%d</xliff:g> оролдлого хийх боломж үлдсэн байна.</item>
     </plurals>
-    <string name="pin_failed" msgid="4877356137480446727">"СИМ ПИН ажиллуулах амжилтгүй боллоо!"</string>
+    <string name="pin_failed" msgid="4877356137480446727">"SIM ПИН ажиллуулах амжилтгүй боллоо!"</string>
     <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">"Андройд хувилбар"</string>
@@ -1572,17 +1572,17 @@
     <string name="reset_dashboard_summary" msgid="8778383341461126642">"Сүлжээ, апп эсвэл төхөөрөмжийг шинэчлэх боломжтой"</string>
     <string name="reset_network_title" msgid="8944059136930806211">"Wi-Fi, мобайл &amp; Bluetooth-г шинэчлэх"</string>
     <string name="reset_network_desc" msgid="4982633363916261109">"Энэ нь дараах бүх сүлжээний тохиргоог шинэчилнэ: \n\n"<li>"Wi‑Fi"</li>\n<li>"мобайл дата"</li>\n<li>"Bluetooth"</li></string>
-    <string name="reset_esim_title" msgid="7630781767040831893">"Татаж авсан СИМ-үүдийг устгах"</string>
-    <string name="reset_esim_desc" msgid="433226911566802">"Солих СИМ-г татаж авахын тулд оператор компанитайгаа холбогдоно уу. Энэ нь мобайл үйлчилгээний ямар ч багцыг цуцлахгүй."</string>
+    <string name="reset_esim_title" msgid="7630781767040831893">"Татаж авсан SIM-үүдийг устгах"</string>
+    <string name="reset_esim_desc" msgid="433226911566802">"Солих SIM-г татаж авахын тулд оператор компанитайгаа холбогдоно уу. Энэ нь мобайл үйлчилгээний ямар ч багцыг цуцлахгүй."</string>
     <string name="reset_network_button_text" msgid="4293271046867912819">"Дахин тохируулах"</string>
     <string name="reset_network_final_desc" msgid="2463817067048751373">"Сүлжээний бүх тохиргоог шинэчлэх үү? Та энэ үйлдлийг буцаах боломжгүй."</string>
-    <string name="reset_network_final_desc_esim" msgid="4676436976372555750">"Сүлжээний бүх тохиргоог шинэчилж, татсан СИМ-үүдийг устгах уу? Та энэ үйлдлийг буцаах боломжгүй."</string>
+    <string name="reset_network_final_desc_esim" msgid="4676436976372555750">"Сүлжээний бүх тохиргоог шинэчилж, татсан SIM-үүдийг устгах уу? Та энэ үйлдлийг буцаах боломжгүй."</string>
     <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_esim_error_title" msgid="4728931209471875632">"СИМ-үүдийг устгаж чадсангүй"</string>
-    <string name="reset_esim_error_msg" msgid="4716366079119742235">"Татаж авсан СИМ-үүдийг алдааны улмаас устгах боломжгүй байна.\n\nТөхөөрөмжөө дахин эхлүүлээд дахин оролдоно уу."</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_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>
@@ -1601,7 +1601,7 @@
     <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">"Таны татаж авсан аппууд &amp; СИМ-үүд зэрэг бүх хувийн мэдээллийг устгана. Та энэ үйлдлийг буцаах боломжгүй."</string>
+    <string name="master_clear_final_desc_esim" msgid="3058919823436953662">"Таны татаж авсан аппууд &amp; SIM-үүд зэрэг бүх хувийн мэдээллийг устгана. Та энэ үйлдлийг буцаах боломжгүй."</string>
     <string name="master_clear_final_button_text" msgid="866772743886027768">"Бүгдийг устгах"</string>
     <string name="master_clear_failed" msgid="7588397453984229892">"Системийг Цэвэрлэх үйлчилгээг ашиглах боломжгүй байгаа учраас дахин шинэчлэх үйлдлийг гүйцэтгээгүй."</string>
     <string name="master_clear_confirm_title" msgid="698328669893512402">"Бүх өгөгдлийг устгах уу?"</string>
@@ -1643,7 +1643,7 @@
     <string name="network_scorer_change_active_dialog_text" msgid="4264089809189760730">"Өөрийн сүлжээнии холболтуудыг удирдахад <xliff:g id="NEW_APP">%1$s</xliff:g>-г <xliff:g id="CURRENT_APP">%2$s</xliff:g>-н оронд ашиглах уу?"</string>
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="6394483538843474495">"Сүлжээний холболтуудыг удирдахад <xliff:g id="NEW_APP">%s</xliff:g>-г ашиглах уу?"</string>
     <string name="mobile_unknown_sim_operator" msgid="872589370085135817">"Тодорхойгүй SIM оператор"</string>
-    <string name="mobile_no_provisioning_url" msgid="3216517414902166131">"<xliff:g id="OPERATOR">%1$s</xliff:g>-д мэдэгдэж буй хангалтын вэбсайт алга"</string>
+    <string name="mobile_no_provisioning_url" msgid="3216517414902166131">"<xliff:g id="OPERATOR">%1$s</xliff:g>-д мэдэгдэж буй хангалтын вебсайт алга"</string>
     <string name="mobile_insert_sim_card" msgid="7594550403454243732">"SIM карт оруулаад дахин эхлүүлнэ үү"</string>
     <string name="mobile_connect_to_internet" msgid="6031886097365170913">"Интернэтэд холбогдоно уу"</string>
     <string name="location_title" msgid="8664674161765477168">"Миний Байршил"</string>
@@ -1694,7 +1694,7 @@
     <string name="license_title" msgid="7582145947873528540">"Лиценз"</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" msgid="2941987966332943253">"Дэлгэцийн зураг"</string>
     <string name="wallpaper_attributions_values" msgid="4461979853894606323">"Сансрын зураг нийлүүлэгчид: \n © 2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_manual_activity_title" msgid="7599911755054286789">"Гар ажиллагаатай"</string>
     <string name="settings_manual_activity_unavailable" msgid="4872502775018655343">"Гар ажиллагааг ачаалах явцад алдаа гарлаа."</string>
@@ -2058,8 +2058,8 @@
     <string name="accessibility_preference_magnification_summary" msgid="753307741814376312">"Дэлгэцэд томруулах"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="5698545174944494486">"Томруулахын тулд 3 удаа дар"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="5418767043532322397">"Томруулахын тулд товчлуурыг товшино уу"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="3363006902079431772"><b>"Томруулахын тулд"</b>" дэлгэцийг 3 удаа хурдан товшино уу.\n"<ul><li>"Гүйлгэхийн тулд 2 эсвэл олон хуруугаараа чирнэ үү"</li>\n<li>"Томруулах хэмжээг тохируулахын тулд 2 эсвэл олон хуруугаараа чимхэнэ үү"</li></ul>\n\n<b>"Түр хугацаанд томруулахын тулд"</b>" дэлгэцийг 3 удаа товшиж, сүүлийн товшилтыг удаан дарна уу.\n"<ul><li>"Дэлгэцийг судлахын тулд чирнэ үү"</li>\n<li>"Жижигрүүлэхийн тулд хуруугаа өргөнө үү"</li></ul>\n\n"Та гар, навигацийн самбарт томруулах боломжгүй."</string>
-    <string name="accessibility_screen_magnification_navbar_summary" msgid="4726360285256503132">"Томруулах сонголт асаалттай үед хурдан томруулахын тулд дэлгэцийн доор байрлах Хүртээмжийн товчлуурыг ашиглана уу.\n\n"<b>"Томруулахын тулд"</b>" Хүртээмжийн товчлуурыг товшоод, дэлгэцийг дарна уу.\n"<ul><li>"Гүйлгэхийн тулд 2 эсвэл олон хуруугаараа чирнэ үү"</li>\n<li>"Томруулах хэмжээг тохируулахын тулд 2 эсвэл олон хуруугаараа чимхэнэ үү"</li></ul>\n\n<b>"Түр хугацаанд томруулахын тулд"</b>" Хүртээмжийн товчлуурыг товшиж, дэлгэцийг удаан дарна уу.\n"<ul><li>"Дэлгэцийг судлахын тулд чирнэ үү"</li>\n<li>"Жижигрүүлэхийн тулд хуруугаа өргөнө үү"</li></ul>\n\n"Та гар, навигацийн самбарт томруулах боломжгүй."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="3363006902079431772"><b>"Томруулахын тулд"</b>" дэлгэцийг 3 удаа хурдан товшино уу.\n"<ul><li>"Гүйлгэхийн тулд 2 эсвэл олон хуруугаараа чирнэ үү"</li>\n<li>"Томруулах хэмжээг тохируулахын тулд 2 эсвэл олон хуруугаараа чимхэнэ үү"</li></ul>\n\n<b>"Түр хугацаанд томруулахын тулд"</b>" дэлгэцийг 3 удаа товшиж, сүүлийн товшилтыг удаан дарна уу.\n"<ul><li>"Дэлгэцийг судлахын тулд чирнэ үү"</li>\n<li>"Жижигрүүлэхийн тулд хуруугаа өргөнө үү"</li></ul>\n\n"Та гар, навигацын самбарт томруулах боломжгүй."</string>
+    <string name="accessibility_screen_magnification_navbar_summary" msgid="4726360285256503132">"Томруулах сонголт асаалттай үед хурдан томруулахын тулд дэлгэцийн доор байрлах Хүртээмжийн товчлуурыг ашиглана уу.\n\n"<b>"Томруулахын тулд"</b>" Хүртээмжийн товчлуурыг товшоод, дэлгэцийг дарна уу.\n"<ul><li>"Гүйлгэхийн тулд 2 эсвэл олон хуруугаараа чирнэ үү"</li>\n<li>"Томруулах хэмжээг тохируулахын тулд 2 эсвэл олон хуруугаараа чимхэнэ үү"</li></ul>\n\n<b>"Түр хугацаанд томруулахын тулд"</b>" Хүртээмжийн товчлуурыг товшиж, дэлгэцийг удаан дарна уу.\n"<ul><li>"Дэлгэцийг судлахын тулд чирнэ үү"</li>\n<li>"Жижигрүүлэхийн тулд хуруугаа өргөнө үү"</li></ul>\n\n"Та гар, навигацын самбарт томруулах боломжгүй."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="6477234309484795550">"Хүртээмжийн товчлуурыг <xliff:g id="SERVICE">%1$s</xliff:g> болгож тохируулсан. Томруулахын тулд Хүртээмжийн товчлуурыг удаан дараад, томруулахыг сонгоно уу."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="3842279082831426816">"Дууны түвшний товчлол"</string>
     <string name="accessibility_shortcut_service_title" msgid="3516052294376744060">"Товчлолын үйлчилгээ"</string>
@@ -2084,7 +2084,7 @@
     <string name="accessibility_content_timeout_preference_title" msgid="5160746882250939464">"Унших хугацаа"</string>
     <string name="accessibility_control_timeout_preference_title" msgid="2771808346038759474">"Үйлдэл хийх хугацаа"</string>
     <string name="accessibility_content_timeout_preference_summary" msgid="853829064617918179">"Та унших шаардлагатай хэдий ч зөвхөн түр хугацаанд харагддаг мессежийг хэр удаан харуулахыг сонгоно уу.\n\nЗарим апп энэ тохиргоог дэмждэггүй."</string>
-    <string name="accessibility_control_timeout_preference_summary" msgid="8582212299606932160">"Танаас үйлдэл хийхийг шаарддаг хэдий ч зөвхөн түр хугацаанд харагддаг зурвасыг хэр удаан хугацаагаар харуулахыг сонгоно уу.\n\nЗарим апп энэ тохиргоог дэмждэггүй."</string>
+    <string name="accessibility_control_timeout_preference_summary" msgid="8582212299606932160">"Танаас үйлдэл хийхийг шаарддаг хэдий ч зөвхөн түр хугацаанд харагддаг мессежийг хэр удаан хугацаагаар харуулахыг сонгоно уу.\n\nЗарим апп энэ тохиргоог дэмждэггүй."</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="5029685114164868477">"Хүрээд &amp; барьж хүлээх"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="3852635518618938998">"Өнгө хувиргалт"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="69291255322175323">"Үзүүлбэрт нөлөөлж болзошгүй"</string>
@@ -2279,7 +2279,7 @@
     <string name="battery_tip_smart_battery_summary" msgid="5344821856478265778">"Батерейны менежерийг асаах"</string>
     <string name="battery_tip_early_heads_up_title" msgid="707163785378746813">"Батарей хэмнэгчийг асаах"</string>
     <string name="battery_tip_early_heads_up_summary" msgid="4231489566422395156">"Батарей ердийн үеийнхээс хурдан дуусаж болзошгүй"</string>
-    <string name="battery_tip_early_heads_up_done_title" msgid="112550885882648429">"Тэжээл хэмнэгч асаалттай байна"</string>
+    <string name="battery_tip_early_heads_up_done_title" msgid="112550885882648429">"Батарей хэмнэгч асаалттай байна"</string>
     <string name="battery_tip_early_heads_up_done_summary" msgid="8692257022962771181">"Зарим онцлогийг хязгаарласан байж болзошгүй"</string>
     <string name="battery_tip_high_usage_title" product="default" msgid="4103005178310487352">"Утсыг ердийнхөөс их хэмжээгээр ашигласан"</string>
     <string name="battery_tip_high_usage_title" product="tablet" msgid="1019583260005768965">"Таблетыг ердийнхөөс их хэмжээгээр ашигласан"</string>
@@ -2563,7 +2563,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>
@@ -2629,9 +2629,9 @@
     <string name="remove_account_label" msgid="5885425720323823387">"Бүртгэлийг хасах"</string>
     <string name="header_add_an_account" msgid="8482614556580804956">"Бүртгэл нэмэх"</string>
     <string name="really_remove_account_title" msgid="4166512362915154319">"Бүртгэлийг арилгах уу?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Энэ акаунтыг арилгаснаас үүний бүх зурвас, харилцагчид болон бусад өгөгдлүүдийг таблетаас устгах болно!"</string>
-    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Энэ бүртгэлийг хассанаар үүний бүх зурвас, харилцагчид, бусад өгөгдлийг утаснаас устгах болно!"</string>
-    <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Энэ бүртгэлийг устгаснаар үүний бүх зурвас, харилцагч болон бусад өгөгдлийг төхөөрөмжөөс устгана!"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Энэ акаунтыг арилгаснаас үүний бүх мессеж, харилцагчид болон бусад өгөгдлүүдийг таблетаас устгах болно!"</string>
+    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Энэ бүртгэлийг хассанаар үүний бүх мессеж, харилцагчид, бусад өгөгдлийг утаснаас устгах болно!"</string>
+    <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Энэ бүртгэлийг хассанаар үүний бүх мессеж, харилцагч болон бусад өгөгдлийг төхөөрөмжөөс устгана!"</string>
     <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>
@@ -2704,8 +2704,8 @@
     <string name="data_usage_app_restrict_dialog" msgid="4022530391896478031">"Зөвхөн мобайл сүлжээ байгаа тохиолдолд энэ функц далд датанаас шалтгаалдаг апп-н ажиллагааг зогсоож болно.\n\nТа апп доторх тохиргооноос илүү тохиромжтой дата ашиглалтын хяналтыг олж болно."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="18928292832775805">"Арын датаг мобайл датаны хязгаарыг тохируулсны дараа хязгаарлах боломжтой."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2342323408229702005">"Өгөгдлийг автоматаар синк хийхийг асаах уу?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="4935430284683238901">"Таны вэб дээр өөрийн бүртгэлд оруулсан бүх өөрчлөлт таны таблет руу автоматаар хуулагдах болно.\n\nЗарим бүртгэл нь таны таблет дээр оруулсан аливаа өөрчлөлтийг мөн автоматаар вэб рүү хуулж болно. Google бүртгэл ийм маягаар ажилладаг."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="5004823486046340090">"Таны вэб дээрээс бүртгэлдээ оруулсан бүх өөрчлөлт автоматаар таны утсанд хуулагдах болно.\n\nЗарим бүртгэл нь таны утсан дээрээс оруулсан өөрчлөлтийг вэб рүү автоматаар хуулж болно. Google бүртгэл ингэж ажилладаг."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="4935430284683238901">"Таны веб дээр өөрийн бүртгэлд оруулсан бүх өөрчлөлт таны таблет руу автоматаар хуулагдах болно.\n\nЗарим бүртгэл нь таны таблет дээр оруулсан аливаа өөрчлөлтийг мөн автоматаар веб рүү хуулж болно. Google бүртгэл ийм маягаар ажилладаг."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="5004823486046340090">"Таны веб дээрээс бүртгэлдээ оруулсан бүх өөрчлөлт автоматаар таны утсанд хуулагдах болно.\n\nЗарим бүртгэл нь таны утсан дээрээс оруулсан өөрчлөлтийг веб рүү автоматаар хуулж болно. Google бүртгэл ингэж ажилладаг."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="7105334544291643305">"Автоматаар өгөгдлийг синк хийхийг унтраах уу?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4057984234450947964">"Энэ нь дата болон зайны цэнэг ашиглалтыг хэмнэх боловч та сүүлийн үеийн мэдээллийг цуглуулахын тулд бүртгэл бүрийг гараар синк хийх шаардлагатай болно. Мөн шинэчлэлт хийгдсэн үед танд мэдэгдэл ирэхгүй."</string>
     <string name="data_usage_cycle_editor_title" msgid="4967309390043599889">"Ашиглалтын циклийг шинэчлэх огноо"</string>
@@ -2835,12 +2835,12 @@
       <item quantity="one">Сертификатад итгэх, эсвэл устгах</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="9046046586061880100">
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> сертификатын эрхийг таны төхөөрөмжид суулгасан бөгөөд үүнд имэйл, апп, аюулгүй вэб хуудас зэрэг таны төхөөрөмжийн сүлжээний үйл ажиллагааг удирдах зөвшөөрлийг олгоно.\n\nЭдгээр сертификатын талаарх дэлгэрэнгүй мэдээлэл авахын тулд админтайгаа холбоо барина уу.</item>
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> сертификатын эрхийг таны төхөөрөмжид суулгасан бөгөөд тэдгээрт имэйл, апп, аюулгүй вэб хуудас зэрэг таны төхөөрөмжийн сүлжээний үйл ажиллагааг удирдах зөвшөөрлийг олгоно.\n\nЭнэ сертификатын талаарх дэлгэрэнгүй мэдээлэл авахын тулд админтайгаа холбоо барина уу.</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> сертификатын эрхийг таны төхөөрөмжид суулгасан бөгөөд үүнд имэйл, апп, аюулгүй веб хуудас зэрэг таны төхөөрөмжийн сүлжээний үйл ажиллагааг удирдах зөвшөөрлийг олгоно.\n\nЭдгээр сертификатын талаарх дэлгэрэнгүй мэдээлэл авахын тулд админтайгаа холбоо барина уу.</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> сертификатын эрхийг таны төхөөрөмжид суулгасан бөгөөд тэдгээрт имэйл, апп, аюулгүй веб хуудас зэрэг таны төхөөрөмжийн сүлжээний үйл ажиллагааг удирдах зөвшөөрлийг олгоно.\n\nЭнэ сертификатын талаарх дэлгэрэнгүй мэдээлэл авахын тулд админтайгаа холбоо барина уу.</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="8271858091418779584">
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> сертификатын эрхийг таны ажлын профайлд суулгасан бөгөөд үүнд имэйл, апп, аюулгүй вэб хуудас зэрэг таны ажлын сүлжээний үйл ажиллагааг удирдах зөвшөөрлийг олгоно.\n\nЭдгээр сертификатын талаарх дэлгэрэнгүй мэдээлэл авахын тулд админтайгаа холбоо барина уу.</item>
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> сертификатын эрхийг таны ажлын профайлд суулгасан бөгөөд тэдгээрт имэйл, апп, аюулгүй вэб хуудас зэрэг таны төхөөрөмжийн сүлжээний үйл ажиллагааг удирдах зөвшөөрлийг олгоно.\n\nЭнэ сертификатын талаарх дэлгэрэнгүй мэдээлэл авахын тулд админтайгаа холбоо барина уу.</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> сертификатын эрхийг таны ажлын профайлд суулгасан бөгөөд үүнд имэйл, апп, аюулгүй веб хуудас зэрэг таны ажлын сүлжээний үйл ажиллагааг удирдах зөвшөөрлийг олгоно.\n\nЭдгээр сертификатын талаарх дэлгэрэнгүй мэдээлэл авахын тулд админтайгаа холбоо барина уу.</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> сертификатын эрхийг таны ажлын профайлд суулгасан бөгөөд тэдгээрт имэйл, апп, аюулгүй веб хуудас зэрэг таны төхөөрөмжийн сүлжээний үйл ажиллагааг удирдах зөвшөөрлийг олгоно.\n\nЭнэ сертификатын талаарх дэлгэрэнгүй мэдээлэл авахын тулд админтайгаа холбоо барина уу.</item>
     </plurals>
     <string name="ssl_ca_cert_warning_message" msgid="8692156828262606685">"Гуравдагч талын этгээд таны имэйл, апп-ууд болон аюулгүй вебсайтууд гэх мэтийг оруулан таны сүлжээний үйл ажиллагааг хянах боломжтой.\n\nТаны төхөөрөмж дээр суулгасан итгэмжлэгдсэн жуухын тусламжтайгаар ингэх боломжтой."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="3227175122066058245">
@@ -2870,7 +2870,7 @@
     <string name="user_add_user_item_title" msgid="6835385073795492410">"Хэрэглэгч"</string>
     <string name="user_add_profile_item_title" msgid="4932743891449790664">"Хязгаарлагдсан профайл"</string>
     <string name="user_add_user_title" msgid="2320897397066676472">"Шинэ хэрэглэгч нэмэх үү?"</string>
-    <string name="user_add_user_message_long" msgid="686637203224195465">"Та нэмэлт хэрэглэгч үүсгэх замаар бусад хүнтэй энэ төхөөрөмжийг хуваалцаж болно. Хэрэглэгч тус бүр апп, ханын цаас болон бусад зүйлээ өөрчлөх боломжтой хувийн орон зайтай байдаг. Түүнчлэн хэрэглэгч нь бүх хэрэглэгчид нөлөөлөх боломжтой Wi-Fi зэрэг төхөөрөмжийн тохиргоог өөрчлөх боломжтой.\n\nХэрэв та шинэ хэрэглэгч нэмэх бол тухайн хүн хувийн орон зайгаа тохируулах ёстой.\n\nХэрэглэгч бүр бусад бүх хэрэглэгчийн өмнөөс апп шинэчилж болно. Хандалтын тохиргоо болон үйлчилгээг шинэ хэрэглэгчид шилжүүлэх боломжгүй байж болзошгүй."</string>
+    <string name="user_add_user_message_long" msgid="686637203224195465">"Та нэмэлт хэрэглэгч үүсгэх замаар бусад хүнтэй энэ төхөөрөмжийг хуваалцаж болно. Хэрэглэгч тус бүр апп, дэлгэцийн зураг болон бусад зүйлээ өөрчлөх боломжтой хувийн орон зайтай байдаг. Түүнчлэн хэрэглэгч нь бүх хэрэглэгчид нөлөөлөх боломжтой Wi-Fi зэрэг төхөөрөмжийн тохиргоог өөрчлөх боломжтой.\n\nХэрэв та шинэ хэрэглэгч нэмэх бол тухайн хүн хувийн орон зайгаа тохируулах ёстой.\n\nХэрэглэгч бүр бусад бүх хэрэглэгчийн өмнөөс апп шинэчилж болно. Хандалтын тохиргоо болон үйлчилгээг шинэ хэрэглэгчид шилжүүлэх боломжгүй байж болзошгүй."</string>
     <string name="user_add_user_message_short" msgid="1802594476285458254">"Та шинэ хэрэглэгч нэмбэл тухайн хүн өөрийн профайлыг тохируулах шаардлагатай.\n\nАль ч хэрэглэгч бүх хэрэглэгчийн аппуудыг шинэчлэх боломжтой."</string>
     <string name="user_setup_dialog_title" msgid="6748950002206392396">"Хэрэглэгчийг одоо тохируулах уу?"</string>
     <string name="user_setup_dialog_message" msgid="2988559933258353919">"Хэрэглэгч төхөөрөмжийг авч өөрийн профайлыг тохируулах боломжтой эсэхийг шалгана уу"</string>
@@ -2900,7 +2900,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">"Утасны дуудлага &amp; SMS авах"</string>
@@ -2985,8 +2985,8 @@
     <string name="user_image_choose_photo" msgid="4920315415203051898">"Зураг сонгох"</string>
     <string name="user_image_photo_selector" msgid="8429694590849882411">"Зураг сонгох"</string>
     <string name="regulatory_info_text" msgid="9112993912873512834"></string>
-    <string name="sim_setup_wizard_title" msgid="77627575294867180">"СИМ карт"</string>
-    <string name="sim_settings_title" msgid="8818243954752261922">"СИМ карт"</string>
+    <string name="sim_setup_wizard_title" msgid="77627575294867180">"SIM карт"</string>
+    <string name="sim_settings_title" msgid="8818243954752261922">"SIM карт"</string>
     <string name="sim_settings_summary" msgid="6516330865408217800">"<xliff:g id="SIM_NAME">%1$s</xliff:g> - <xliff:g id="SIM_NUMBER">%2$s</xliff:g>"</string>
     <string name="sim_cards_changed_message" msgid="1012486903583092731">"SIM карт өөрчлөгдсөн"</string>
     <string name="sim_cards_changed_message_summary" msgid="5753692480107865077">"Үйл ажиллагааг тохируулахын тулд дарна уу"</string>
@@ -3059,7 +3059,7 @@
     <string name="keywords_time_zone" msgid="1571973084865023954">"цагийн бүс"</string>
     <string name="keywords_draw_overlay" msgid="3855954419750744775">"Чатны толгой"</string>
     <string name="keywords_flashlight" msgid="7733996050628473024">"Гэрэлтүүлэгч, Гэрэл, Гар чийдэн"</string>
-    <string name="keywords_change_wifi_state" msgid="7697524907886303535">"wifi, wi-fi, унтраах/асаах, хяналт"</string>
+    <string name="keywords_change_wifi_state" msgid="7697524907886303535">"wifi, wi-fi, асаах/унтраах, хяналт"</string>
     <string name="keywords_more_mobile_networks" msgid="5605342743169059942">"үүрэн холбоо, үүрэн холбооны оператор, утасгүй интернэт, дата, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="3554052148729818521">"wifi, wi-fi, залгах, дуудлага"</string>
     <string name="keywords_display" msgid="355147521915213375">"дэлгэц, мэдрэгчтэй дэлгэц"</string>
@@ -3102,7 +3102,7 @@
     <string name="keywords_imei_info" msgid="4325847870422053408">"imei, meid, min, prl хувилбар, imei sv"</string>
     <string name="keywords_sim_status" msgid="3852088576719874387">"сүлжээ, мобайл сүлжээний төлөв, үйлчилгээний төлөв, дохионы хүч, мобайл сүлжээний төрөл, роуминг, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="2743197096210895251">"серийн дугаар, техник хангамжийн хувилбар"</string>
-    <string name="keywords_android_version" msgid="4842749998088987740">"андройдын аюулгүй байдлын patch-н түвшин, долгион баригчийн хувилбар, кернел хувилбар"</string>
+    <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>
@@ -3271,8 +3271,8 @@
     <string name="zen_custom_settings_dialog_ok" msgid="3572754922025853427">"Ойлголоо"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7469592764589354302">"Мэдэгдэл"</string>
     <string name="zen_custom_settings_duration_header" msgid="1806465684026300942">"Үргэлжлэх хугацаа"</string>
-    <string name="zen_msg_event_reminder_title" msgid="8685224436389816905">"Зурвас, арга хэмжээ &amp; сануулагч"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="164400918479831580">"Бүү саад бол горим асаалттай үед зурвас, сануулагч, үйл ажиллагааны дууг таны зөвшөөрснөөс бусад зүйлд хаах болно. Та найз нөхөд, гэр бүлийнхэн эсвэл бусад харилцагчдаа тантай холбоо барихыг зөвшөөрөхийн тулд зурвасын тохиргоог өөрчлөх боломжтой."</string>
+    <string name="zen_msg_event_reminder_title" msgid="8685224436389816905">"Мессеж, арга хэмжээ &amp; сануулагч"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="164400918479831580">"Бүү саад бол горим асаалттай үед мессеж, сануулагч, үйл ажиллагааны дууг таны зөвшөөрснөөс бусад зүйлд хаах болно. Та найз нөхөд, гэр бүлийнхэн эсвэл бусад харилцагчдаа тантай холбоо барихыг зөвшөөрөхийн тулд мессежын тохиргоог өөрчлөх боломжтой."</string>
     <string name="zen_onboarding_ok" msgid="6403635918125323678">"Дууссан"</string>
     <string name="zen_onboarding_settings" msgid="1416466597876383322">"Тохиргоо"</string>
     <string name="zen_onboarding_new_setting_title" msgid="3622673375041304362">"Мэдэгдэл харагдахгүй бөгөөд дуугарахгүй"</string>
@@ -3363,15 +3363,17 @@
     <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.format failed for translation -->
-    <!-- no translation found for manage_notification_access_summary_nonzero (8496218948429646792) -->
+    <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="8496218948429646792">
+      <item quantity="other">%d апп нь мэдэгдэл унших боломжтой байна</item>
+      <item quantity="one">%d апп нь мэдэгдэл унших боломжтой байна</item>
+    </plurals>
     <string name="notification_assistant_title" msgid="8216604031352764011">"Мэдэгдлийн туслах"</string>
     <string name="no_notification_assistant" msgid="9140123568386413264">"Туслах алга"</string>
     <string name="no_notification_listeners" msgid="1366386609506834717">"Суулгасан апп-аас мэдэгдлийн хандалт хүссэн апп байхгүй байна."</string>
     <string name="notification_assistant_security_warning_title" msgid="4190584438086738496">"<xliff:g id="SERVICE">%1$s</xliff:g>-н мэдэгдлийн хандалтыг зөвшөөрөх үү?"</string>
-    <string name="notification_assistant_security_warning_summary" msgid="6924513399671031930">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> харилцагчийн нэрс болон таны хүлээн авдаг зурвасын текст зэрэг хувийн мэдээлэл бүхий бүх мэдэгдлийг унших болон мэдэгдлийг өөрчлөх эсвэл хаах буюу тэдгээр доторх үйлдлийн товчлуурыг хэрэгсэхгүй болгох боломжтой болно. \n\nМөн энэ нь аппад Бүү саад бол горимыг асаах, унтраах болон үүнтэй холбоотой тохиргоог өөрчлөхийг зөвшөөрнө."</string>
+    <string name="notification_assistant_security_warning_summary" msgid="6924513399671031930">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> харилцагчийн нэрс болон таны хүлээн авдаг мессежийн текст зэрэг хувийн мэдээлэл бүхий бүх мэдэгдлийг унших болон мэдэгдлийг өөрчлөх эсвэл хаах буюу тэдгээр доторх үйлдлийн товчлуурыг хэрэгсэхгүй болгох боломжтой болно. \n\nМөн энэ нь аппад Бүү саад бол горимыг асаах, унтраах болон үүнтэй холбоотой тохиргоог өөрчлөхийг зөвшөөрнө."</string>
     <string name="notification_listener_security_warning_title" msgid="4902253246428777797">"<xliff:g id="SERVICE">%1$s</xliff:g>-д мэдэгдлийн хандалтыг зөвшөөрөх үү?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="4454702907350100288">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> нь харилцагчдын нэрс, ирсэн зурвас зэрэг таны хувийн мэдээлэл бүхий бүх мэдэгдлийг унших боломжтой бөгөөд мэдэгдлийг хаах, тэдгээрийн доторх үйлдлийн товчлуурыг хэрэгсэхгүй болгох боломжтой. \n\nМөн энэ нь апп-г \'Бүү саад бол\' тохиргоог асаах, унтраах болон үүнтэй холбоотой тохиргоог өөрчлөхийг зөвшөөрнө."</string>
+    <string name="notification_listener_security_warning_summary" msgid="4454702907350100288">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> нь харилцагчдын нэрс, ирсэн мессеж зэрэг таны хувийн мэдээлэл бүхий бүх мэдэгдлийг унших боломжтой бөгөөд мэдэгдлийг хаах, тэдгээрийн доторх үйлдлийн товчлуурыг хэрэгсэхгүй болгох боломжтой. \n\nМөн энэ нь апп-г \'Бүү саад бол\' тохиргоог асаах, унтраах болон үүнтэй холбоотой тохиргоог өөрчлөхийг зөвшөөрнө."</string>
     <string name="notification_listener_disable_warning_summary" msgid="162165151519082978">"Хэрэв та <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>-н мэдэгдлийн хандалтыг унтраавал Бүү саад бол хандалт мөн адил унтрах болно."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="7863495391671154188">"Унтраах"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="6264631825225298458">"Цуцлах"</string>
@@ -3553,7 +3555,7 @@
     <string name="switch_on_text" msgid="7100491749799298324">"Идэвхтэй"</string>
     <string name="switch_off_text" msgid="3539551289454353555">"Идэвхгүй"</string>
     <string name="screen_pinning_title" msgid="578020318289781102">"Дэлгэц тогтоох"</string>
-    <string name="screen_pinning_description" msgid="3814537379086412278">"Энэ тохиргоо асаалттай үед та одоогийн дэлгэцийг тогтоохоо болих хүртлээ үргэлжлүүлэн харуулахын тулд дэлгэц тогтоох онцлогийг ашиглах боломжтой.\n\nДэлгэц тогтоох онцлогийг ашиглахын тулд:\n\n1. Дэлгэц тогтоох онцлог асаалттай эсэхийг шалгах\n\n2. Тоймыг нээх\n\n3. Дэлгэцийн дээд хэсгийн аппын дүрс тэмдгийг товшиж Тогтоох гэснийг товшино уу"</string>
+    <string name="screen_pinning_description" msgid="3814537379086412278">"Энэ тохиргоо асаалттай үед та одоогийн дэлгэцийг бэхлэхээ болиулах хүртэл үргэлжлүүлэн харуулахын тулд дэлгэц бэхлэх онцлогийг ашиглах боломжтой.\n\nДэлгэц бэхлэх онцлогийг ашиглахын тулд:\n\n1. Дэлгэц бэхлэх онцлог асаалттай эсэхийг шалгах\n\n2. Тоймыг нээх\n\n3. Дэлгэцийн дээд хэсгийн аппын дүрс тэмдгийг товшиж Бэхлэх гэснийг товшино уу"</string>
     <string name="screen_pinning_unlock_pattern" msgid="1060334707088339444">"Тогтоосныг суллахаас өмнө түгжээ тайлах хээ асуух"</string>
     <string name="screen_pinning_unlock_pin" msgid="1441705536015645023">"Бэхэлснийг болиулахаасаа өмнө PIN асуух"</string>
     <string name="screen_pinning_unlock_password" msgid="1017776884000170841">"Тогтоосныг суллахаас өмнө нууц үг асуух"</string>
@@ -3563,15 +3565,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">"Та цаашид энэ төхөөрөмжийг хамгаалахын тулд эхлүүлэхээс нь өмнө ПИН шаардах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд ПИН шаардах уу?"</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">"Төхөөрөмжийнхөө түгжээг тайлахын тулд хурууны хээгээ ашиглах бол та цаашид төхөөрөмжийг эхлүүлэхээс өмнө ПИН шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд ПИН шаардах уу?"</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">"Нэмж дурдахад та царайгаа ашиглаж төхөөрөмжийнхөө түгжээг тайлсан ч цаашид төхөөрөмжийг эхлүүлэхээс өмнө ПИН шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд ПИН шаардах уу?"</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">"Та цаашид энэ төхөөрөмжийг хамгаалахын тулд эхлүүлэхээс нь өмнө ПИН шаардах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, мессеж, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд ПИН шаардах уу?"</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">"Төхөөрөмжийнхөө түгжээг тайлахын тулд хурууны хээгээ ашиглах бол та цаашид төхөөрөмжийг эхлүүлэхээс өмнө ПИН шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, мессеж, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд ПИН шаардах уу?"</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">"Нэмж дурдахад та царайгаа ашиглаж төхөөрөмжийнхөө түгжээг тайлсан ч цаашид төхөөрөмжийг эхлүүлэхээс өмнө ПИН шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, мессеж, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд ПИН шаардах уу?"</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>
@@ -3669,7 +3671,7 @@
     <string name="assistant_security_warning_disagree" msgid="4217490999193100459">"Зөвшөөрөхгүй"</string>
     <string name="choose_voice_input_title" msgid="5369311838580756359">"Дууны оролтыг сонгох"</string>
     <string name="default_browser_title" msgid="4933937500898014977">"Хөтөч апп"</string>
-    <string name="default_browser_title_none" msgid="46431244274747124">"Үндсэн вэб хөтөч байхгүй"</string>
+    <string name="default_browser_title_none" msgid="46431244274747124">"Үндсэн веб хөтөч байхгүй"</string>
     <string name="default_phone_title" msgid="6038690021912575740">"Гар утасны апп"</string>
     <string name="roles_title" msgid="2825063787446244357">"Үүрэг"</string>
     <string name="default_app" msgid="8861276008866619872">"(Үндсэн)"</string>
@@ -3859,8 +3861,8 @@
     <string name="storage_summary" msgid="4835916510511133784">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> ашигласан - <xliff:g id="FREE_SPACE">%2$s</xliff:g> сул"</string>
     <string name="storage_summary_with_sdcard" msgid="8742907204848352697">"Дотоод сан: <xliff:g id="PERCENTAGE">%1$s</xliff:g>-г ашигласан - <xliff:g id="FREE_SPACE">%2$s</xliff:g> сул"</string>
     <string name="display_summary" msgid="5725269449657325797">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> идэвхгүй байсны дараа унтах"</string>
-    <string name="display_dashboard_summary" msgid="7678566148167010682">"Ханын зураг, идэвхгүй, фонтын хэмжээ"</string>
-    <string name="display_dashboard_summary_with_style" msgid="8981059474501210956">"Загвар ба ханын зураг, идэвхгүй горим, фонтын хэмжээ"</string>
+    <string name="display_dashboard_summary" msgid="7678566148167010682">"Дэлгэцийн зураг, идэвхгүй, фонтын хэмжээ"</string>
+    <string name="display_dashboard_summary_with_style" msgid="8981059474501210956">"Загвар ба дэлгэцийн зураг, идэвхгүй горим, фонтын хэмжээ"</string>
     <string name="display_dashboard_nowallpaper_summary" msgid="8612534364908229000">"Идэвхгүй, фонтын хэмжээ"</string>
     <string name="display_summary_example" msgid="4555020581960719296">"10 минут идэвхгүй байсны дараа унтах"</string>
     <string name="memory_summary" msgid="9121871336058042600">"Ойролцоогоор <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>-н <xliff:g id="USED_MEMORY">%1$s</xliff:g> санах ойг ашигласан"</string>
@@ -3891,7 +3893,7 @@
     <string name="condition_zen_title" msgid="2128184708916052585">"Бүү саад бол горим асаалттай байна"</string>
     <string name="condition_zen_summary_phone_muted" msgid="4396050395522974654">"Утасны дууг хаасан"</string>
     <string name="condition_zen_summary_with_exceptions" msgid="3435216391993785818">"Онцгой тохиолдолд"</string>
-    <string name="condition_battery_title" msgid="6704870010912986274">"Тэжээл хэмнэгч асаалттай"</string>
+    <string name="condition_battery_title" msgid="6704870010912986274">"Батарей хэмнэгч асаалттай"</string>
     <string name="condition_battery_summary" msgid="1236078243905690620">"Онцлогуудыг хязгаарласан"</string>
     <string name="condition_cellular_title" msgid="6605277435894307935">"Мобайл дата унтраалттай байна"</string>
     <string name="condition_cellular_summary" msgid="3607459310548343777">"Интернэтэд зөвхөн Wi‑Fi-р холбогдох боломжтой байна"</string>
@@ -3994,9 +3996,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>
@@ -4172,7 +4174,7 @@
     <string name="enterprise_privacy_device_access_category" msgid="2967602674816237833">"Таны энэ төхөөрөмж дэх хандалт"</string>
     <string name="enterprise_privacy_enterprise_data" msgid="6551504749971424942">"Имэйл, хуанли зэрэг таны ажлын бүртгэлтэй холбоотой өгөгдөл"</string>
     <string name="enterprise_privacy_installed_packages" msgid="4376014821459811800">"Таны төхөөрөмжийн аппын жагсаалт"</string>
-    <string name="enterprise_privacy_usage_stats" msgid="445762931318731975">"Апп тус бүрт зарцуулсан цаг, дата"</string>
+    <string name="enterprise_privacy_usage_stats" msgid="445762931318731975">"Апп тус бүрд зарцуулсан цаг, дата"</string>
     <string name="enterprise_privacy_network_logs" msgid="5427398751599441159">"Хамгийн сүүлийн сүлжээний ачааллын бүртгэл"</string>
     <string name="enterprise_privacy_bug_reports" msgid="283443567328836380">"Хамгийн сүүлийн алдааны тайлан"</string>
     <string name="enterprise_privacy_security_logs" msgid="8936969480449604726">"Хамгийн сүүлийн үеийн аюулгүй байдлын лог"</string>
@@ -4390,8 +4392,8 @@
     <string name="calls_and_sms_ask_every_time" msgid="2776167541223210738">"Тухай бүрд асуух"</string>
     <string name="mobile_network_summary_add_a_network" msgid="5408745221357144009">"Сүлжээ нэмэх"</string>
     <plurals name="mobile_network_summary_count" formatted="false" msgid="6222822873390636020">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> СИМ</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> СИМ</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> SIM</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> SIM</item>
     </plurals>
     <string name="default_for_calls" msgid="8706651147900549897">"Дуудлагын өгөгдмөл"</string>
     <string name="default_for_sms" msgid="5180640397787496162">"SMS-н өгөгдмөл"</string>
@@ -4403,24 +4405,24 @@
     <string name="mobile_network_in_range" msgid="9205757267706176023">"Хүрээнд байгаа"</string>
     <string name="mobile_network_not_in_range" msgid="3772644769833809436">"Хүрээнд байхгүй"</string>
     <string name="mobile_network_list_add_more" msgid="65420172175416318">"Бусад мобайл үйлчилгээг нэмэх"</string>
-    <string name="mobile_network_active_sim" msgid="7660119090716084589">"Идэвхтэй / СИМ"</string>
-    <string name="mobile_network_inactive_sim" msgid="8296195866147486039">"Идэвхгүй / СИМ"</string>
-    <string name="mobile_network_active_esim" msgid="2919290915755581140">"Идэвхтэй / Татаж авсан СИМ"</string>
-    <string name="mobile_network_inactive_esim" msgid="6525747163540293028">"Идэвхгүй / Татаж авсан СИМ"</string>
-    <string name="mobile_network_sim_name" msgid="8228870017368926761">"СИМ-ийн нэр"</string>
+    <string name="mobile_network_active_sim" msgid="7660119090716084589">"Идэвхтэй / SIM"</string>
+    <string name="mobile_network_inactive_sim" msgid="8296195866147486039">"Идэвхгүй / SIM"</string>
+    <string name="mobile_network_active_esim" msgid="2919290915755581140">"Идэвхтэй / Татаж авсан SIM"</string>
+    <string name="mobile_network_inactive_esim" msgid="6525747163540293028">"Идэвхгүй / Татаж авсан SIM"</string>
+    <string name="mobile_network_sim_name" msgid="8228870017368926761">"SIM-ийн нэр"</string>
     <string name="mobile_network_sim_name_rename" msgid="4810736493612513152">"Нэрийг нь өөрчлөх"</string>
-    <string name="mobile_network_use_sim_on" msgid="1944823242539751387">"СИМ ашиглах"</string>
+    <string name="mobile_network_use_sim_on" msgid="1944823242539751387">"SIM ашиглах"</string>
     <string name="mobile_network_use_sim_off" msgid="2077820358051946635">"Унтраах"</string>
     <string name="mobile_network_esim_swap_confirm_title" msgid="6077154427380613615">"<xliff:g id="CARRIER">%1$s</xliff:g> руу сэлгэх үү?"</string>
-    <string name="mobile_network_esim_swap_confirm_body" msgid="1192274915146275063">"Нэг удаад зөвхөн татаж авсан нэг СИМ-г идэвхжүүлэх боломжтой.\n\n<xliff:g id="CARRIER1">%1$s</xliff:g> руу сэлгэснээр таны <xliff:g id="CARRIER2">%2$s</xliff:g>-н үйлчилгээг цуцлахгүй."</string>
+    <string name="mobile_network_esim_swap_confirm_body" msgid="1192274915146275063">"Нэг удаад зөвхөн татаж авсан нэг SIM-г идэвхжүүлэх боломжтой.\n\n<xliff:g id="CARRIER1">%1$s</xliff:g> руу сэлгэснээр таны <xliff:g id="CARRIER2">%2$s</xliff:g>-н үйлчилгээг цуцлахгүй."</string>
     <string name="mobile_network_esim_swap_confirm_ok" msgid="4253442720111626242">"<xliff:g id="CARRIER">%1$s</xliff:g> руу сэлгэх"</string>
-    <string name="mobile_network_erase_sim" msgid="7813251003613841044">"СИМ-г устгах"</string>
-    <string name="mobile_network_erase_sim_dialog_title" msgid="3796268164204467499">"Энэ татаж авсан СИМ-г устгах уу?"</string>
-    <string name="mobile_network_erase_sim_dialog_body" msgid="1923189407958581450">"Энэ СИМ-г устгаснаар энэ төхөөрөмжөөс <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" 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_ok" msgid="7133484721717815447">"Устгах"</string>
-    <string name="mobile_network_erase_sim_dialog_progress" msgid="4881754030959536493">"СИМ-г устгаж байна…"</string>
-    <string name="mobile_network_erase_sim_error_dialog_title" msgid="9026625253242102706">"СИМ-г устгаж чадсангүй"</string>
-    <string name="mobile_network_erase_sim_error_dialog_body" msgid="5955463559366034787">"Энэ СИМ-г алдааны улмаас устгаж чадсангүй.\n\nТөхөөрөмжөө дахин эхлүүлээд, дахин оролдоно уу."</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="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-mr/arrays.xml b/tests/CarDeveloperOptions/res/values-mr/arrays.xml
index 55fda50..671ab15 100644
--- a/tests/CarDeveloperOptions/res/values-mr/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-mr/arrays.xml
@@ -379,7 +379,7 @@
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="3865198759294188069">"डीफॉल्ट"</item>
     <item msgid="6488643537808152001">"काहीही नाही"</item>
-    <item msgid="552332815156010137">"रुपरेषा"</item>
+    <item msgid="552332815156010137">"Outline"</item>
     <item msgid="7187891159463789272">"ड्रॉप शॅडो"</item>
     <item msgid="8019330250538856521">"उन्नत"</item>
     <item msgid="8987385315647049787">"हताश"</item>
@@ -412,7 +412,7 @@
   </string-array>
   <string-array name="vpn_states">
     <item msgid="5408915841694583740">"डिस्कनेक्ट केले"</item>
-    <item msgid="8754480102834556765">"प्रारंभ करत आहे…"</item>
+    <item msgid="8754480102834556765">"सुरू करत आहे…"</item>
     <item msgid="3351334355574270250">"कनेक्ट करत आहे..."</item>
     <item msgid="8303882153995748352">"कनेक्ट केलेले आहे"</item>
     <item msgid="9135049670787351881">"टाइमआउट"</item>
diff --git a/tests/CarDeveloperOptions/res/values-mr/strings.xml b/tests/CarDeveloperOptions/res/values-mr/strings.xml
index cc17772..afdbda1 100644
--- a/tests/CarDeveloperOptions/res/values-mr/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-mr/strings.xml
@@ -190,7 +190,7 @@
     <skip />
     <string name="intent_sender_sendbroadcast_text" msgid="4059638502746959647">"<xliff:g id="BROADCAST">broadcast</xliff:g> पाठवा"</string>
     <string name="intent_sender_action_label" msgid="8363850824510196680">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
-    <string name="intent_sender_startactivity_text" msgid="5920953958281596389">"<xliff:g id="ACTIVITY">activity</xliff:g> प्रारंभ"</string>
+    <string name="intent_sender_startactivity_text" msgid="5920953958281596389">"<xliff:g id="ACTIVITY">activity</xliff:g> सुरू"</string>
     <string name="intent_sender_resource_label" msgid="8002433688075847091">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="7904284551281213567">"खाते:"</string>
     <string name="proxy_settings_title" msgid="6014901859338211713">"प्रॉक्सी"</string>
@@ -212,7 +212,7 @@
     <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_phy_chan_config" msgid="1184401689381480522">"LTE फिजिकल चॅनेल कॉन्फिगरेशन:"</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>
     <string name="radio_info_gprs_service_label" msgid="7926626443442993242">"डेटा सेवा:"</string>
@@ -302,7 +302,7 @@
     <string name="settings_shortcut" msgid="4503714880251502167">"सेटिंग्ज शॉर्टकट"</string>
     <string name="airplane_mode" msgid="4508870277398231073">"विमान मोड"</string>
     <string name="wireless_networks_settings_title" msgid="4298430520189173949">"वायरलेस आणि नेटवर्क"</string>
-    <string name="radio_controls_summary" msgid="4596981962167684814">"Wi‑Fi, Bluetooth, विमान मोड, मोबाईल नेटवर्क आणि VPN व्यवस्थापित करा"</string>
+    <string name="radio_controls_summary" msgid="4596981962167684814">"Wi‑Fi, Bluetooth, विमान मोड, मोबाइल नेटवर्क आणि VPN व्यवस्थापित करा"</string>
     <string name="cellular_data_title" msgid="7909624119432695022">"मोबाइल डेटा"</string>
     <string name="calls_title" msgid="875693497825736550">"कॉलची अनुमती द्या"</string>
     <string name="sms_messages_title" msgid="934188835214592753">"SMS मेसेज"</string>
@@ -461,7 +461,7 @@
     <string name="cancel_lock_screen_dialog_button_label" msgid="2534925227627658819">"रद्द करा"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="8909829699273726469">"सेन्सरला स्पर्श करा"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="581120963079780740">"ते तुमच्या फोनच्या मागील भागावर आहे. तुमची तर्जनी वापरा."</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="7835824123269738540">"डिव्हाइस आणि फिंगरप्रिंट सेंसर स्थानासह चित्रे"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="7835824123269738540">"डिव्हाइस आणि फिंगरप्रिंट सेन्सर स्थानासह चित्रे"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="3519748398694308901">"नाव"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="3428927518029038956">"ठीक आहे"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4312297515772004580">"हटवा"</string>
@@ -508,8 +508,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>
@@ -788,7 +788,7 @@
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="4180673788239241086">"ब्लूटूथ डीव्हाइसवर कनेक्ट करा"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="1414487572426490659">"यासाठी वापरा"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="2270087843175307865">"पुनर्नामित करा"</string>
-    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8258863155491651198">"येणार्‍या फाईल स्थानांतरणांना अनुमती द्या"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8258863155491651198">"येणार्‍या फाइल स्थानांतरणांना अनुमती द्या"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="5934228955175911807">"इंटरनेट ॲक्सेससाठी डिव्हाइसशी कनेक्ट केले"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="3103296701913705646">"डिव्हाइससह स्थानिक इंटरनेट कनेक्शन शेअर करत आहे"</string>
     <string name="bluetooth_dock_settings" msgid="3193180757893817101">"डॉक सेटिंग्ज"</string>
@@ -828,7 +828,7 @@
     <string name="nfc_secure_settings_title" msgid="5153751163174916581">"NFC चे संरक्षण करा"</string>
     <string name="nfc_secure_toggle_summary" product="default" msgid="7631183023440112192">"स्क्रीन अनलॉक केल्यावर NFC पेमेंट आणि फक्त परिवहन वापरासाठीला अनुमती द्या"</string>
     <string name="android_beam_settings_title" msgid="3083436415873738389">"Android बीम"</string>
-    <string name="android_beam_on_summary" msgid="8068287225180474199">"NFC द्वारे अ‍ॅप सामग्री प्रक्षेपित करण्यास तयार"</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="android_beam_label" msgid="5340299879556025708">"Android बीम"</string>
@@ -883,7 +883,7 @@
     <string name="wifi_menu_p2p" msgid="4945665601551289791">"वाय-फाय डिरेक्ट"</string>
     <string name="wifi_menu_scan" msgid="9082691677803181629">"स्कॅन करा"</string>
     <string name="wifi_menu_advanced" msgid="5984484498045511072">"प्रगत"</string>
-    <string name="wifi_menu_configure" msgid="52192491120701266">"कॉन्फिगर करा"</string>
+    <string name="wifi_menu_configure" msgid="52192491120701266">"कॉंफिगर करा"</string>
     <string name="wifi_menu_connect" msgid="3984327567173931219">"नेटवर्कवर कनेक्ट करा"</string>
     <string name="wifi_menu_remember" msgid="717257200269700641">"नेटवर्क लक्षात ठेवा"</string>
     <string name="wifi_menu_forget" msgid="7561140554450163075">"नेटवर्क विसरा"</string>
@@ -1168,7 +1168,7 @@
     <string name="accessibility_category_personal" msgid="1423427301759058762">"वैयक्तिक प्रोफाईल खाती"</string>
     <string name="accessibility_work_account_title" msgid="3195468574776888011">"कार्य खाते - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_personal_account_title" msgid="7251761883688839354">"वैयक्तिक खाते - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
-    <string name="search_settings" msgid="5809250790214921377">"शोध"</string>
+    <string name="search_settings" msgid="5809250790214921377">"Search"</string>
     <string name="display_settings" msgid="1045535829232307190">"डिस्प्ले"</string>
     <string name="accelerometer_title" msgid="2427487734964971453">"ऑटो-रोटेट स्क्रीन"</string>
     <string name="color_mode_title" msgid="8164858320869449142">"रंग"</string>
@@ -1351,7 +1351,7 @@
     <string name="status_data_network_type" msgid="2344720457353394909">"मोबाइल डेटा नेटवर्क प्रकार"</string>
     <string name="status_voice_network_type" msgid="8767320162513876610">"मोबाइल व्हॉइस नेटवर्क प्रकार"</string>
     <string name="status_latest_area_info" msgid="3043410596911526699">"ऑपरेटर माहिती"</string>
-    <string name="status_data_state" msgid="4538705798873861963">"मोबाईल नेटवर्क स्थिती"</string>
+    <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>
@@ -1406,7 +1406,7 @@
     <string name="sd_ejecting_title" msgid="595074246815112145">"अनमाउंट करत आहे"</string>
     <string name="sd_ejecting_summary" msgid="5708943172014003213">"अनमाउंट प्रगतीवर"</string>
     <string name="storage_low_title" msgid="6957178208426099592">"संचयन स्थान संपत आहे"</string>
-    <string name="storage_low_summary" msgid="4475275204869514141">"सिंक करणे यासारखी, काही सिस्टम कार्ये, योग्यरितीने कार्य करू शकत नाही. अ‍ॅप्स किंवा मीडिया सामग्री यासारखे, आयटम हटवून किंवा अनपिन करून स्थान मोकळे करण्याचा प्रयत्न करा."</string>
+    <string name="storage_low_summary" msgid="4475275204869514141">"सिंक करणे यासारखी, काही सिस्टम कार्ये, योग्यरितीने कार्य करू शकत नाही. अ‍ॅप्स किंवा मीडिया आशय यासारखे, आयटम हटवून किंवा अनपिन करून स्थान मोकळे करण्याचा प्रयत्न करा."</string>
     <string name="storage_menu_rename" msgid="3731682449294417745">"नाव बदला"</string>
     <string name="storage_menu_mount" msgid="6395893560780365473">"माउंट करा"</string>
     <string name="storage_menu_unmount" msgid="5041360076873514189">"बाहेर काढा"</string>
@@ -1422,7 +1422,7 @@
     <string name="storage_title_usb" msgid="2015671467177303099">"USB कॉंप्युटर कनेक्शन"</string>
     <string name="usb_connection_category" msgid="2888975803638116041">"म्हणून कनेक्ट करा"</string>
     <string name="usb_mtp_title" msgid="6893938968831995500">"मीडिया डिव्हाइस (MTP)"</string>
-    <string name="usb_mtp_summary" msgid="4427354560399094322">"Windows वरील मीडिया फाइल वापरून किंवा Mac वरील Android फाईल स्थानांतरण वापरून तुम्हाला मीडिया फाइल स्थानांतरण करू देते (www.android.com/filetransfer पहा)"</string>
+    <string name="usb_mtp_summary" msgid="4427354560399094322">"Windows वरील मीडिया फाइल वापरून किंवा Mac वरील Android फाइल स्थानांतरण वापरून तुम्हाला मीडिया फाइल स्थानांतरण करू देते (www.android.com/filetransfer पहा)"</string>
     <string name="usb_ptp_title" msgid="6629335976394685361">"कॅमेरा (PTP)"</string>
     <string name="usb_ptp_summary" msgid="460425275251168189">"तुम्हाला कॅमेरा सॉफ्टवेअर वापरून फोटो स्थानांतर आणि MTP वर समर्थित नसलेल्या संगणकावर कोणत्याही फाइल स्थानांतर करू देते"</string>
     <string name="usb_midi_title" msgid="8626512517313340943">"MIDI"</string>
@@ -1450,7 +1450,7 @@
     <string name="storage_internal_forget_confirm_title" msgid="331032276130605241">"<xliff:g id="NAME">^1</xliff:g> ला विसरला?"</string>
     <string name="storage_internal_forget_confirm" msgid="3052483375203727176">"या <xliff:g id="NAME">^1</xliff:g> वर स्टोअर केलेले सर्व अ‍ॅप्स, फोटो आणि डेटा कायमचा गमावला जाईल."</string>
     <string name="storage_detail_apps" msgid="8154648512504196820">"अ‍ॅप्स"</string>
-    <string name="storage_detail_images" msgid="6996202225684468964">"इमेज"</string>
+    <string name="storage_detail_images" msgid="6996202225684468964">"Images"</string>
     <string name="storage_detail_videos" msgid="6030983354721080849">"व्हिडिओ"</string>
     <string name="storage_detail_audio" msgid="6011098436589663944">"ऑडिओ"</string>
     <string name="storage_detail_cached" msgid="5761648455067920683">"कॅशे  केलेला डेटा"</string>
@@ -1534,7 +1534,7 @@
     <string name="apn_apn" msgid="190519449579357696">"APN"</string>
     <string name="apn_http_proxy" msgid="8816906767987944465">"प्रॉक्सी"</string>
     <string name="apn_http_port" msgid="5789193688960075486">"पोर्ट"</string>
-    <string name="apn_user" msgid="6979724587671704006">"वापरकर्तानाव"</string>
+    <string name="apn_user" msgid="6979724587671704006">"वापरकर्ता नाव"</string>
     <string name="apn_password" msgid="7140724726108226386">"पासवर्ड"</string>
     <string name="apn_server" msgid="625116221513279678">"सर्व्हर"</string>
     <string name="apn_mmsc" msgid="4621771343217824216">"MMSC"</string>
@@ -1586,7 +1586,7 @@
     <string name="reset_esim_error_msg" msgid="4716366079119742235">"डाउनलोड केलेली सिम एका एररमुळे मिटवता येत नाहीत.\n\nतुमचे डिव्हाइस रीस्टार्ट करा आणि पुन्हा प्रयत्न करा."</string>
     <string name="master_clear_title" msgid="1560712943955904673">"सर्व डेटा मिटवा (फॅक्टरी रीसेट)"</string>
     <string name="master_clear_short_title" msgid="919098101581335101">"सर्व डेटा मिटवा (फॅक्टरी रीसेट)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3432373610755760899">"हे तुमच्या टॅबलेटच्या "<b>"अंतर्गत स्टोरेज"</b>" वरील सर्व डेटा मिटवेल, यासह:\n\n"<li>"तुमचे Google खाते"</li>\n<li>"सिस्टम आणि ॲप डेटा आणि सेटिंग्ज"</li>\n<li>"डाउनलोड केलेली अ‍ॅप्स"</li></string>
+    <string name="master_clear_desc" product="tablet" msgid="3432373610755760899">"हे तुमच्या टॅबलेटच्या "<b>"अंतर्गत स्टोरेज"</b>" वरील सर्व डेटा मिटवेल, यासह:\n\n"<li>"तुमचे Google खाते"</li>\n<li>"सिस्टम आणि अ‍ॅप डेटा आणि सेटिंग्ज"</li>\n<li>"डाउनलोड केलेली अ‍ॅप्स"</li></string>
     <string name="master_clear_desc" product="default" msgid="8765543541962866697">"हे खालील ठिकाणी तुमच्या फोनच्या "<b>"अंतर्गत स्टोरेज"</b>" वरील सर्व डेटा मिटवेल:\n\n"<li>"तुमचे Google खाते"</li>\n<li>"सिस्टम आणि अ‍ॅप डेटा सेटिंग्ज"</li>\n<li>"डाउनलोड केलेली अ‍ॅप्स"</li></string>
     <string name="master_clear_accounts" product="default" msgid="3432884235445405376">\n\n"तुम्ही खालील खात्यांवर सध्या साइन इन केले आहे:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5993259656117566767">\n\n"या डिव्‍हाइसवर इतर वापरकर्ते उपस्‍थित आहेत.\n"</string>
@@ -1633,7 +1633,7 @@
     <string name="tethering_footer_info" msgid="8019555174339154124">"तुमच्या मोबाइल डेटा कनेक्शनने इतर डिव्हाइसना इंटरनेट देण्यासाठी हॉटस्पॉट आणि टेदरिंगचा वापर करा. जवळपासच्या डिव्हाइससोबत आशय शेअर करण्यासाठी अ‍ॅप्स हॉटस्‍पॉट देखील तयार करू शकतात."</string>
     <string name="tethering_help_button_text" msgid="7653022000284543996">"मदत"</string>
     <string name="network_settings_title" msgid="8516526011407061679">"मोबाइल नेटवर्क"</string>
-    <string name="manage_mobile_plan_title" msgid="3312016665522553062">"मोबाईल योजना"</string>
+    <string name="manage_mobile_plan_title" msgid="3312016665522553062">"मोबाइल योजना"</string>
     <string name="sms_application_title" msgid="7815840568119334679">"SMS अ‍ॅप"</string>
     <string name="sms_change_default_dialog_title" msgid="6301260161969667578">"SMS अ‍ॅप बदलायचा?"</string>
     <string name="sms_change_default_dialog_text" msgid="8275088077930942680">"<xliff:g id="CURRENT_APP">%2$s</xliff:g> च्याऐवजी <xliff:g id="NEW_APP">%1$s</xliff:g> ला तुमचा SMS अ‍ॅप म्हणून वापराय?"</string>
@@ -1667,7 +1667,7 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="196241746742607453">"ब्लूटूथ स्कॅनिंग"</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">"वाय-फाय आणि मोबाईल नेटवर्क स्थान"</string>
+    <string name="location_network_based" msgid="1535812159327454835">"वाय-फाय आणि मोबाइल नेटवर्क स्थान"</string>
     <string name="location_neighborhood_level" msgid="8459352741296587916">"आपल्या स्थानाचा अधिक जलद अंदाज घेण्यासाठी ॲप्सना Google ची स्थान सेवा वापरू द्या. अनामित स्थान डेटा संकलित केला जाईल आणि Google कडे पाठविला जाईल."</string>
     <string name="location_neighborhood_level_wifi" msgid="6120133551482003840">"वाय-फाय द्वारे निर्धारित केलेले स्थान"</string>
     <string name="location_gps" msgid="688049341158297763">"GPS उपग्रह"</string>
@@ -1891,7 +1891,7 @@
     <string name="app_disable_dlg_positive" msgid="5508828271100168073">"अ‍ॅप अक्षम करा"</string>
     <string name="app_disable_dlg_text" msgid="9221864774943530281">"तुम्ही हे अ‍ॅप बंद केल्यास, Android आणि इतर अ‍ॅप्स कदाचित अपेक्षेप्रमाणे काम करणार नाहीत. लक्षात ठेवा, हे अ‍ॅप तुमच्या डिव्हाइसवर आधीच इंस्टॉल करून आलेले असल्यामुळे तुम्ही ते हटवू शकत नाही. बंद करून, तुम्ही हे अ‍ॅप बंद करता आणि ते तुमच्या डिव्हाइसवर लपवता."</string>
     <string name="app_disable_notifications_dlg_title" msgid="699530661413553928">"सूचना बंद करायच्या?"</string>
-    <string name="app_install_details_group_title" msgid="2909597319422976921">"स्टोअर"</string>
+    <string name="app_install_details_group_title" msgid="2909597319422976921">"Store"</string>
     <string name="app_install_details_title" msgid="6954953384372934881">"अ‍ॅप तपशील"</string>
     <string name="app_install_details_summary" msgid="6612222941121363940">"अ‍ॅप <xliff:g id="APP_STORE">%1$s</xliff:g> मधून इंस्टॉल केला"</string>
     <string name="instant_app_details_summary" msgid="6384264315914966114">"<xliff:g id="APP_STORE">%1$s</xliff:g> ची अधिक माहिती"</string>
@@ -1903,7 +1903,7 @@
     <string name="service_restarting" msgid="1190995225643385568">"रीस्टार्ट करत आहे"</string>
     <string name="cached" msgid="4019482949725020855">"पार्श्वभूमी प्रक्रिया कॅशे    केली"</string>
     <string name="no_running_services" msgid="618823924559385173">"काहीही चालत नाही."</string>
-    <string name="service_started_by_app" msgid="6906027340122215035">"अ‍ॅप द्वारे प्रारंभ केला."</string>
+    <string name="service_started_by_app" msgid="6906027340122215035">"अ‍ॅप द्वारे सुरू केला."</string>
     <!-- no translation found for service_client_name (7083258170099389413) -->
     <skip />
     <string name="service_background_processes" msgid="2678557055039755445">"<xliff:g id="MEMORY">%1$s</xliff:g> विनामूल्य"</string>
@@ -1931,7 +1931,7 @@
     <string name="runningservicedetails_processes_title" msgid="5496507383850423763">"प्रक्रिया"</string>
     <string name="service_stop" msgid="8812777462903125191">"थांबा"</string>
     <string name="service_manage" msgid="7045214643721276662">"सेटिंग्ज"</string>
-    <string name="service_stop_description" msgid="4184180745938573707">"या सेवेचा प्रारंभ तिच्या अ‍ॅपद्वारे झाला. ती थांबविण्यामुळे अ‍ॅप अयशस्वी होऊ शकतो."</string>
+    <string name="service_stop_description" msgid="4184180745938573707">"या सेवेचा सुरू तिच्या अ‍ॅपद्वारे झाला. ती थांबविण्यामुळे अ‍ॅप अयशस्वी होऊ शकतो."</string>
     <string name="heavy_weight_stop_description" msgid="7444148811046611463">"हा अ‍ॅप सुरक्षितपणे थांबविला जाऊ शकत नाही. तुम्ही हा थांबविल्यास, तुम्ही तुमचे काही वर्तमान कार्य गमावू शकता."</string>
     <string name="background_process_stop_description" msgid="8971810208873038109">"ही जुनी अ‍ॅप प्रक्रिया आहे जी तिची पुन्हा आवश्यकता असल्यास अद्याप चालत आहे. ती थांबवण्याचे सामान्यतः कोणतेही कारण नाही."</string>
     <string name="service_manage_description" msgid="8058123524402833082">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: सध्या वापरात आहे. हे नियंत्रित करण्यासाठी सेटिंग्जवर टॅप करा."</string>
@@ -2073,7 +2073,7 @@
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="9127905775116570565">"मोठा माउस पॉइंटर"</string>
     <string name="accessibility_disable_animations" msgid="8378441317115710009">"अ‍ॅनिमेशन काढा"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="899550848196702565">"मोनो ऑडिओ"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="3847052868469033235">"ऑडिओ प्ले करताना चॅनेल एकत्र करा"</string>
+    <string name="accessibility_toggle_master_mono_summary" msgid="3847052868469033235">"ऑडिओ प्ले करताना चॅनल एकत्र करा"</string>
     <string name="accessibility_toggle_master_balance_title" msgid="8723492001092647562">"ऑडिओ संतुलन"</string>
     <string name="accessibility_toggle_master_balance_left_label" msgid="8531986342666527970">"डावे"</string>
     <string name="accessibility_toggle_master_balance_right_label" msgid="7757024572140589558">"उजवे"</string>
@@ -2162,7 +2162,7 @@
     <string name="captioning_foreground_opacity" msgid="7635639017810117478">"मजकूर अपारदर्शकता"</string>
     <string name="captioning_edge_color" msgid="4330622137047993780">"किनारीचा रंग"</string>
     <string name="captioning_edge_type" msgid="4414946407430588162">"किनारीचा प्रकार"</string>
-    <string name="captioning_typeface" msgid="7893208796949341767">"फॉन्ट फॅमेली"</string>
+    <string name="captioning_typeface" msgid="7893208796949341767">"फॉंट फॅमेली"</string>
     <string name="captioning_preview_text" msgid="4877753964772618049">"मथळे यासारखे दिसतील"</string>
     <string name="captioning_preview_characters" msgid="6469599599352973561">"Aa"</string>
     <string name="locale_default" msgid="910074908458214054">"डीफॉल्ट"</string>
@@ -2212,7 +2212,7 @@
     <string name="print_feature_state_off" msgid="208580346723223688">"बंद"</string>
     <string name="print_menu_item_add_service" msgid="6803000110578493782">"सेवा जोडा"</string>
     <string name="print_menu_item_add_printer" msgid="8529196211179574921">"प्रिंटर जोडा"</string>
-    <string name="print_menu_item_search" msgid="1165316329772287360">"शोध"</string>
+    <string name="print_menu_item_search" msgid="1165316329772287360">"Search"</string>
     <string name="print_searching_for_printers" msgid="6538687129687642542">"प्रिंटर शोधत आहे"</string>
     <string name="print_service_disabled" msgid="6376344992705893436">"सेवा अक्षम केली"</string>
     <string name="print_print_jobs" msgid="7357841034181762157">"प्रिंट कार्ये"</string>
@@ -2220,7 +2220,7 @@
     <string name="print_restart" msgid="4090462480288441779">"रीस्टार्ट"</string>
     <string name="print_cancel" msgid="4567831028966698753">"रद्द करा"</string>
     <string name="print_job_summary" msgid="438156926959424058">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="print_configuring_state_title_template" msgid="5052801061241050737">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> कॉन्फिगर करत आहे"</string>
+    <string name="print_configuring_state_title_template" msgid="5052801061241050737">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> कॉंफिगर करत आहे"</string>
     <string name="print_printing_state_title_template" msgid="8796814912920963803">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> प्रिंट करत आहे"</string>
     <string name="print_cancelling_state_title_template" msgid="4627355699517405600">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> रद्द करत आहे"</string>
     <string name="print_failed_state_title_template" msgid="6575080578316671101">"प्रिंटर एरर <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
@@ -2256,7 +2256,7 @@
     <string name="battery_stats_flashlight_on_label" msgid="162279812156241905">"फ्लॅशलाइट सुरू"</string>
     <string name="battery_stats_wifi_running_label" msgid="3223557320252465826">"वाय-फाय"</string>
     <string name="battery_stats_wake_lock_label" msgid="670884103452713535">"सक्रिय"</string>
-    <string name="battery_stats_phone_signal_label" msgid="2502589944816260503">"मोबाईल नेटवर्क सिग्नल"</string>
+    <string name="battery_stats_phone_signal_label" msgid="2502589944816260503">"मोबाइल नेटवर्क सिग्नल"</string>
     <!-- no translation found for battery_stats_last_duration (8190573267292309839) -->
     <skip />
     <string name="awake" msgid="8956720170442161285">"डिव्हाइस ॲक्टिव्हेट होण्याची वेळ"</string>
@@ -2379,9 +2379,9 @@
     <string name="usage_type_wifi_running" msgid="4192567991891907030">"वाय-फाय चालत आहे"</string>
     <string name="usage_type_phone" product="tablet" msgid="4279605085824633501">"टॅबलेट"</string>
     <string name="usage_type_phone" product="default" msgid="3901842461077646153">"फोन"</string>
-    <string name="usage_type_data_send" msgid="6339880867171142725">"मोबाईल पॅकेट पाठविली"</string>
-    <string name="usage_type_data_recv" msgid="2099757621601333453">"मोबाईल पॅकेट प्राप्त झाली"</string>
-    <string name="usage_type_radio_active" msgid="4123481281606636561">"मोबाईल रेडिओ सक्रिय"</string>
+    <string name="usage_type_data_send" msgid="6339880867171142725">"मोबाइल पॅकेट पाठविली"</string>
+    <string name="usage_type_data_recv" msgid="2099757621601333453">"मोबाइल पॅकेट प्राप्त झाली"</string>
+    <string name="usage_type_radio_active" msgid="4123481281606636561">"मोबाइल रेडिओ सक्रिय"</string>
     <string name="usage_type_data_wifi_send" msgid="4457097885099163617">"वाय-फाय पॅकेट पाठविली"</string>
     <string name="usage_type_data_wifi_recv" msgid="6629526425662663926">"वाय-फाय पॅकेट प्राप्त झाली"</string>
     <string name="usage_type_audio" msgid="510459400845396879">"ऑडिओ"</string>
@@ -2510,10 +2510,10 @@
     <string name="voice_interactor_preference_summary" msgid="7321365727286121067">"पूर्ण हॉटवर्ड आणि परस्परसंवाद"</string>
     <string name="voice_recognizer_preference_summary" msgid="3681161319745912594">"मजकूर पाठविण्यासाठी सोपे उच्चारण"</string>
     <string name="voice_interaction_security_warning" msgid="4986261746316889768">"आपल्या वतीने व्हॉइस परीक्षण नेहमी-सुरू कार्यप्रदर्शन करण्यासाठी आणि व्हॉइस सक्षम ॲप्लिकेशन नियंत्रित करण्यासाठी व्हॉइस इनपुट सेवा सक्षम असेल. हे <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> ॲप्लिकेशनावरून येते. या सेवेचा वापर सक्षम करायचा?"</string>
-    <string name="tts_engine_preference_title" msgid="1183116842356275061">"प्राधान्य इंजिन"</string>
-    <string name="tts_engine_settings_title" msgid="4079757915136562358">"इंजिन सेटिंग्ज"</string>
+    <string name="tts_engine_preference_title" msgid="1183116842356275061">"प्राधान्य इंजीन"</string>
+    <string name="tts_engine_settings_title" msgid="4079757915136562358">"इंजीन सेटिंग्ज"</string>
     <string name="tts_sliders_title" msgid="1927481069989092278">"भाषण गती आणि पिच"</string>
-    <string name="tts_engine_section_title" msgid="7796486438271227076">"इंजिन"</string>
+    <string name="tts_engine_section_title" msgid="7796486438271227076">"इंजीन"</string>
     <string name="tts_install_voice_title" msgid="3143328760690690254">"व्हॉइस"</string>
     <string name="tts_spoken_language" msgid="8057256621711361944">"बोलली जाणारी भाषा"</string>
     <string name="tts_install_voices_title" msgid="363811937643579286">"आवाज इंस्टॉल करा"</string>
@@ -2636,14 +2636,14 @@
     <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="enter_password" msgid="2963496904625715235">"Android प्रारंभ करण्‍यासाठी, तुमचा पासवर्ड प्रविष्‍ट करा"</string>
-    <string name="enter_pin" msgid="7140938268709546890">"Android प्रारंभ करण्‍यासाठी, तुमचा पिन प्रविष्‍ट करा"</string>
-    <string name="enter_pattern" msgid="1653841963422825336">"Android प्रारंभ करण्‍यासाठी, आपल्या नमुन्याची रेखाटणी करा"</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>
     <string name="cryptkeeper_wrong_pattern" msgid="4580105105385125467">"चुकीचा पॅटर्न"</string>
     <string name="cryptkeeper_wrong_password" msgid="1709534330303983166">"चुकीचा पासवर्ड"</string>
     <string name="cryptkeeper_wrong_pin" msgid="857757190077859245">"चुकीचा पिन"</string>
     <string name="checking_decryption" msgid="5927759912073053101">"तपासत आहे..."</string>
-    <string name="starting_android" msgid="4774187626261253089">"Android प्रारंभ करत आहोत..."</string>
+    <string name="starting_android" msgid="4774187626261253089">"Android सुरू करत आहोत..."</string>
     <string name="delete" msgid="2325292565700865366">"हटवा"</string>
     <string name="misc_files" msgid="1012397035001764693">"संकीर्ण फाइल"</string>
     <string name="misc_files_selected_count" msgid="1434146080729502726">"<xliff:g id="TOTAL">%2$d</xliff:g> पैकी <xliff:g id="NUMBER">%1$d</xliff:g> निवडले"</string>
@@ -2680,7 +2680,7 @@
     <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_limit" msgid="1937796699758613667">"मोबाईल डेटा मर्यादा सेट करा"</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>
     <string name="data_usage_disable_wifi_limit" msgid="8214267551888018353">"वाय-फाय डेटा मर्यादा सेट करा"</string>
@@ -2689,9 +2689,9 @@
     <string name="data_usage_tab_mobile" msgid="540101181815160147">"मोबाइल"</string>
     <string name="data_usage_tab_4g" msgid="6677000649094593958">"4G"</string>
     <string name="data_usage_tab_3g" msgid="4262659656028408064">"2G-3G"</string>
-    <string name="data_usage_list_mobile" msgid="5623011459774885900">"मोबाईल"</string>
+    <string name="data_usage_list_mobile" msgid="5623011459774885900">"मोबाइल"</string>
     <string name="data_usage_list_none" msgid="5948870220795490796">"काहीही नाही"</string>
-    <string name="data_usage_enable_mobile" msgid="7238385042860001374">"मोबाईल डेटा"</string>
+    <string name="data_usage_enable_mobile" msgid="7238385042860001374">"मोबाइल डेटा"</string>
     <string name="data_usage_enable_3g" msgid="3725838726334043367">"2G-3G डेटा"</string>
     <string name="data_usage_enable_4g" msgid="8872517106293561179">"4G डेटा"</string>
     <string name="data_roaming_enable_mobile" msgid="5886394350890765947">"रोमिंग"</string>
@@ -2700,9 +2700,9 @@
     <string name="data_usage_app_settings" msgid="3276444867375694809">"अ‍ॅप सेटिंग्ज"</string>
     <string name="data_usage_app_restrict_background" msgid="649167881583859169">"पार्श्वभूमीवरील डेटा"</string>
     <string name="data_usage_app_restrict_background_summary" msgid="2703967920234671881">"पार्श्वभूमीमध्‍ये मोबाइल डेटाचा वापर सुरू करा"</string>
-    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7211921499365814638">"या ॲपसाठी पार्श्वभूमीवरील डेटा प्रतिबंधित करताना प्रथम मोबाईल डेटा मर्यादा सेट करा."</string>
+    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7211921499365814638">"या ॲपसाठी पार्श्वभूमीवरील डेटा प्रतिबंधित करताना प्रथम मोबाइल डेटा मर्यादा सेट करा."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="750037964591673167">"पार्श्वभूमीवरील डेटा प्रतिबंधित करायचा?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="4022530391896478031">"जेव्हा फक्त मोबाईल नेटवर्क उपलब्ध असतात तेव्हा या वैशिष्ट्यामुळे पार्श्वभूमी डेटावर अवलंबून असलेला अ‍ॅप कार्य करणे थांबवते.\n\nतुम्ही अ‍ॅप मध्ये उपलब्ध असलेल्या सेटिंग्जमध्ये अधिक योग्य डेटा वापर नियंत्रणे शोधू शकता."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="4022530391896478031">"जेव्हा फक्त मोबाइल नेटवर्क उपलब्ध असतात तेव्हा या वैशिष्ट्यामुळे पार्श्वभूमी डेटावर अवलंबून असलेला अ‍ॅप कार्य करणे थांबवते.\n\nतुम्ही अ‍ॅप मध्ये उपलब्ध असलेल्या सेटिंग्जमध्ये अधिक योग्य डेटा वापर नियंत्रणे शोधू शकता."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="18928292832775805">"तुम्ही मोबाइल डेटा मर्यादा सेट करता तेव्हाच पार्श्वभूमीवरील डेटा प्रतिबंधित करणे शक्य आहे."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2342323408229702005">"डेटाचे ऑटो-सिंक सुरू करायचे?"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="4935430284683238901">"तुम्ही वेबवरून आपल्या खात्यामध्ये कोणतेही बदल करता ते आपल्या टॅब्लेटवर स्वयंचलितपणे कॉपी केले जातील.\n\nकाही खाती तुम्ही टॅब्लेटवर करता ते कोणतेही बदल स्वयंचलितपणे वेबवर देखील कॉपी करू शकतात. Google खाते याप्रकारे कार्य करते."</string>
@@ -2731,7 +2731,7 @@
     <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_mobile" msgid="3675591449158207593">"मोबाईल नेटवर्क"</string>
+    <string name="data_usage_metered_mobile" msgid="3675591449158207593">"मोबाइल नेटवर्क"</string>
     <string name="data_usage_metered_wifi" msgid="2955256408132426720">"मीटर केलेली वाय-फाय नेटवर्क"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="5771083253782103415">"मीटर केलेली नेटवर्क निवडण्‍यासाठी, वाय-फाय सुरू करा."</string>
     <string name="data_usage_metered_auto" msgid="7924116401382629319">"स्वयंचलित"</string>
@@ -2754,7 +2754,7 @@
     <string name="vpn_search_domains" msgid="8469394307693909080">"DNS शोध डोमेन"</string>
     <string name="vpn_dns_servers" msgid="3017453300909321239">"DNS सर्व्हर (उदा. 8.8.8.8)"</string>
     <string name="vpn_routes" msgid="3393989650778663742">"फॉरवर्ड करण्याचा मार्ग (उदा. 10.0.0.0/8)"</string>
-    <string name="vpn_username" msgid="5357878823189445042">"वापरकर्तानाव"</string>
+    <string name="vpn_username" msgid="5357878823189445042">"वापरकर्ता नाव"</string>
     <string name="vpn_password" msgid="5325943601523662246">"पासवर्ड"</string>
     <string name="vpn_save_login" msgid="6215503139606646915">"खाते माहिती सेव्ह करा"</string>
     <string name="vpn_not_used" msgid="2889520789132261454">"(वापरले नाही)"</string>
@@ -2866,7 +2866,7 @@
     <string name="user_nickname" msgid="1088216221559125529">"टोपणनाव"</string>
     <string name="user_add_user_type_title" msgid="8672326434351387845">"जोडा"</string>
     <string name="user_add_max_count" msgid="4524573950126500416">"तुम्ही सुमारे <xliff:g id="USER_COUNT">%1$d</xliff:g> वापरकर्ते जोडू शकता"</string>
-    <string name="user_add_user_item_summary" msgid="6114355152711455716">"वापरकर्त्यांकडे त्यांचे स्वत:चे अ‍ॅप्स आणि सामग्री आहे"</string>
+    <string name="user_add_user_item_summary" msgid="6114355152711455716">"वापरकर्त्यांकडे त्यांचे स्वत:चे अ‍ॅप्स आणि आशय आहे"</string>
     <string name="user_add_profile_item_summary" msgid="6386283837789573755">"तुम्ही आपल्या खात्यावरुन अ‍ॅप्स आणि सामग्रीमध्ये प्रवेश करण्यास प्रतिबंध करु शकता"</string>
     <string name="user_add_user_item_title" msgid="6835385073795492410">"वापरकर्ता"</string>
     <string name="user_add_profile_item_title" msgid="4932743891449790664">"प्रतिबंधित प्रोफाईल"</string>
@@ -2963,14 +2963,14 @@
     <string name="preferred_network_type_title" msgid="1980819233332592332">"प्राधान्‍यकृत नेटवर्क प्रकार"</string>
     <string name="preferred_network_type_summary" msgid="8828375904939960006">"LTE (शिफारस केलेले)"</string>
     <string name="work_sim_title" msgid="2885654516046971985">"कार्यालय सिम"</string>
-    <string name="user_restrictions_title" msgid="6454305007320972740">"अ‍ॅप आणि सामग्री प्रवेश"</string>
+    <string name="user_restrictions_title" msgid="6454305007320972740">"अ‍ॅप आणि आशय प्रवेश"</string>
     <string name="user_rename" msgid="5624446289379780361">"पुनर्नामित करा"</string>
     <string name="app_restrictions_custom_label" msgid="8791627858467265176">"अ‍ॅप प्रतिबंध सेट करा"</string>
     <string name="user_restrictions_controlled_by" msgid="3442508299902131033">"<xliff:g id="APP">%1$s</xliff:g> द्वारे नियंत्रित"</string>
     <string name="app_sees_restricted_accounts" msgid="2210750497683265281">"हा अ‍ॅप आपल्या खात्यांमध्ये प्रवेश करु शकतो"</string>
     <string name="app_sees_restricted_accounts_and_controlled_by" msgid="5028333644657350816">"हा अ‍ॅप आपल्‍या खात्यांमध्‍ये प्रवेश करू शकतो. <xliff:g id="APP">%1$s</xliff:g> द्वारे नियंत्रित"</string>
-    <string name="restriction_wifi_config_title" msgid="1689176998451296068">"वाय-फाय आणि मोबाईल"</string>
-    <string name="restriction_wifi_config_summary" msgid="2450206736438594690">"वाय-फाय आणि मोबाईल सेटिंग्जच्या सुधारणेस अनुमती द्या"</string>
+    <string name="restriction_wifi_config_title" msgid="1689176998451296068">"वाय-फाय आणि मोबाइल"</string>
+    <string name="restriction_wifi_config_summary" msgid="2450206736438594690">"वाय-फाय आणि मोबाइल सेटिंग्जच्या सुधारणेस अनुमती द्या"</string>
     <string name="restriction_bluetooth_config_title" msgid="34551118506640221">"ब्लूटूथ"</string>
     <string name="restriction_bluetooth_config_summary" msgid="5304900222614952895">"ब्लूटूथ जोडण्या आणि सेटिंग्जच्या सुधारणेस अनुमती द्या"</string>
     <string name="restriction_nfc_enable_title" msgid="5146674482590550598">"NFC"</string>
@@ -3308,7 +3308,7 @@
     <string name="hide_silent_icons_summary" msgid="2624346914488256888">"स्टेटस बारमध्ये शांत सूचनांसाठी आयकन लपवा"</string>
     <string name="notification_badging_title" msgid="6311699476970264712">"सूचना बिंदूंना अनुमती द्या"</string>
     <string name="notification_bubbles_title" msgid="9196562435741861317">"बबल"</string>
-    <string name="notification_bubbles_summary" msgid="4624512775901949578">"फ्लोटिंग शॉर्टकट वापरून कुठूनही ॲप आशय झटपट ॲक्सेस करा"</string>
+    <string name="notification_bubbles_summary" msgid="4624512775901949578">"फ्लोटिंग शॉर्टकट वापरून कुठूनही अ‍ॅप आशय झटपट ॲक्सेस करा"</string>
     <string name="bubbles_feature_education" msgid="8979109826818881018">"काही सूचना आणि इतर आशय स्क्रीनवर बबल म्हणून दिसू शकतात. बबल उघडण्यासाठी, त्यावर टॅप करा. डिसमिस करण्यासाठी, तो स्क्रीनच्या खालच्या बाजूला ड्रॅग करा."</string>
     <string name="bubbles_app_toggle_title" msgid="6401217027603326439">"बबल"</string>
     <string name="bubbles_app_toggle_summary" msgid="7707611139796553855">"<xliff:g id="APP_NAME">%1$s</xliff:g> ला काही सूचना बबल म्हणून दाखवू द्या"</string>
@@ -3564,7 +3564,7 @@
     <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="encryption_interstitial_header" msgid="3298397268731647519">"सुरक्षित प्रारंभ"</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>
     <string name="encryption_interstitial_message_pattern" msgid="5620724295995735120">"सुरू होण्यापूर्वी तुमचा पॅटर्न आवश्यक करून तुम्ही हे डिव्हाइस अधिक संरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते कॉल, मेसेज किंवा अलार्मसह सूचना प्राप्त करू शकत नाही. \n\nयामुळे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइस वरील डेटाचे संरक्षण करण्यात मदत होते. तुमचे डिव्हाइस सुरू करण्यासाठी पॅटर्न हवा?"</string>
@@ -3582,9 +3582,9 @@
     <string name="encrypt_talkback_dialog_require_pin" msgid="2781758476498571031">"पिन आवश्यक?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="8705104812047332411">"पॅटर्न आवश्यक?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="5070710417271353306">"पासवर्ड आवश्यक?"</string>
-    <string name="encrypt_talkback_dialog_message_pin" msgid="1912533826818077891">"या डिव्हाइसचा प्रारंभ करण्यासाठी तुम्ही तुमचा पिन एंटर करता, तेव्हा <xliff:g id="SERVICE">%1$s</xliff:g> सारख्या सेवांची प्रवेशयोग्यता उपलब्धता असणार नाही."</string>
+    <string name="encrypt_talkback_dialog_message_pin" msgid="1912533826818077891">"या डिव्हाइसचा सुरू करण्यासाठी तुम्ही तुमचा पिन एंटर करता, तेव्हा <xliff:g id="SERVICE">%1$s</xliff:g> सारख्या सेवांची प्रवेशयोग्यता उपलब्धता असणार नाही."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="4415837749933863432">"हे डिव्हाइस सुरू करण्यासाठी तुम्ही तुमचा पॅटर्न एंटर करता, तेव्हा <xliff:g id="SERVICE">%1$s</xliff:g> सारख्या सेवांची प्रवेशयोग्यता उपलब्ध असणार नाही."</string>
-    <string name="encrypt_talkback_dialog_message_password" msgid="4276703366120881008">"या डिव्हाइसचा प्रारंभ करण्यासाठी तुम्ही तुमचा पासवर्ड एंटर करता, तेव्हा <xliff:g id="SERVICE">%1$s</xliff:g> सारख्या सेवांची प्रवेशयोग्यता उपलब्ध असणार नाही."</string>
+    <string name="encrypt_talkback_dialog_message_password" msgid="4276703366120881008">"या डिव्हाइसचा सुरू करण्यासाठी तुम्ही तुमचा पासवर्ड एंटर करता, तेव्हा <xliff:g id="SERVICE">%1$s</xliff:g> सारख्या सेवांची प्रवेशयोग्यता उपलब्ध असणार नाही."</string>
     <string name="direct_boot_unaware_dialog_message" msgid="5253248227337914350">"टीप: तुम्ही तुमचा फोन रीस्टार्ट केल्यास आणि स्क्रीन लॉक सेट केले असल्यास, तुम्ही तुमचा फोन अनलॉक करेपर्यंत हे अ‍ॅप सुरू होऊ शकत नाही"</string>
     <string name="imei_information_title" msgid="7666097743700170757">"IMEI माहिती"</string>
     <string name="imei_information_summary" msgid="716516316022275083">"IMEI सापेक्ष माहिती"</string>
@@ -3608,7 +3608,7 @@
     <string name="notifications_disabled" msgid="316658185757688983">"बंद"</string>
     <string name="notifications_partly_blocked" msgid="6330451240669068819">"<xliff:g id="COUNT_1">%2$d</xliff:g> पैकी <xliff:g id="COUNT_0">%1$d</xliff:g> वर्गवाऱ्या बंद"</string>
     <string name="notifications_silenced" msgid="538923056987616372">"शांत केले"</string>
-    <string name="notifications_redacted" msgid="308836040236690014">"संवेदनशील सामग्री लॉक स्क्रीनवर नाही"</string>
+    <string name="notifications_redacted" msgid="308836040236690014">"संवेदनशील आशय लॉक स्क्रीनवर नाही"</string>
     <string name="notifications_hidden" msgid="3665505522897010205">"लॉक स्क्रीनवर नाही"</string>
     <string name="notifications_priority" msgid="8849045645983017929">"व्यत्यय आणू नका अधिशून्य केले"</string>
     <string name="notifications_summary_divider" msgid="3148951310482572028">" / "</string>
@@ -3793,7 +3793,7 @@
     <string name="zen_access_revoke_warning_dialog_title" msgid="6850994585577513299">"<xliff:g id="APP">%1$s</xliff:g> साठी व्यत्यय आणू नका मध्‍ये प्रवेश करणे रद्द करायचे?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="3487422193181311403">"या ॲपने तयार केलेले सर्व व्यत्यय आणू नका नियम काढले जातील."</string>
     <string name="ignore_optimizations_on" msgid="4373971641328943551">"ऑप्टिमाइझ करू नका"</string>
-    <string name="ignore_optimizations_off" msgid="4372289432580282870">"ऑप्टिमाइझ करा"</string>
+    <string name="ignore_optimizations_off" msgid="4372289432580282870">"Optimize"</string>
     <string name="ignore_optimizations_on_desc" msgid="2904484569799521559">"तुमची बॅटरी खूप लवकर संपवू शकते. यापुढे अ‍ॅप बॅकग्राउंड बॅटरी वापरण्यापासून प्रतिबंधित नसेल."</string>
     <string name="ignore_optimizations_off_desc" msgid="5598702251817814289">"बॅटरी चांगली चालण्यासाठी शिफारस केलेले"</string>
     <string name="ignore_optimizations_title" msgid="7924345545276166305">"बॅटरी ऑप्टिमायझेशनकडे दुर्लक्ष करण्यासाठी <xliff:g id="APP">%s</xliff:g> ला अनुमती द्यायची?"</string>
@@ -3961,8 +3961,8 @@
     <string name="data_warning_footnote" msgid="965724845580257305">"डेटा चेतावणी आणि डेटा मर्यादा तुमच्या डिव्हाइसद्वारे मोजली जाते. ही गणना वाहक डेटापेक्षा भिन्न असू शकते."</string>
     <string name="set_data_limit" msgid="5043770023229990674">"डेटा मर्यादा सेट करा"</string>
     <string name="data_limit" msgid="5793521160051596228">"डेटा मर्यादा"</string>
-    <string name="data_usage_template" msgid="6848274347956096882">"<xliff:g id="ID_1">%1$s</xliff:g> दरम्यान <xliff:g id="ID_2">%2$s</xliff:g> वापरले"</string>
-    <string name="configure" msgid="8232696842838580549">"कॉन्फिगर करा"</string>
+    <string name="data_usage_template" msgid="6848274347956096882">"<xliff:g id="ID_2">%2$s</xliff:g> दरम्यान <xliff:g id="ID_1">%1$s</xliff:g> वापरले"</string>
+    <string name="configure" msgid="8232696842838580549">"कॉंफिगर करा"</string>
     <string name="data_usage_other_apps" msgid="7002491980141402084">"वापरामध्ये समाविष्‍ट केलेली इतर अ‍ॅप्स"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="6046013861315713697">
       <item quantity="other">डेटा सेव्हर सुरू असताना <xliff:g id="COUNT">%1$d</xliff:g> अ‍ॅप्सना अनिर्बंध डेटा वापरण्याची अनुमती दिली</item>
@@ -3996,7 +3996,7 @@
     <string name="unrestricted_app_summary" msgid="2829141815077800483">"डेटा सेव्हर सुरू असताना अनिर्बंध डेटा प्रवेशास अनुमती द्या"</string>
     <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_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">"तुमचे डिव्हाइस सुरू करण्यासाठी पिन आवश्यक आहे. बंद केले असताना, या डिव्हाइस ला कॉल, मेसेज, सूचना किंवा अलार्म प्राप्त होणार नाहीत."</string>
     <string name="lockpattern_settings_require_password_before_startup_summary" msgid="1266300087760553585">"तुमचे डिव्हाइस सुरू करण्यासाठी पासवर्ड आवश्यक आहे. बंद केले असताना, या डिव्हाइसला कॉल, मेसेज, सूचना किंवा अलार्म प्राप्त होणार नाहीत."</string>
@@ -4046,7 +4046,7 @@
     <string name="notification_log_details_ranking_none" msgid="3687243721168608404">"रँकिंग ऑब्जेक्ट मध्ये ही की असू शकत नाही."</string>
     <string name="theme_customization_category" msgid="4043457940936660368">"थीमिंग"</string>
     <string name="theme_customization_accent_color_title" msgid="3949108608589133216">"अ‍ॅक्सेंट रंग"</string>
-    <string name="theme_customization_font_title" msgid="309728559821356597">"ठळक शीर्षक / मुख्य भाग फॉन्ट"</string>
+    <string name="theme_customization_font_title" msgid="309728559821356597">"ठळक शीर्षक / मुख्य भाग फॉंट"</string>
     <string name="theme_customization_icon_shape_title" msgid="4603248388639328322">"आयकनचा आकार"</string>
     <string name="theme_customization_device_default" msgid="7188874258500934312">"डिव्हाइस डीफॉल्ट"</string>
     <string name="display_cutout_emulation" msgid="288975763151891685">"डिस्प्ले कटआउट"</string>
@@ -4059,12 +4059,12 @@
       <item quantity="one">1 अ‍ॅप अनिर्बंधित डेटा वापरू शकते</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>
     <string name="notification_suggestion_title" msgid="3292107671498148560">"लॉक स्क्रीनवरील माहिती नियंत्रित करा"</string>
-    <string name="notification_suggestion_summary" msgid="6516827892359614597">"सूचना सामग्री दर्शवा किंवा लपवा"</string>
+    <string name="notification_suggestion_summary" msgid="6516827892359614597">"सूचना आशय दर्शवा किंवा लपवा"</string>
     <string name="page_tab_title_summary" msgid="4824744863994538006">"सर्व"</string>
     <string name="page_tab_title_support" msgid="5569262185010367870">"टिपा आणि सपोर्ट"</string>
     <string name="developer_smallest_width" msgid="2603134476228805075">"सर्वात लहान रुंदी"</string>
@@ -4081,7 +4081,7 @@
     <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">"विनस्कोप ट्रेस"</string>
-    <string name="sensors_off_quick_settings_title" msgid="3655699045300438902">"सेंसर बंद आहेत"</string>
+    <string name="sensors_off_quick_settings_title" msgid="3655699045300438902">"सेन्सर बंद आहेत"</string>
     <string name="managed_profile_settings_title" msgid="4340409321523532402">"कार्य प्रोफाइल सेटिंग्ज"</string>
     <string name="managed_profile_contact_search_title" msgid="7337225196804457095">"संपर्क शोध"</string>
     <string name="managed_profile_contact_search_summary" msgid="7278267480246726951">"कॉलर आणि संपर्कांना ओळखण्यासाठी आपल्या संस्थेनुसार संपर्क शोधांची अनुमती द्या"</string>
@@ -4157,7 +4157,7 @@
     <string name="domain_url_section_title" msgid="206403507921518321">"इंस्टॉल केलेली अ‍ॅप्स"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="2630083316417707308">"तुमचा स्टोरेज आता स्टोरेज व्यवस्थापक व्यवस्थापित करत आहे"</string>
     <string name="account_for_section_header" msgid="5975241715840642563">"<xliff:g id="USER_NAME">%1$s</xliff:g> साठी खाती"</string>
-    <string name="configure_section_header" msgid="6988981883075615136">"कॉन्फिगर करा"</string>
+    <string name="configure_section_header" msgid="6988981883075615136">"कॉंफिगर करा"</string>
     <string name="auto_sync_account_title" msgid="2394463123733529506">"डेटा आपोआप सिंक करा"</string>
     <string name="auto_sync_personal_account_title" msgid="6844465157916100655">"वैयक्तिक डेटा स्वयंचलितपणे संकालित करा"</string>
     <string name="auto_sync_work_account_title" msgid="2403222633447522376">"कार्य डेटा स्वयंचलितपणे संकालित करा"</string>
@@ -4498,10 +4498,10 @@
     <string name="manage_app_notification" msgid="9072118910762792295">"<xliff:g id="APP_NAME">%1$s</xliff:g> सूचना व्यवस्थापित करा"</string>
     <string name="no_suggested_app" msgid="509257628685025383">"सुचवलेले अ‍ॅप्लिकेशन नाही"</string>
     <plurals name="notification_few_channel_count_summary" formatted="false" msgid="5165639207390218085">
-      <item quantity="other"><xliff:g id="NOTIFICATION_CHANNEL_COUNT_1">%1$d</xliff:g> सूचना चॅनेल.</item>
-      <item quantity="one"><xliff:g id="NOTIFICATION_CHANNEL_COUNT_0">%1$d</xliff:g> सूचना चॅनेल.</item>
+      <item quantity="other"><xliff:g id="NOTIFICATION_CHANNEL_COUNT_1">%1$d</xliff:g> सूचना चॅनल.</item>
+      <item quantity="one"><xliff:g id="NOTIFICATION_CHANNEL_COUNT_0">%1$d</xliff:g> सूचना चॅनल.</item>
     </plurals>
-    <string name="notification_many_channel_count_summary" msgid="9205641731142529086">"<xliff:g id="NOTIFICATION_CHANNEL_COUNT">%1$d</xliff:g> सूचना चॅनेल. सर्व व्यवस्थापित करण्यासाठी टॅप करा."</string>
+    <string name="notification_many_channel_count_summary" msgid="9205641731142529086">"<xliff:g id="NOTIFICATION_CHANNEL_COUNT">%1$d</xliff:g> सूचना चॅनल. सर्व व्यवस्थापित करण्यासाठी टॅप करा."</string>
     <string name="recently_installed_app" msgid="6491959945747808096">"तुम्ही हे अ‍ॅप नुकतेच इंस्टॉल केले."</string>
     <string name="media_output_panel_title" msgid="8429272102437211530">"आउटपुट स्विच करा"</string>
     <string name="media_output_panel_summary_of_playing_device" msgid="7425231720911606911">"सध्या <xliff:g id="DEVICE_NAME">%1$s</xliff:g> वर प्ले करत आहे"</string>
diff --git a/tests/CarDeveloperOptions/res/values-ms/strings.xml b/tests/CarDeveloperOptions/res/values-ms/strings.xml
index 0590a74..b7a4158 100644
--- a/tests/CarDeveloperOptions/res/values-ms/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ms/strings.xml
@@ -163,7 +163,7 @@
     <string name="bluetooth_sap_request" msgid="6318039677671263261">"Permintaan akses SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="1909352413109340355">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> mahu mengakses kad SIM anda. Pemberian akses kepada kad SIM akan melumpuhkan sambungan data pada peranti anda untuk tempoh sambungan itu. Berikan akses kepada <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="8661066392056595005">"Kelihatan kepada peranti lain sebagai “<xliff:g id="DEVICE_NAME">^1</xliff:g>”"</string>
-    <string name="bluetooth_off_footer" msgid="7658444560543730571">"Hidupkan Bluetooth untuk menyambung ke peranti lain."</string>
+    <string name="bluetooth_off_footer" msgid="7658444560543730571">"Hidupkan Bluetooth untuk menyambung kepada peranti lain."</string>
     <string name="bluetooth_paired_device_title" msgid="8361860197780425286">"Peranti anda"</string>
     <string name="bluetooth_pairing_page_title" msgid="9053463656712597709">"Gandingkan peranti baharu"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3601662966604648212">"Benarkan tablet anda berkomunikasi dengan peranti Bluetooth yang berdekatan"</string>
@@ -785,7 +785,7 @@
     <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="6040826983120279685">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputuskan sambungan daripada perkongsian sambungan Internet telefon ini."</string>
     <string name="bluetooth_device_advanced_title" msgid="5752155558126694036">"Peranti Bluetooth dipasangkan"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="7665622268007450665">"Sambung"</string>
-    <string name="bluetooth_device_advanced_online_mode_summary" msgid="4180673788239241086">"Sambung ke peranti Bluetooth"</string>
+    <string name="bluetooth_device_advanced_online_mode_summary" msgid="4180673788239241086">"Sambung kepada peranti Bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="1414487572426490659">"Gunakan untuk"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="2270087843175307865">"Namakan semula"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8258863155491651198">"Benarkan pindahan fail masuk"</string>
@@ -1584,7 +1584,7 @@
     <string name="reset_esim_error_title" msgid="4728931209471875632">"Tidak dapat memadamkan SIM"</string>
     <string name="reset_esim_error_msg" msgid="4716366079119742235">"SIM yang dimuat turun tidak dapat dipadamkan disebabkan ralat.\n\nMulakan semula peranti anda, kemudian cuba lagi."</string>
     <string name="master_clear_title" msgid="1560712943955904673">"Padamkan semua data (tetapan semula kilang)"</string>
-    <string name="master_clear_short_title" msgid="919098101581335101">"Pdm sma dta (ttpn smla kilang)"</string>
+    <string name="master_clear_short_title" msgid="919098101581335101">"Padamkan semua data"</string>
     <string name="master_clear_desc" product="tablet" msgid="3432373610755760899">"Tindakan ini akan memadamkan semua data daripada "<b>"storan dalaman"</b>" tablet anda, termasuk:\n\n"<li>"Akaun Google Anda"</li>\n<li>"Data serta tetapan sistem dan apl"</li>\n<li>"Apl yang telah dimuat turun"</li></string>
     <string name="master_clear_desc" product="default" msgid="8765543541962866697">"Tindakan ini akan memadamkan semua data daripada "<b>"storan dalaman"</b>" telefon anda, termasuk:\n\n"<li>"Akaun Google Anda"</li>\n<li>"Data serta tetapan sistem dan apl"</li>\n<li>"Apl yang dimuat turun"</li></string>
     <string name="master_clear_accounts" product="default" msgid="3432884235445405376">\n\n"Anda melog masuk ke dalam akaun berikut buat masa ini:\n"</string>
@@ -1888,7 +1888,7 @@
     <string name="app_install_location_title" msgid="5121617802063021720">"Lokasi pemasangan pilihan"</string>
     <string name="app_install_location_summary" msgid="109719780117187797">"Tukar lokasi pemasangan pilihan untuk aplikasi baru"</string>
     <string name="app_disable_dlg_positive" msgid="5508828271100168073">"Lumpuhkan apl"</string>
-    <string name="app_disable_dlg_text" msgid="9221864774943530281">"Jika anda melumpuhkan apl ini, Android dan apl lain mungkin tidak berfungsi seperti yang dimaksudkan lagi. Jangan lupa, anda tidak boleh memadamkan apl ini kerana apl diprapasang pada peranti anda. Dengan melumpuhkan apl, anda mematikan dan menyembunyikan apl ini pada peranti anda."</string>
+    <string name="app_disable_dlg_text" msgid="9221864774943530281">"Jika anda melumpuhkan apl ini, Android dan apl lain mungkin tidak berfungsi seperti yang sepatutnya. Jangan lupa, anda tidak boleh memadamkan apl ini kerana apl diprapasang pada peranti anda. Dengan melumpuhkan apl, anda mematikan dan menyembunyikan apl ini pada peranti anda."</string>
     <string name="app_disable_notifications_dlg_title" msgid="699530661413553928">"Matikan pemberitahuan"</string>
     <string name="app_install_details_group_title" msgid="2909597319422976921">"Gedung"</string>
     <string name="app_install_details_title" msgid="6954953384372934881">"Butiran apl"</string>
diff --git a/tests/CarDeveloperOptions/res/values-my/strings.xml b/tests/CarDeveloperOptions/res/values-my/strings.xml
index 7ae4421..7c26210 100644
--- a/tests/CarDeveloperOptions/res/values-my/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-my/strings.xml
@@ -26,7 +26,7 @@
       <item quantity="other">သင်သည် ယခု ဆောဖ့်ဝဲရေးသားသူထံမှ <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> အဆင့်အကွာအဝေးတွင် ရှိနေပါသည်။</item>
       <item quantity="one">သင်သည် ယခု ဆောဖ့်ဝဲရေးသားသူထံမှ <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> အဆင့် အကွာအဝေးတွင်ရှိနေပါသည်။</item>
     </plurals>
-    <string name="show_dev_on" msgid="9075712234786224065">"သင်ဟာ ယခု တည်ဆောက်သူတစ်ယောက် ဖြစ်နေပါပြီ!"</string>
+    <string name="show_dev_on" msgid="9075712234786224065">"သင်သည် ယခု ဆော့ဖ်ဝဲအင်ဂျင်နီယာ တစ်ဦး ဖြစ်နေပါပြီ။"</string>
     <string name="show_dev_already" msgid="7665948832405148689">"မလိုတော့ပါ။ သင်သည် တည်ဆောက်သူတစ်ယောက် ဖြစ်နေပြီ ဖြစ်သည်။"</string>
     <string name="dev_settings_disabled_warning" msgid="3198732189395396721">"တီထွင်သူများရွေးစရာကို ဦးစွာဖွင့်ပါ။"</string>
     <string name="header_category_wireless_networks" msgid="8968405993937795898">"ကြိုးမဲ့ &amp; ကွန်ရက်များ"</string>
@@ -309,8 +309,8 @@
     <string name="cellular_data_summary" msgid="8817717603450318646">"မိုဘိုင်းကွန်ရက်တွင် ဒေတာသုံးခွင့်ပြုပါ"</string>
     <string name="allow_data_usage_title" msgid="5381624105803294315">"ရိုမင်း လုပ်ချိန်မှာ ဒေတာ သုံးစွဲမှု ခွင့်ပြုရန်"</string>
     <string name="roaming" msgid="8860308342135146004">"ပြင်ပကွန်ရက်နှင့် ချိတ်ဆက်ခြင်း"</string>
-    <string name="roaming_enable" msgid="2108142024297441116">"ရုန်းမင်းဖြစ်နေလျှင် ဒေတာဝန်ဆောင်မှုများကို ချိတ်ဆက်ပါ"</string>
-    <string name="roaming_disable" msgid="1915440242079953809">"ရုန်းမင်းဖြစ်နေလျှင် ဒေတာဝန်ဆောင်မှုများကို ချိတ်ဆက်ပါ"</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_turn_it_on_button" msgid="4370846458830537578">"ဖွင့်မည်"</string>
     <string name="roaming_warning" msgid="5488050911277592868">"ငွေကြေး အတော်အတန်ကုန်ကျနိုင်ပါသည်။"</string>
@@ -912,7 +912,7 @@
     <string name="rx_wifi_speed" msgid="7392873246110937187">"လက်ခံခြင်းလင့်ခ် အမြန်နှုန်း"</string>
     <string name="wifi_frequency" msgid="6132852924995724246">"လှိုင်းနှုန်း"</string>
     <string name="wifi_ip_address" msgid="5572539114989914831">"အိုင်ပီလိပ်စာ"</string>
-    <string name="passpoint_label" msgid="7429247462404128615">"မှတဆင့် သိမ်းရန်"</string>
+    <string name="passpoint_label" msgid="7429247462404128615">"မှတစ်ဆင့် သိမ်းရန်"</string>
     <string name="passpoint_content" msgid="340527524510304327">"<xliff:g id="NAME">%1$s</xliff:g> အထောက်အထားများ"</string>
     <string name="wifi_eap_method" msgid="3752116941487485859">"EAPနည်းလမ်း"</string>
     <string name="please_select_phase2" msgid="5848080896810435677">"အဆင့်(၂) စစ်မှန်ကြောင်းအတည်ပြုခြင်း"</string>
@@ -1572,7 +1572,7 @@
     <string name="reset_dashboard_summary" msgid="8778383341461126642">"ကွန်ရက်၊ အက်ပ် (သို့) ကိရိယာများကို ပြင်ဆင်သတ်မှတ်နိုင်ပါသည်"</string>
     <string name="reset_network_title" msgid="8944059136930806211">"Wi-Fi၊ မိုဘိုင်း၊ ဘလူးတုသ် ပြင်ဆင်သတ်မှတ်ရန်"</string>
     <string name="reset_network_desc" msgid="4982633363916261109">"၎င်းသည် အောက်ပါတို့အပါအဝင် ကွန်ရက်ဆက်တင်များအားလုံးကို ပြင်ဆင်သတ်မှတ်လိုက်ပါမည်−\n\n"<li>"Wi‑Fi"</li>\n<li>"မိုဘိုင်းဒေတာ"</li>\n<li>"ဘလူးတုသ်"</li></string>
-    <string name="reset_esim_title" msgid="7630781767040831893">"ဒေါင်းလုဒ်လုပ်ထားသောကတ် ဖျက်ပါ"</string>
+    <string name="reset_esim_title" msgid="7630781767040831893">"ဒေါင်းလုဒ်လုပ်ထားသော ဆင်းမ်ကတ်များ ဖျက်ခြင်း"</string>
     <string name="reset_esim_desc" msgid="433226911566802">"အစားထိုး ဆင်းမ်ကတ်များ ဒေါင်းလုဒ်လုပ်ရန် သင့်ဝန်ဆောင်မှုပေးသူကို ဆက်သွယ်ပါ။ ၎င်းက မိုဘိုင်းဝန်ဆောင်မှု အစီအစဉ်များကို ပယ်ဖျက်မည်မဟုတ်ပါ။"</string>
     <string name="reset_network_button_text" msgid="4293271046867912819">"ဆက်တင်များ ပြင်ဆင်သတ်မှတ်ရန်"</string>
     <string name="reset_network_final_desc" msgid="2463817067048751373">"ကွန်ရက်ဆက်တင်များ အားလုံးကို ပြင်ဆင်သတ်မှတ်လိုပါသလား။ ဤလုပ်ဆောင်ချက်ကို ပြန်ပြင်၍ မရပါ။"</string>
@@ -4018,7 +4018,7 @@
     <string name="notification_log_details_key" msgid="5246636581068083931">"ကီး"</string>
     <string name="notification_log_details_group" msgid="5773333552680090289">"အုပ်စု"</string>
     <string name="notification_log_details_group_summary" msgid="3161461545200780773">"(အကျဉ်းချုပ်)"</string>
-    <string name="notification_log_details_visibility" msgid="7623631733460653410">"မြင်နိင်စွမ်း"</string>
+    <string name="notification_log_details_visibility" msgid="7623631733460653410">"မြင်နိုင်မှု"</string>
     <string name="notification_log_details_public_version" msgid="3828112447520697692">"အများသုံးဗားရှင်း"</string>
     <string name="notification_log_details_priority" msgid="4518553990099409699">"ဦးစားပေးမှု"</string>
     <string name="notification_log_details_importance" msgid="5002791265017246702">"အရေးပါမှု"</string>
@@ -4382,7 +4382,7 @@
     <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>
+    <string name="carrier_settings_title" msgid="7989949967020825268">"မိုဘိုင်းဖုန်းကုမ္ပဏီ ဆက်တင်များ"</string>
     <string name="cdma_lte_data_service" msgid="8996857851150069339">"ဒေတာဝန်ဆောင်မှု စတင်ရန်"</string>
     <string name="mobile_data_settings_title" msgid="3439626666647519547">"မိုဘိုင်းဒေတာ"</string>
     <string name="mobile_data_settings_summary" msgid="6492798151325636912">"မိုဘိုင်းကွန်ရက်သုံးပြီး ဒေတာကို ဝင်သုံးခွင့်ပေးပါ"</string>
diff --git a/tests/CarDeveloperOptions/res/values-nb/strings.xml b/tests/CarDeveloperOptions/res/values-nb/strings.xml
index 6830cd7..b9a2491 100644
--- a/tests/CarDeveloperOptions/res/values-nb/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-nb/strings.xml
@@ -2601,7 +2601,7 @@
     <string name="work_mode_label" msgid="6845849194740195757">"Jobbprofil"</string>
     <string name="work_mode_on_summary" msgid="1682781113156323592">"Administreres av organisasjonen din"</string>
     <string name="work_mode_off_summary" msgid="1688885392211178315">"Apper og varsler er slått av"</string>
-    <string name="remove_managed_profile_label" msgid="4625542553784793536">"Fjern arbeidsprofilen"</string>
+    <string name="remove_managed_profile_label" msgid="4625542553784793536">"Fjern jobbprofilen"</string>
     <string name="background_data" msgid="8275750862371471171">"Bakgrunnsdata"</string>
     <string name="background_data_summary" msgid="799640633948841990">"Apper kan når som helst synkronisere, sende og motta data"</string>
     <string name="background_data_dialog_title" msgid="8306650658158895976">"Vil du deaktivere bakgrunnsdata?"</string>
@@ -2888,7 +2888,7 @@
     <string name="user_confirm_remove_self_title" msgid="6739480453680217543">"Vil du slette deg selv?"</string>
     <string name="user_confirm_remove_title" msgid="1034498514019462084">"Vil du slette brukeren?"</string>
     <string name="user_profile_confirm_remove_title" msgid="6138684743385947063">"Fjerne denne profilen?"</string>
-    <string name="work_profile_confirm_remove_title" msgid="3168910958076735800">"Vil du fjerne arbeidsprofilen?"</string>
+    <string name="work_profile_confirm_remove_title" msgid="3168910958076735800">"Fjern jobbprofilen?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="2889456786320157545">"Lagringsplassen og dataene dine blir fjernet fra dette nettbrettet. Denne handlingen kan ikke angres."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="8441729423565705183">"Lagringsplassen og dataene dine blir fjernet fra telefonen. Denne handlingen kan ikke angres."</string>
     <string name="user_confirm_remove_message" msgid="5202150470271756013">"Alle apper og data slettes."</string>
@@ -3140,7 +3140,7 @@
     <string name="alarm_volume_option_title" msgid="3184076022438477047">"Alarmvolum"</string>
     <string name="ring_volume_option_title" msgid="2038924918468372264">"Ringevolum"</string>
     <string name="notification_volume_option_title" msgid="1358512611511348260">"Varselvolum"</string>
-    <string name="ringtone_title" msgid="1409086028485922583">"Telefonringelyd"</string>
+    <string name="ringtone_title" msgid="1409086028485922583">"Ringetone"</string>
     <string name="notification_ringtone_title" msgid="2932960620843976285">"Standard varsellyd"</string>
     <string name="notification_unknown_sound_title" msgid="8043718667804838398">"Lyd fra app"</string>
     <string name="notification_sound_default" msgid="2664544380802426260">"Standard varsellyd"</string>
diff --git a/tests/CarDeveloperOptions/res/values-ne/arrays.xml b/tests/CarDeveloperOptions/res/values-ne/arrays.xml
index 1d1b779..36b3607 100644
--- a/tests/CarDeveloperOptions/res/values-ne/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-ne/arrays.xml
@@ -237,7 +237,7 @@
     <item msgid="3254999273961542982">"SMS पढ्नुहोस्"</item>
     <item msgid="7711446453028825171">"SMS लेख्नुहोस्"</item>
     <item msgid="6123238544099198034">"SMS प्राप्त गर्नुहोस्"</item>
-    <item msgid="838342167431596036">"आपतकालीन SMS प्राप्त गर्नुहोस्"</item>
+    <item msgid="838342167431596036">"आपत्‌कालीन SMS प्राप्त गर्नुहोस्"</item>
     <item msgid="8554432731560956686">"MMS प्राप्त गर्नुहोस्"</item>
     <item msgid="7464863464299515059">"WAP push प्राप्त गर्नुहोस्"</item>
     <item msgid="310463075729606765">"SMS पठाउनुहोस्"</item>
@@ -414,7 +414,7 @@
     <item msgid="5408915841694583740">"जडान विच्छेद भयो"</item>
     <item msgid="8754480102834556765">"सुरुवात भैरहेको छ..."</item>
     <item msgid="3351334355574270250">"जडान हुँदै..."</item>
-    <item msgid="8303882153995748352">"जडान गरियो"</item>
+    <item msgid="8303882153995748352">"कनेक्ट गरियो"</item>
     <item msgid="9135049670787351881">"समय सकियो"</item>
     <item msgid="2124868417182583926">"असफल"</item>
   </string-array>
diff --git a/tests/CarDeveloperOptions/res/values-ne/strings.xml b/tests/CarDeveloperOptions/res/values-ne/strings.xml
index e838045..30e65ed 100644
--- a/tests/CarDeveloperOptions/res/values-ne/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ne/strings.xml
@@ -26,7 +26,7 @@
       <item quantity="other">अहिले तपाईं विकासकर्ता हुनका लागि <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> चरण टाढा हुनुहुन्छ।</item>
       <item quantity="one">अहिले तपाईं विकासकर्ता हुनका लागि <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> चरण टाढा हुनुहुन्छ।</item>
     </plurals>
-    <string name="show_dev_on" msgid="9075712234786224065">"तपाईं अब एउटा विकासकर्ता हुनुहुन्छ!"</string>
+    <string name="show_dev_on" msgid="9075712234786224065">"तपाईं अब एउटा विकासकर्ता हुनुभएको छ!"</string>
     <string name="show_dev_already" msgid="7665948832405148689">"आवश्यक छैन, तपाईं आफैँ नै एउटा विकासकर्ता हुनुहुन्छ।"</string>
     <string name="dev_settings_disabled_warning" msgid="3198732189395396721">"कृपया पहिले विकासकर्ताका विकल्पहरूलाई सक्षम पार्नुहोस्"</string>
     <string name="header_category_wireless_networks" msgid="8968405993937795898">"ताररहित र सञ्जालहरू"</string>
@@ -56,7 +56,7 @@
     <string name="radio_info_ims_reg_status" msgid="4771711884059371514">"IMS को दर्ता: <xliff:g id="STATUS">%1$s</xliff:g>\nभ्वाइस ओभर LTE: <xliff:g id="AVAILABILITY_0">%2$s</xliff:g>\nभ्वाइस ओभर WiFi: <xliff:g id="AVAILABILITY_1">%3$s</xliff:g>\nभिडियो कलिङ: <xliff:g id="AVAILABILITY_2">%4$s</xliff:g>\nUT को इन्टरफेस: <xliff:g id="AVAILABILITY_3">%5$s</xliff:g>"</string>
     <string name="radioInfo_service_in" msgid="1297020186765943857">"सेवामा"</string>
     <string name="radioInfo_service_out" msgid="8460363463722476510">"सेवा उपलब्ध छैन"</string>
-    <string name="radioInfo_service_emergency" msgid="7674989004735662599">"आपतकालीन कल मात्र"</string>
+    <string name="radioInfo_service_emergency" msgid="7674989004735662599">"आपत्‌कालीन कल मात्र"</string>
     <string name="radioInfo_service_off" msgid="1873939869994136791">"रेडियो निष्क्रिय छ"</string>
     <string name="radioInfo_roaming_in" msgid="7059350234710947417">"रोमिङ"</string>
     <string name="radioInfo_roaming_not" msgid="7733269160603599835">"रोमिङमा छैन"</string>
@@ -113,7 +113,7 @@
     <string name="bluetooth_disconnect_all_profiles" product="device" msgid="4707569949253450208">"तपाईंको यन्त्र <xliff:g id="DEVICE_NAME">%1$s</xliff:g> बाट विच्छेद हुनेछ।"</string>
     <string name="bluetooth_disconnect_dialog_ok" msgid="4183522987246110145">"विच्छेद गर्नुहोस्"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="3616298363281495777">"तपाईं सँग ब्लुटुथ सेटिङहरू परिवर्तन गर्न अनुमति छैन।"</string>
-    <string name="bluetooth_pairing_pref_title" msgid="2904954138013884029">"नयाँ यन्त्रलाई जोडा बनाउनुहोस्"</string>
+    <string name="bluetooth_pairing_pref_title" msgid="2904954138013884029">"नयाँ यन्त्रको जोडा बनाउनुहोस्"</string>
     <string name="bluetooth_is_visible_message" msgid="6341088682252805612">"ब्लुटुथ सेटिङहरू खुला हुँदा <xliff:g id="DEVICE_NAME">%1$s</xliff:g> लाई नजिकैका उपकरणहरू देख्न सक्नेछन्।"</string>
     <string name="bluetooth_footer_mac_message" product="default" msgid="335341476746836260">"फोनको ब्लुटुथ ठेगाना: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_footer_mac_message" product="tablet" msgid="6033609611245782463">"ट्याब्लेटको ब्लुटुथ ठेगाना: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
@@ -165,7 +165,7 @@
     <string name="bluetooth_device_name_summary" msgid="8661066392056595005">"अन्य यन्त्रहरूमा <xliff:g id="DEVICE_NAME">^1</xliff:g> को रूपमा देखिन्छ"</string>
     <string name="bluetooth_off_footer" msgid="7658444560543730571">"अन्य यन्त्रहरूमा जडान गर्न ब्लुटुथ सक्रिय गर्नुहोस्‌।"</string>
     <string name="bluetooth_paired_device_title" msgid="8361860197780425286">"तपाईंका यन्त्रहरू"</string>
-    <string name="bluetooth_pairing_page_title" msgid="9053463656712597709">"नयाँ यन्त्रलाई जोडा बनाउनुहोस्"</string>
+    <string name="bluetooth_pairing_page_title" msgid="9053463656712597709">"नयाँ यन्त्रको जोडा बनाउनुहोस्"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3601662966604648212">"आफ्नो ट्याब्लेटलाई वरपरका ब्लुटुथ यन्त्रहरूसँग सञ्चार गर्न दिनुहोस्"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2286727776570956969">"आफ्नो यन्त्रलाई वरपरका ब्लुटुथ यन्त्रहरूसँग सञ्चार गर्न दिनुहोस्"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="863659221858781186">"आफ्नो फोनलाई वरपरका ब्लुटुथ यन्त्रहरूसँग सञ्चार गर्न दिनुहोस्"</string>
@@ -263,7 +263,7 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="67933353112027726">"मिडियाको लागि SD कार्ड स्क्यान गर्दै..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="7959964366461613091">"USB भण्डारण पढ्ने मात्र माउन्ट गरियो।"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="8854112253788893415">"SD कार्ड पढ्ने मात्र माउन्ट गरियो।"</string>
-    <string name="skip_label" msgid="8067961347551157478">"छोड्नुहोस्"</string>
+    <string name="skip_label" msgid="8067961347551157478">"स्किप गर्नु"</string>
     <string name="next_label" msgid="4710056309804362410">"अर्को"</string>
     <string name="language_picker_title" msgid="7807759931261107686">"भाषाहरू"</string>
     <string name="locale_remove_menu" msgid="3395565699934985486">"हटाउनुहोस्"</string>
@@ -309,8 +309,8 @@
     <string name="cellular_data_summary" msgid="8817717603450318646">"मोबाइल नेटवर्कमार्फत डेटा प्रयोग गर्न अनुमति दिनुहोस्"</string>
     <string name="allow_data_usage_title" msgid="5381624105803294315">"रोमिङ हुँदा डेटा उपयोग अनुमति"</string>
     <string name="roaming" msgid="8860308342135146004">"रोमिङ"</string>
-    <string name="roaming_enable" msgid="2108142024297441116">"रोमिङ हुँदा डेटा सेवासँग जोड्नुहोस्"</string>
-    <string name="roaming_disable" msgid="1915440242079953809">"रोमिङ हुँदा डेटा सेवासँग जोड्नुहोस्"</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_turn_it_on_button" msgid="4370846458830537578">"सक्रिय पार्नुहोस्"</string>
     <string name="roaming_warning" msgid="5488050911277592868">"तपाईंलाई महत्त्वपूर्ण शुल्क लाग्न सक्छ।"</string>
@@ -424,9 +424,9 @@
     <string name="security_settings_face_settings_require_confirmation" msgid="7312024271060416438">"सधैँ पुष्टि गर्न आवश्यक पर्छ"</string>
     <string name="security_settings_face_settings_require_confirmation_details" msgid="8740564864091803429">"एपहरूमा प्रमाणीकरण गर्दा सधैँ पुष्टि गर्न आवश्यक पर्छ"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="2821359954483136239">"अनुहारसम्बन्धी डेटा हटाउनुहोस्"</string>
-    <string name="security_settings_face_settings_footer" msgid="4627175759990550715">"तपाईंको यन्त्र अनलक गर्न र अनुप्रयोगहरूमाथि पहुँच राख्न तपाईंको अनुहार प्रयोग गर्न सकिन्छ। "<annotation id="url">"थप जान्नुहोस्"</annotation></string>
+    <string name="security_settings_face_settings_footer" msgid="4627175759990550715">"तपाईंको यन्त्र अनलक गर्न र एपमाथि पहुँच राख्न तपाईंको अनुहार प्रयोग गर्न सकिन्छ। "<annotation id="url">"थप जान्नुहोस्"</annotation></string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="5675319895815271094">"अनुहारसम्बन्धी डेटा मेट्ने हो?"</string>
-    <string name="security_settings_face_settings_remove_dialog_details" msgid="3754494807169276107">"फेस अनलक गर्ने सुविधामार्फत रेकर्ड गरिएको डेटा स्थायी रूपमा र सुरक्षित रूपमा मेटिने छ। हटाइसकेपछि, आफ्नो फोन अनलक गर्न, एपहरूमा साइन इन गर्न र भुक्तानी पुष्टि गर्न तपाईंसँग आफ्नो PIN, ढाँचा वा पासवर्ड हुनु पर्ने छ।"</string>
+    <string name="security_settings_face_settings_remove_dialog_details" msgid="3754494807169276107">"फेस अनलक गर्ने सुविधामार्फत रेकर्ड गरिएको डेटा स्थायी रूपमा र सुरक्षित रूपमा मेटिने छ। हटाइसकेपछि, आफ्नो फोन अनलक गर्न, एपहरूमा साइन इन गर्न र भुक्तानी पुष्टि गर्न तपाईंसँग आफ्नो PIN, प्याटर्न वा पासवर्ड हुनु पर्ने छ।"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="4177132225930582928">"औंठाछाप"</string>
     <string name="fingerprint_manage_category_title" msgid="1463406696801542090">"औंठाछापहरू व्यवस्थापन गर्नुहोस्"</string>
     <string name="fingerprint_usage_category_title" msgid="7298369141954599706">"निम्नको लागि औठाछाप प्रयोग गर्नुहोस्"</string>
@@ -439,12 +439,12 @@
     <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_message_setup" msgid="6734490666593320711">"तपाईंको फोन अनलक वा खरिदहरूको अनुमोदन गर्न आफ्नो फिंगरप्रिन्ट प्रयोग गर्नुहोस्।\n\nटिपोट: तपाईंको फिंगरप्रिन्ट भरपर्दो प्याटर्न वा PIN भन्दा कम सुरक्षित हुनसक्छ।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="9168637333731599827">"रद्द गर्नुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="271662150372486535">"जारी राख्नुहोस्"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="756928427429893070">"छोड्नुहोस्"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="756928427429893070">"स्किप गर्नु"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="4125977169169671144">"अर्को"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="763018850721691594">"फिंगरप्रिन्ट सेटअप छाड्ने हो?"</string>
     <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="8849928362049018680">"फिंगरप्रिन्ट सेटअप गर्न केवल एक वा दुई मिनेट लाग्छ। छाड्नु भएको खण्डमा, तपाईं सेटिङहरूमा गएर पछि आफ्नो फिंगरप्रिन्ट थप्न सक्नुहुन्छ।"</string>
@@ -457,7 +457,7 @@
     <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="5361573789585652826">"यन्त्रको सुरक्षासम्बन्धी सुविधाहरू सक्रिय गरिने छैनन्। तपाईं यो फोन हराएको वा चोरी भएको अवस्थामा अरूलाई यो चलाउनबाट रोक्न सक्नुहुने छैन।"</string>
     <string name="skip_anyway_button_label" msgid="4437815969645175429">"जसरी पनि छाड्नुहोस्"</string>
     <string name="go_back_button_label" msgid="7310586887969860472">"पछाडि फिर्ता जानुहोस्"</string>
-    <string name="skip_lock_screen_dialog_button_label" msgid="6706047245716780006">"छाड्नुहोस्"</string>
+    <string name="skip_lock_screen_dialog_button_label" msgid="6706047245716780006">"स्किप गर्नु"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="2534925227627658819">"रद्द गर्नुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="8909829699273726469">"सेन्सरमा छुनुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="581120963079780740">"यो तपाईंको फोनको पछाडिको भागमा छ। आफ्नो चोर औंला प्रयोग गर्नुहोस्‌।"</string>
@@ -493,7 +493,7 @@
     <string name="fingerprint_enroll_button_add" msgid="6335782936874996629">"अर्को थप्नुहोस्"</string>
     <string name="fingerprint_enroll_button_next" msgid="6419214079104413695">"अर्को"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="5831834311961551423">"तपाईँले आफ्नो फोन खोल्नका अतिरिक्त खरिद र एप पहुँच प्राधिकरण गर्नाका लागि पनि आफ्नो फिंगरप्रिन्ट प्रयोग गर्न सक्नुहुन्छ। "<annotation id="url">"थप जान्नुहोस्"</annotation></string>
-    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7954742554236652690">" स्क्रिन लकको विकल्प असक्षम पारिएको छ। थप जान्नलाई आफ्नो सङ्गठनको प्रशासकलाई सम्पर्क गर्नुहोस्। "<annotation id="admin_details">"थप विवरणहरू"</annotation>\n\n"तपाईं खरिदहरूलाई अधिकार दिन र अनुप्रयोगमाथि पहुँच पाउनका लागि आफ्नो फिंगरप्रिन्ट समेत प्रयोग गर्न सक्नुहुन्छ। "<annotation id="url">"थप जान्नुहोस्"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7954742554236652690">" स्क्रिन लकको विकल्प असक्षम पारिएको छ। थप जान्नलाई आफ्नो सङ्गठनको प्रशासकलाई सम्पर्क गर्नुहोस्। "<annotation id="admin_details">"थप विवरणहरू"</annotation>\n\n"तपाईं खरिदहरूलाई अधिकार दिन र एपमाथि पहुँच पाउनका लागि आफ्नो फिंगरप्रिन्ट समेत प्रयोग गर्न सक्नुहुन्छ। "<annotation id="url">"थप जान्नुहोस्"</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1670703069782212223">"औँला उठाई, फेरि सेंसर छुनुहोस्"</string>
     <string name="fingerprint_add_max" msgid="2939393314646115661">"तपाईं <xliff:g id="COUNT">%d</xliff:g> सम्म फिंगरप्रिन्टहरू थप्न सक्नुहुन्छ"</string>
     <string name="fingerprint_intro_error_max" msgid="3247720976621039437">"तपाईंले अधिकतम संख्यामा फिंगरप्रिन्टहरू थप्नुभएको छ"</string>
@@ -515,7 +515,7 @@
     <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>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="1341590897367808702">"तपाईंले इन्क्रिप्सन सुरु गर्नु अघि लक स्क्रिन PIN वा पासवर्ड सेट गर्न आवश्यक छ।"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="1341590897367808702">"तपाईंले इन्क्रिप्सन सुरु गर्नुअघि लक स्क्रिन PIN वा पासवर्ड सेट गर्न आवश्यक छ।"</string>
     <string name="crypt_keeper_confirm_title" msgid="8884417036062084547">"इन्क्रिप्ट गर्ने हो?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2713708841024805586">"इन्क्रिप्सन कार्य उल्ट्याउन मिल्दैन र यदि तपाईँले अवरोध पुर्‍याउनु भयो भने तपाईँले डेटा गुमाउनु हुने छ। इन्क्रिप्सनले एक घन्टा वा बढी समय लिन सक्छ, यस समयमा ट्याब्लेट धेरै पटक पुनःस्टार्ट हुन सक्छ।"</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="2483549885938505746">"इन्क्रिप्सन अपरेसन उल्टाउन मिल्दैन र यदि तपाईँले यसलाई अवरूद्ध गर्नु भयो भने तपाईँले डेटा गुमाउनु हुने छ। इनक्रिप्सनलाई करिब एक घन्टा वा बढी लाग्छ जुन समय फोन धेरै चोटि पुनःस्टार्ट हुन सक्छ।"</string>
@@ -561,13 +561,13 @@
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="3861167251234952373">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> सुतेपछि"</string>
     <string name="unlock_set_unlock_launch_picker_title_profile" msgid="7976345264630422921">"कार्य प्रोफाइलको लक"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="32310692507029407">"लक स्क्रिन बदल्नुहोस्"</string>
-    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2072792784866320522">"ढाँचा, PIN वा पासवर्ड सुरक्षा बदल्नुहोस् वा असक्षम पार्नुहोस्"</string>
+    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2072792784866320522">"प्याटर्न, PIN वा पासवर्ड सुरक्षा बदल्नुहोस् वा असक्षम पार्नुहोस्"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="9070847611379078795">"स्क्रिन लक गर्न कुनै विधि छान्नुहोस्"</string>
     <string name="unlock_set_unlock_off_title" msgid="5049876793411416079">"कुनै पनि होइन"</string>
     <string name="unlock_set_unlock_off_summary" msgid="3997346045783359119"></string>
     <string name="unlock_set_unlock_none_title" msgid="1922027966983146392">"स्वाइप गर्नुहोस्"</string>
     <string name="unlock_set_unlock_none_summary" msgid="4044529413627659031">"कुनै सुरक्षा छैन"</string>
-    <string name="unlock_set_unlock_pattern_title" msgid="7533759994999423587">"ढाँचा"</string>
+    <string name="unlock_set_unlock_pattern_title" msgid="7533759994999423587">"प्याटर्न"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="8858697834522201333">"मध्यम सुरक्षा"</string>
     <string name="unlock_set_unlock_pin_title" msgid="361479901761948207">"PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="8076921768675948228">"मध्यमदेखि उच्च सुरक्षा"</string>
@@ -575,12 +575,12 @@
     <string name="unlock_set_unlock_password_summary" msgid="7042787631866059147">"उच्च सुरक्षा"</string>
     <string name="unlock_set_do_later_title" msgid="2939110070503695956">"अहिले होइन"</string>
     <string name="current_screen_lock" msgid="398328543694154510">"वर्तमान स्क्रिन लक"</string>
-    <string name="fingerprint_unlock_set_unlock_pattern" msgid="132337696546315927">"फिंगरप्रिन्ट + ढाँचा"</string>
+    <string name="fingerprint_unlock_set_unlock_pattern" msgid="132337696546315927">"फिंगरप्रिन्ट + प्याटर्न"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="886426673328906002">"फिंगरप्रिन्ट + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="3325527833422156515">"फिंगरप्रिन्ट + पासवर्ड"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="2063700014903801639">"फिंगरप्रिन्ट बिना जारी राख्नुहोस्"</string>
     <string name="fingerprint_unlock_title" msgid="8009992449332532869">"तपाईं आफ्नो फिंगरप्रिन्टको प्रयोग गरी आफ्नो फोन अनलक गर्न सक्नुहुन्छ। सुरक्षाका खातिर यस विकल्पलाई एउटा ब्याकअप स्क्रिन लकको आवश्यकता पर्दछ।"</string>
-    <string name="face_unlock_set_unlock_pattern" msgid="3748596996869406905">"अनुहार प्रमाणीकरण + ढाँचा"</string>
+    <string name="face_unlock_set_unlock_pattern" msgid="3748596996869406905">"अनुहार प्रमाणीकरण + प्याटर्न"</string>
     <string name="face_unlock_set_unlock_pin" msgid="3320824093518497476">"अनुहार प्रमाणीकरण + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8962344604388383659">"अनुहार प्रमाणीकरण + पासवर्ड"</string>
     <string name="face_unlock_skip_face" msgid="7173197040501143880">"अनुहार प्रमाणीकरणविनै जारी राख्नुहोस्"</string>
@@ -588,14 +588,14 @@
     <string name="unlock_set_unlock_disabled_summary" msgid="1713159782896140817">"प्रशासक, इन्क्रिप्सन नीति वा प्रामाणिक भण्डारणद्वारा असक्षम पारिएको छ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="2950701212659081973">"कुनै पनि होइन"</string>
     <string name="unlock_set_unlock_mode_none" msgid="3441605629077912292">"स्वाइप गर्नुहोस्"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="8564909572968419459">"ढाँचा"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="8564909572968419459">"प्याटर्न"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="7828354651668392875">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="397703731925549447">"पासवर्ड:"</string>
     <string name="unlock_setup_wizard_fingerprint_details" msgid="6515136915205473675">"तपाईँले एकपटक स्क्रिन लक सेटअप गरिसकेपछि तपाईँले तपाईँको औँठाछाप सेटिङहरू &gt; सुरक्षामा सेटअप गर्न पनि सक्नुहुन्छ।"</string>
     <string name="unlock_disable_lock_title" msgid="3508492427073600294">"स्क्रिन लक बन्द गर्नुहोस्"</string>
     <string name="unlock_disable_frp_warning_title" msgid="5858589970505254193">"यन्त्रमाथिको सुरक्षा हटाउने हो?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="3814123014295965266">"प्रोफाइल सुरक्षा हटाउने हो?"</string>
-    <string name="unlock_disable_frp_warning_content_pattern" msgid="1843950215687159135">"यन्त्र सुरक्षा सुविधाहरू तपाईँको ढाँचा बिना काम गर्ने छैनन्।"</string>
+    <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>
@@ -611,7 +611,7 @@
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="5775815077478538855">"यन्त्रका सुरक्षासम्बन्धी सुविधाहरूले तपाईंको स्क्रिन लकबिना काम गर्ने छैनन्। <xliff:g id="EMPTY_LINE">
 
 </xliff:g>यस यन्त्रबाट तपाईंका सुरक्षित गरिएका फिंगरप्रिन्टहरू पनि हटाइने छन् र तपाईं तिनीहरूमार्फत आफ्नो फोन अनलक गर्ने, खरिदसम्बन्धी आधिकार प्रदान गर्ने वा एपहरूमा साइन इन गर्ने कार्यहरू गर्न सक्नुहुनेछैन।"</string>
-    <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="2369992898062808499">"प्रोफाइल सुरक्षा विशेषताहरूले तपाईँको ढाँचा बिना काम गर्नेछैनन्।"</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>
@@ -628,22 +628,22 @@
 
 </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_pattern_title" msgid="7622476883851319877">"अनलक प्याटर्न बदल्नुहोस्"</string>
     <string name="unlock_change_lock_pin_title" msgid="6671224158800812238">"अनलक PIN परिवर्तन गर्नुहोस्"</string>
     <string name="unlock_change_lock_password_title" msgid="7886432065775170719">"अनलक पासवर्ड परिवर्तन गर्नुहोस्"</string>
     <string name="unlock_footer_high_complexity_requested" msgid="8016987143669762130">"<xliff:g id="APP_NAME">%1$s</xliff:g> ले कुनै भरपर्दो PIN वा पासवर्ड सिफारिस गर्छ र उक्त PIN वा पासवर्डविना यसले अपेक्षाअनुरूप काम नगर्न सक्छ"</string>
     <string name="unlock_footer_medium_complexity_requested" msgid="5004825329461874633">"<xliff:g id="APP_NAME">%1$s</xliff:g> ले कुनै नयाँ PIN वा पासवर्ड सिफारिस गर्छ र उक्त PIN वा पासवर्डविना यसले अपेक्षाअनुरूप काम नगर्न सक्छ"</string>
-    <string name="unlock_footer_low_complexity_requested" msgid="513212093196833566">"<xliff:g id="APP_NAME">%1$s</xliff:g> ले कुनै नयाँ ढाँचा, PIN वा पासवर्ड सिफारिस गर्छ र उक्त ढाँचा, PIN वा पासवर्डविना यसले अपेक्षाअनुरूप काम नगर्न सक्छ"</string>
+    <string name="unlock_footer_low_complexity_requested" msgid="513212093196833566">"<xliff:g id="APP_NAME">%1$s</xliff:g> ले कुनै नयाँ प्याटर्न, PIN वा पासवर्ड सिफारिस गर्छ र उक्त प्याटर्न, 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_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_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_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>
@@ -1111,8 +1111,8 @@
     <string name="wifi_calling_mode_wifi_only_summary" msgid="6928556021002500522">"Wi‑Fi मार्फत कल गर्नुहोस्। 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_2" msgid="8648609693875720408"></string>
-    <string name="emergency_address_title" msgid="5779915349686787024">"आपतकालीन ठेगाना"</string>
-    <string name="emergency_address_summary" msgid="478668478569851714">"तपाईंले Wi‑Fi मार्फत आपतकालीन कल गर्दा उक्त ठेगानालाई तपाईंको स्थानको रूपमा प्रयोग गरिन्छ"</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">"DNS का सुविधाहरूबारे "<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>
@@ -1130,7 +1130,7 @@
     <string name="notification_volume_title" msgid="6022562909288085275">"सूचना"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="7312942422655861175">"सूचनाहरूको लागि आगमन कल भोल्युम प्रयोग गर्नुहोस्"</string>
     <string name="home_work_profile_not_supported" msgid="6137073723297076818">"कार्य प्रोफाइल समर्थन गर्दैन"</string>
-    <string name="notification_sound_dialog_title" msgid="6653341809710423276">"पूर्वनिर्धारित सूचना आवाज"</string>
+    <string name="notification_sound_dialog_title" msgid="6653341809710423276">"सूचनाको पूर्वनिर्धारित ध्वनि"</string>
     <string name="media_volume_title" msgid="1030438549497800914">"मिडिया"</string>
     <string name="media_volume_summary" msgid="3142433516297061652">"सङ्गीत र भिडियोका लागि भोल्युम सेट गर्नुहोस्"</string>
     <string name="alarm_volume_title" msgid="8902277801531496243">"अलार्म"</string>
@@ -1157,7 +1157,7 @@
     <string name="dock_audio_summary_unknown" msgid="1615958511030469507">"संलग्न डकको लागि सेटिङहरू"</string>
     <string name="dock_not_found_title" msgid="2035088760477532435">"डक भेटिएन"</string>
     <string name="dock_not_found_text" product="tablet" msgid="5996654431405111902">"डक अडियो सेट गर्न अघि तपाईँले ट्याब्लेट डक गर्नु पर्ने हुन्छ।"</string>
-    <string name="dock_not_found_text" product="default" msgid="8275091896320216368">"तपाईंले डक अडियो सेटिङ गर्नु अघि फोन डक गर्नु आवश्यक पर्दछ।"</string>
+    <string name="dock_not_found_text" product="default" msgid="8275091896320216368">"तपाईंले डक अडियो सेटिङ गर्नुअघि फोन डक गर्नु आवश्यक पर्दछ।"</string>
     <string name="dock_sounds_enable_title" msgid="3385931465312084061">"डक राख्ने आवाज"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="4322104626905111669">"डकबाट ट्याब्लेट हटाउँदा वा राख्दा आवाज बजाउनुहोस्"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="2751810717801098293">"फोन डकमा राख्दा वा झिक्दा आवाज बजाउनुहोस्"</string>
@@ -1372,7 +1372,7 @@
     <string name="memory_apps_usage" msgid="1886814780760368266">"एप &amp; एप डेटा"</string>
     <string name="memory_media_usage" msgid="2744652206722240527">"मिडिया"</string>
     <string name="memory_downloads_usage" msgid="7039979723012065168">"डाउनलोडहरू"</string>
-    <string name="memory_dcim_usage" msgid="599009211606524732">"तस्बिरहरू, भिडियोहरू"</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>
@@ -1388,7 +1388,7 @@
     <string name="sd_mount_summary" product="default" msgid="6849124618494311233"></string>
     <string name="sd_format" product="nosdcard" msgid="918370986254863144">"USB भण्डारण मेटाउनुहोस्"</string>
     <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="nosdcard" msgid="1179857727779521920">"आन्तरिक USB भण्डारणमा सम्पूर्ण डेटाहरू मेटाउँछ, जस्तै सङ्गीत र फोटोहरू"</string>
     <string name="sd_format_summary" product="default" msgid="4284028411908176234">"SD कार्डमा सबै डेटा जस्तै सङ्गीत र फोटोहरू मेटाउँछ"</string>
     <string name="memory_clear_cache_title" msgid="4306793268129306684">"क्यास डेटा हटाउनु हुन्छ?"</string>
     <string name="memory_clear_cache_message" msgid="6723120398411410031">"यसले सबै अनुप्रयोगहरूको लागि केस गरिएको डेटा हटाउँछ।"</string>
@@ -1410,9 +1410,9 @@
     <string name="storage_menu_rename" msgid="3731682449294417745">"पुन: नामाकरण गर्नुहोस्"</string>
     <string name="storage_menu_mount" msgid="6395893560780365473">"माउन्ट गर्नुहोस्"</string>
     <string name="storage_menu_unmount" msgid="5041360076873514189">"निकाल्नुहोस्"</string>
-    <string name="storage_menu_format" msgid="4285487419855632896">"फरम्याट गर्नुहोस्"</string>
-    <string name="storage_menu_format_public" msgid="5361388353980722971">"पोर्टेबल रूपमा फरम्याट गर्नुहोस्"</string>
-    <string name="storage_menu_format_private" msgid="5288599205435858720">"आन्तरिक रूपमा फरम्याट गर्नुहोस्"</string>
+    <string name="storage_menu_format" msgid="4285487419855632896">"फर्म्याट गर्नुहोस्"</string>
+    <string name="storage_menu_format_public" msgid="5361388353980722971">"पोर्टेबल रूपमा फर्म्याट गर्नुहोस्"</string>
+    <string name="storage_menu_format_private" msgid="5288599205435858720">"आन्तरिक रूपमा फर्म्याट गर्नुहोस्"</string>
     <string name="storage_menu_migrate" msgid="1885806122515759703">"डेटा सार्नुहोस्"</string>
     <string name="storage_menu_forget" msgid="4345021250834642640">"बिर्सनुहोस्"</string>
     <string name="storage_menu_set_up" msgid="2849170579745958513">"सेटअप गर्नुहोस्"</string>
@@ -1426,7 +1426,7 @@
     <string name="usb_ptp_title" msgid="6629335976394685361">"क्यामेरा (PTP)"</string>
     <string name="usb_ptp_summary" msgid="460425275251168189">"तपाईँलाई क्यामेरा सफ्टवेयर प्रयोग गरेर फोटोहरू स्थानान्तरण गर्न, र MTP समर्थन नगर्ने कम्प्युटरमा कुनै पनि फाइलहरू स्थानान्तरण दिन्छ।"</string>
     <string name="usb_midi_title" msgid="8626512517313340943">"MIDI"</string>
-    <string name="usb_midi_summary" msgid="3607444815743771712">"MIDI द्वारा सक्रिय अनुप्रयोगहरूलाई तपाईंको कम्प्युटरमा USB मार्फत MIDI सफ्टवेयरसँग काम गर्न दिन्छ।"</string>
+    <string name="usb_midi_summary" msgid="3607444815743771712">"MIDI द्वारा सक्रिय एपहरूलाई तपाईंको कम्प्युटरमा USB मार्फत MIDI सफ्टवेयरसँग काम गर्न दिन्छ।"</string>
     <string name="storage_other_users" msgid="1055693465220962928">"अन्य प्रयोगकर्ताहरू"</string>
     <string name="storage_internal_title" msgid="7969898703086593200">"यन्त्र भण्डारण"</string>
     <string name="storage_external_title" msgid="3308178326521953306">"पोर्टेबल भण्डारण"</string>
@@ -1438,17 +1438,17 @@
     <string name="storage_mount_failure" msgid="3189035117100226603">"<xliff:g id="NAME">%1$s</xliff:g> लाई माउन्ट गर्न सकेन"</string>
     <string name="storage_unmount_success" msgid="4671254520043852798">"<xliff:g id="NAME">%1$s</xliff:g> सुरक्षित तवरले निकालिएको छ"</string>
     <string name="storage_unmount_failure" msgid="2224554531048745614">"<xliff:g id="NAME">%1$s</xliff:g> सुरक्षित तवरले निकाल्न सकिएन"</string>
-    <string name="storage_format_success" msgid="5626883039766897517">"<xliff:g id="NAME">%1$s</xliff:g> फरम्याट गरियो"</string>
-    <string name="storage_format_failure" msgid="4383764964041410256">"<xliff:g id="NAME">%1$s</xliff:g> फरम्याट गर्न सकिएन"</string>
+    <string name="storage_format_success" msgid="5626883039766897517">"<xliff:g id="NAME">%1$s</xliff:g> फर्म्याट गरियो"</string>
+    <string name="storage_format_failure" msgid="4383764964041410256">"<xliff:g id="NAME">%1$s</xliff:g> फर्म्याट गर्न सकिएन"</string>
     <string name="storage_rename_title" msgid="9117863170875961530">"भण्डारण पुन: नामाकरण गर्नुहोस्"</string>
     <string name="storage_dialog_unmounted" msgid="515810851912430933">"यो <xliff:g id="NAME_0">^1</xliff:g> सुरक्षित रूपमा निकालियो, तर अझै पनि उपलब्ध छ। \n\n यो <xliff:g id="NAME_1">^1</xliff:g> प्रयोग गर्न, तपाईँले पहिला यो माउन्ट गर्नुपर्छ।"</string>
     <string name="storage_dialog_unmountable" msgid="7082856306456936054">"यो <xliff:g id="NAME_0">^1</xliff:g> बिग्रिएको छ। \n\n यो <xliff:g id="NAME_1">^1</xliff:g> प्रयोग गर्न, तपाईँले पहिले यसलाई सेटअप गर्नुहोस्।"</string>
     <string name="storage_dialog_unsupported" msgid="8274023677580782553">"यो यन्त्रले यो <xliff:g id="NAME_0">^1</xliff:g> लाई समर्थन गर्दैन। \n\n यस यन्त्रसँग यो <xliff:g id="NAME_1">^1</xliff:g> प्रयोग गर्न, तपाईँले पहिला यो सेटअप गर्नुपर्छ।"</string>
-    <string name="storage_internal_format_details" msgid="2780806013122012384">"ढाँचामा मिलाएपछि, तपाईँले यसलाई <xliff:g id="NAME_0">^1</xliff:g> अन्य यन्त्रहरूमा प्रयोग गर्न सक्नुहुन्छ। \n\nयसका <xliff:g id="NAME_1">^1</xliff:g> सबै डेटा मेटिनेछन्। पहिले ब्याकअप राख्ने बारे विचार गर्नुहोस्। \n\n"<b>"तस्बिर तथा अन्य मिडिया ब्याकअप गर्नुहोस्"</b>" \n यस यन्त्रमा वैकल्पिक भण्डारण गर्न आफ्नो मिडिया फाइलहरू सार्नुहोस्, वा USB केबल प्रयोग गरी कम्प्युटरको स्थानान्तरण गर्नुहोस्। \n\n"<b>"एपहरू ब्याकअप गर्नुहोस्"</b>" \n यसमा <xliff:g id="NAME_6">^1</xliff:g> भण्डारित सबै एपहरू हटाइने छन् र तिनका डेटा मेटिनेछन्। यी एपहरू राख्न, यस यन्त्रमा वैकल्पिक भण्डारण गर्न तिनीहरूलाई सार्नुहोस्।"</string>
-    <string name="storage_internal_unmount_details" msgid="4667435317528624039"><b>"जब तपाईं <xliff:g id="NAME_0">^1</xliff:g> लाई निकाल्नुहुन्छ, यसमा भएका एपहरू चल्न छोड्नेछन्, र पुनः नघुसाएसम्म त्यसमा भएका मिडिया फाइलहरू उपलब्ध हुने छैनन्।"</b>\n\n"यो <xliff:g id="NAME_1">^1</xliff:g> यस यन्त्रमा मात्र काम गर्ने हिसाबले फरम्याट गरिएको छ। यो अन्य कुनैमा काम गर्ने छैन।"</string>
+    <string name="storage_internal_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>
-    <string name="storage_internal_forget_confirm" msgid="3052483375203727176">"यो <xliff:g id="NAME">^1</xliff:g> मा भण्डारण गरिएका सबै एपहरू, तस्बिरहरू, र डेटा सधैंका लागि नष्ट हुनेछन्।"</string>
+    <string name="storage_internal_forget_confirm" msgid="3052483375203727176">"यो <xliff:g id="NAME">^1</xliff:g> मा भण्डारण गरिएका सबै एपहरू, फोटोहरू, र डेटा सधैंका लागि नष्ट हुनेछन्।"</string>
     <string name="storage_detail_apps" msgid="8154648512504196820">"एपहरू"</string>
     <string name="storage_detail_images" msgid="6996202225684468964">"छविहरू"</string>
     <string name="storage_detail_videos" msgid="6030983354721080849">"भिडियोहरू"</string>
@@ -1459,16 +1459,16 @@
     <string name="storage_detail_explore" msgid="8206900269596580264">"<xliff:g id="NAME">^1</xliff:g> अन्वेषण गर्नुहोस्"</string>
     <string name="storage_detail_dialog_other" msgid="5073511663616043370">"अन्यमा एपहरूले सुरक्षित गेरका साझा फाइल, इन्टरनेट वा ब्लुटुथबाट डाउनलोड गरिएका फाइल, Android का फाइलहरू र यस्तै थप कुराहरू पर्छन्। \n\nयो <xliff:g id="NAME">^1</xliff:g> का देख्न सकिने सामग्रीहरू हेर्न अन्वेषण गर्नुहोस् नामक विकल्पमा ट्याप गर्नुहोस्।"</string>
     <string name="storage_detail_dialog_system" msgid="1472572861360014226">"प्रणालीमा Android संस्करण <xliff:g id="VERSION">%s</xliff:g> चलाउनका लागि प्रयोग भएका फाइलहरू समावेश छन्"</string>
-    <string name="storage_detail_dialog_user" msgid="1663117417635010371">"<xliff:g id="USER_0">^1</xliff:g> ले तस्बिर, सङ्गीत, एप वा अन्य डेटा सुरक्षित गर्नुभएको हुनसक्छ, जसले <xliff:g id="SIZE">^2</xliff:g> भण्डारण ओगटिरहेको छ। \n\nविवरणहरू हेर्न <xliff:g id="USER_1">^1</xliff:g> मा स्विच गर्नुहोस्।"</string>
+    <string name="storage_detail_dialog_user" msgid="1663117417635010371">"<xliff:g id="USER_0">^1</xliff:g> ले फोटो, सङ्गीत, एप वा अन्य डेटा सुरक्षित गर्नुभएको हुनसक्छ, जसले <xliff:g id="SIZE">^2</xliff:g> भण्डारण ओगटिरहेको छ। \n\nविवरणहरू हेर्न <xliff:g id="USER_1">^1</xliff:g> मा स्विच गर्नुहोस्।"</string>
     <string name="storage_wizard_init_title" msgid="3407283236421089014">"तपाईँको <xliff:g id="NAME">^1</xliff:g> सेट गर्नुहोस्"</string>
     <string name="storage_wizard_init_external_title" msgid="6853250619674645478">"पोर्टेबल भण्डारणको रूपमा प्रयोग गर्नुहोस्"</string>
-    <string name="storage_wizard_init_external_summary" msgid="6993815290050489327">"यन्त्रहरू बीच तस्बिर र अन्य मिडिया सार्नका लागि।"</string>
+    <string name="storage_wizard_init_external_summary" msgid="6993815290050489327">"यन्त्रहरू बीच फोटो र अन्य मिडिया सार्नका लागि।"</string>
     <string name="storage_wizard_init_internal_title" msgid="8750856962785644870">"आन्तरिक भण्डारणको रूपमा प्रयोग गर्नुहोस्"</string>
-    <string name="storage_wizard_init_internal_summary" msgid="4510546464921608029">"यस यन्त्रमा मात्र कुनै पनि चिज, एप र तस्बिरहरू  भण्डारण गर्नाका लागि। यसलाई ढाँचा मिलाउन आवश्यक हुन्छ जसले अर्का यन्त्रहरूसँग काम गर्नबाट रोक्छ।"</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_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_title" msgid="5866830103788091426">"पोर्टेबल भण्डारणका रूपमा फर्म्याट गर्नुहोस्"</string>
+    <string name="storage_wizard_format_confirm_public_body" msgid="1451308701654703353">"यसको लागि <xliff:g id="NAME_0">^1</xliff:g> फर्म्याट गर्न आवश्यक छ।\n\n"<b>"फर्म्याट गर्दा <xliff:g id="NAME_1">^1</xliff:g> भण्डार गरिएका सबै डेटा नष्ट हुनेछ।"</b>"डेटा जोगाउन ब्याकअप गर्ने बारे बिचार गर्नुहोस्।"</string>
     <string name="storage_wizard_format_confirm_next" msgid="236947984802247625">"ढाँचा मेटाउनुहोस्"</string>
     <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>
@@ -1482,8 +1482,8 @@
     <string name="storage_wizard_migrate_progress_title" msgid="7542196688665109833">"डेटा सार्दै..."</string>
     <string name="storage_wizard_migrate_details" msgid="4269509141637554985">"सार्दाको समयमा: \n• <xliff:g id="NAME">^1</xliff:g> नहटाउनुहोस्। \n• केही एपहरूले सही काम गर्ने छैन। \n• यन्त्र चार्जमा राख्नुहोस्।"</string>
     <string name="storage_wizard_ready_title" msgid="4905921139763520341">"तपाईंको <xliff:g id="NAME">^1</xliff:g> प्रयोगका लागि तयार छ"</string>
-    <string name="storage_wizard_ready_external_body" msgid="8785407468656286236">"तपाईँको <xliff:g id="NAME">^1</xliff:g> तस्बिर र अन्य मिडिया प्रयोग गर्न सबै सेट छ।"</string>
-    <string name="storage_wizard_ready_internal_body" msgid="2258287496678469217">"तपाईँको नयाँ <xliff:g id="NAME">^1</xliff:g> ले काम गर्दैछ। \n\n यो यन्त्रमा तस्बिरहरू, फाइलहरू, र एप डेटा सार्न, सेटिङ &amp;gt मा जानुहोस्; भण्डारण गर्नुहोस्।"</string>
+    <string name="storage_wizard_ready_external_body" msgid="8785407468656286236">"तपाईँको <xliff:g id="NAME">^1</xliff:g> फोटो र अन्य मिडिया प्रयोग गर्न सबै सेट छ।"</string>
+    <string name="storage_wizard_ready_internal_body" msgid="2258287496678469217">"तपाईँको नयाँ <xliff:g id="NAME">^1</xliff:g> ले काम गर्दैछ। \n\n यो यन्त्रमा फोटोहरू, फाइलहरू, र एप डेटा सार्न, सेटिङ &amp;gt मा जानुहोस्; भण्डारण गर्नुहोस्।"</string>
     <string name="storage_wizard_move_confirm_title" msgid="7362472162039287488">"सार्नुहोस् <xliff:g id="APP">^1</xliff:g>"</string>
     <string name="storage_wizard_move_confirm_body" msgid="502315190416551319">"<xliff:g id="NAME_0">^2</xliff:g> मा <xliff:g id="APP">^1</xliff:g> र यसको डेटा सार्न केही बेर मात्र लिनेछ। तपाईं सार्ने क्रम पूरा नहुन्जेल एप प्रयोग गर्न सक्नुहुने छैन। \n\n सार्ने क्रममा <xliff:g id="NAME_1">^2</xliff:g> नहटाउनुहोस्।"</string>
     <string name="storage_wizard_move_unlock" msgid="7978193904519827600">"डेटा सार्न तपाईंले प्रयोगकर्ताको <xliff:g id="APP">^1</xliff:g> अनलक गर्नु पर्ने हुन्छ।"</string>
@@ -1586,7 +1586,7 @@
     <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>
+    <string name="master_clear_desc" product="default" msgid="8765543541962866697">"यस कार्यले तपाईंको यन्त्रको "<b>"आन्तरिक भण्डारण"</b>" बाट सम्पूर्ण डेटा मेटाउँछ, जसमा निम्न कुराहरू पर्दछन्:\n\n"<li>"तपाईंको Google खाता"</li>\n<li>"प्रणाली र एपका डेटा तथा सेटिङहरू"</li>\n<li>"डाउनलोड गरिएका एपहरू"</li></string>
     <string name="master_clear_accounts" product="default" msgid="3432884235445405376">\n" \nतपाईं अहिले निम्न खाताहरूमा साइन इन हुनुहुन्छ:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5993259656117566767">\n\n" यस यन्त्रमा हाल अन्य प्रयोगकर्ताहरु छन्। \n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="3947303501615091903"><li>"संगीत"</li>\n<li>"तस्बिरहरू"</li>\n<li>"अन्य उपयोगकर्ता डेटा"</li></string>
@@ -1610,9 +1610,9 @@
     <string name="master_clear_progress_text" msgid="5418958116008976218">"कृपया प्रतीक्षा गर्नुहोला..."</string>
     <string name="call_settings_title" msgid="5033906789261282752">"कल सेटिङहरू"</string>
     <string name="call_settings_summary" msgid="2119161087671450035">"भ्वाइस मेल, कल फर्वार्ड, कल प्रतीक्षा, र कलर ID सेटअप गर्नुहोस्"</string>
-    <string name="tether_settings_title_usb" msgid="4265582654602420357">"USB टेथर गर्दै"</string>
+    <string name="tether_settings_title_usb" msgid="4265582654602420357">"USB टेदर गर्दै"</string>
     <string name="tether_settings_title_wifi" msgid="2060965130234484613">"पोर्टेबल हटस्पट"</string>
-    <string name="tether_settings_title_bluetooth" msgid="1999590158102569959">"ब्लुटुथ टेथर गर्दै"</string>
+    <string name="tether_settings_title_bluetooth" msgid="1999590158102569959">"ब्लुटुथ टेदर गर्दै"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="1159128764162788159">"टेदर गर्दै"</string>
     <string name="tether_settings_title_all" msgid="6935843543433954181">"हटस्पट र टेदरिङ"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="1289593649526514499">"हटस्पट सक्रिय छ, टेदरिङ"</string>
@@ -1623,7 +1623,7 @@
     <string name="usb_tethering_button_text" msgid="6242228383142012332">"USB टेदर गर्दै"</string>
     <string name="usb_tethering_subtext" product="default" msgid="1573513260339548671">"USB मार्फत फोनको इन्टरनेट सेयर गर्नुहोस्"</string>
     <string name="usb_tethering_subtext" product="tablet" msgid="154536000235361034">"USB मार्फत ट्याब्लेटको इन्टरनेट जडान साझा गर्नुहोस्"</string>
-    <string name="bluetooth_tether_checkbox_text" msgid="7257293066139372774">"ब्लुटुथ टेथर गर्दै"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="7257293066139372774">"ब्लुटुथ टेदर गर्दै"</string>
     <string name="bluetooth_tethering_subtext" product="tablet" msgid="6868756914621131635">"ब्लुटुथमार्फत ट्याब्लेटको इन्टरनेट जडान सझा गर्नुहोस्‌"</string>
     <string name="bluetooth_tethering_subtext" product="default" msgid="9167912297565425178">"ब्लुटुथमार्फत फोनको इन्टरनेट सेयर गर्नुहोस्‌"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="3981528184780083266">"ब्लुटुथमार्फत यो <xliff:g id="DEVICE_NAME">%1$d</xliff:g> को इन्टरनेट जडान साझा गर्दै"</string>
@@ -1667,7 +1667,7 @@
     <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>
+    <string name="location_neighborhood_level" msgid="8459352741296587916">"तपाईँको स्थानलाई सीघ्र अनुमान गर्न एपहरूलाई Google स्थान सेवा प्रयोग गर्न अनुमति दिनुहोस्। बेनामी स्थान डेटा भेला गरिने छ र Googleमा पठाइने छ।"</string>
     <string name="location_neighborhood_level_wifi" msgid="6120133551482003840">"वाइ-फाइद्वारा निर्धारित स्थान"</string>
     <string name="location_gps" msgid="688049341158297763">"GPS सेटेलाइट"</string>
     <string name="location_street_level" product="tablet" msgid="4459804798444296650">"तपाईँको स्थान इङ्गित गर्नको लागि तपाईँको ट्याब्लेटमा एपलाई GPS को प्रयोग गर्न दिनुहोस्"</string>
@@ -1678,7 +1678,7 @@
     <string name="use_location_title" msgid="7724788634359496634">"स्थान; Google खोजी"</string>
     <string name="use_location_summary" msgid="7396716606067400283">"तपाईँको खोजका परिणाम र अन्य सेवाहरू सुधार्नका लागि गुगललाई तपाईँको स्थान प्रयोग गर्न अनुमति दिनुहोस्"</string>
     <string name="location_access_title" msgid="8587974819606800029">"मेरो स्थानमा पहुँच गर्नुहोस्"</string>
-    <string name="location_access_summary" msgid="6919495149026354355">"तपाईंको अनुमतिबाट अनुप्रयोगहरूलाई तपाईंको स्थान जानकारीको उपयोग गर्न दिनुहोस्।"</string>
+    <string name="location_access_summary" msgid="6919495149026354355">"तपाईंको अनुमतिबाट एपहरूलाई तपाईंको स्थान जानकारीको उपयोग गर्न दिनुहोस्।"</string>
     <string name="location_sources_heading" msgid="8526658357120282741">"स्थान स्रोतहरू"</string>
     <string name="about_settings" product="tablet" msgid="4869626690708456341">"ट्याब्लेटको बारेमा"</string>
     <string name="about_settings" product="default" msgid="6019547763377294261">"फोनको बारेमा"</string>
@@ -1714,7 +1714,7 @@
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1102927520952116303">"फिंगरप्रिन्ट प्रयोग गर्न PIN सेट गर्नुहोस्"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="1503075455752279687">"सुरक्षाका लागि प्याटर्न सेट गर्नुहोस्"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="9055242184126838887">"आफ्नो पासवर्ड पुन: प्रविष्टि गर्नुहोस्"</string>
-    <string name="lockpassword_confirm_your_pattern_header" msgid="7137526922696316545">"तपाईँको ढाँचा निश्चित गर्नुहोस्"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7137526922696316545">"तपाईंको प्याटर्न निश्चित गर्नुहोस्"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="4335593948303036343">"आफ्नो PIN पुन: प्रविष्टि गर्नुहोस्"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="1783767008133345784">"पासवर्ड मेल खाँदैन"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="5444357293637748942">"PIN मिल्दैन"</string>
@@ -1724,37 +1724,37 @@
     <string name="lockpassword_pin_set_toast" msgid="172594825722240059">"PIN सेट भएको छ।"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6923260369475481406">"शैली सेट गरिएको छ।"</string>
     <string name="lockpassword_choose_your_password_header_for_face" msgid="8823110536502072216">"अनुहार प्रमाणीकरण प्रयोग गर्न पासवर्ड सेट गर्नुहोस्"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_face" msgid="5563793748503883666">"अनुहार प्रमाणीकरण प्रयोग गर्न ढाँचा सेट गर्नुहोस्"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_face" msgid="5563793748503883666">"अनुहार प्रमाणीकरण प्रयोग गर्न प्याटर्न सेट गर्नुहोस्"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="7238352632535405068">"अनुहार प्रमाणीकरण प्रयोग गर्न PIN सेट गर्नुहोस्"</string>
-    <string name="lockpassword_confirm_your_pattern_generic" msgid="6146545393074070916">"जारी राख्नका लागि आफ्नो यन्त्रको ढाँचा प्रयोग गर्नुहोस्"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="6146545393074070916">"जारी राख्नका लागि आफ्नो यन्त्रको प्याटर्न प्रयोग गर्नुहोस्"</string>
     <string name="lockpassword_confirm_your_pin_generic" msgid="8732268389177735264">"जारी राख्नका लागि आफ्नो यन्त्रको PIN प्रविष्टि गर्नुहोस्"</string>
     <string name="lockpassword_confirm_your_password_generic" msgid="6304552647060899594">"जारी राख्नका लागि आफ्नो यन्त्रको पासवर्ड प्रविष्टि गर्नुहोस्"</string>
-    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="3074250084050465513">"जारी राख्नका लागि आफ्नो कार्य प्रोफाइलको ढाँचा प्रयोग गर्नुहोस्"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="3074250084050465513">"जारी राख्नका लागि आफ्नो कार्य प्रोफाइलको प्याटर्न प्रयोग गर्नुहोस्"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="6037908971086439523">"जारी राख्नका लागि आफ्नो कार्य प्रोफाइलको PIN प्रविष्टि गर्नुहोस्"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="2646162490703489685">"जारी राख्नका लागि आफ्नो कार्य प्रोफाइलको पासवर्ड प्रविष्टि गर्नुहोस्"</string>
-    <string name="lockpassword_strong_auth_required_device_pattern" msgid="1014214190135045781">"थप सुरक्षाका लागि आफ्नो यन्त्रको ढाँचा प्रयोग गर्नुहोस्‌"</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="1014214190135045781">"थप सुरक्षाका लागि आफ्नो यन्त्रको प्याटर्न प्रयोग गर्नुहोस्‌"</string>
     <string name="lockpassword_strong_auth_required_device_pin" msgid="24030584350601016">"थप सुरक्षाका लागि आफ्नो यन्त्रको PIN प्रविष्टि गर्नुहोस्"</string>
     <string name="lockpassword_strong_auth_required_device_password" msgid="7746588206458754598">"थप सुरक्षाका लागि आफ्नो यन्त्रको पासवर्ड प्रविष्टि गर्नुहोस्"</string>
-    <string name="lockpassword_strong_auth_required_work_pattern" msgid="6861154706098327320">"थप सुरक्षाका लागि आफ्नो यन्त्रको कार्य प्रोफाइलको ढाँचा प्रयोग गर्नुहोस्"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="6861154706098327320">"थप सुरक्षाका लागि आफ्नो यन्त्रको कार्य प्रोफाइलको प्याटर्न प्रयोग गर्नुहोस्"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="6306902249365524526">"थप सुरक्षाका लागि आफ्नो यन्त्रको कार्य प्रोफाइलको PIN प्रविष्टि गर्नुहोस्"</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_pattern_details_frp" msgid="1085862410379709928">"तपाईंको फोन फ्याक्ट्री सेटिङमा रिसेट गरिएको छ। यो फोन प्रयोग गर्न आफ्नो पछिल्लो प्याटर्न प्रविष्टि गर्नुहोस्।"</string>
     <string name="lockpassword_confirm_your_pin_details_frp" msgid="6849889353126558761">"तपाईंको फोन फ्याक्ट्री सेटिङमा रिसेट गरिएको छ। यो फोन प्रयोग गर्न आफ्नो पछिल्लो PIN प्रविष्टि गर्नुहोस्।"</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_pattern_header_frp" msgid="3290569334665839860">"प्याटर्न पुष्टि गर्नुहोस्‌"</string>
     <string name="lockpassword_confirm_your_pin_header_frp" msgid="8520474869079710782">"PIN पुष्टि गर्नुहोस्‌"</string>
     <string name="lockpassword_confirm_your_password_header_frp" msgid="7326670978891793470">"पासवर्ड पुष्टि गर्नुहोस्"</string>
     <string name="lockpassword_invalid_pin" msgid="3059022215815900137">"गलत PIN"</string>
     <string name="lockpassword_invalid_password" msgid="8374331995318204099">"गलत पासवर्ड"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1328670466959377948">"प्याटर्न मिलेन"</string>
     <string name="lock_settings_title" msgid="233657584969886812">"यन्त्र सुरक्षा"</string>
-    <string name="lockpattern_change_lock_pattern_label" msgid="333149762562581510">"अनलक ढाँचा परिवर्तन गर्नुहोस्"</string>
+    <string name="lockpattern_change_lock_pattern_label" msgid="333149762562581510">"अनलक प्याटर्न परिवर्तन गर्नुहोस्"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="3435796032210265723">"PIN अनलक बदल्नुहोस्"</string>
     <string name="lockpattern_recording_intro_header" msgid="2262005028838969839">"अनलक प्याटर्न बनाउनुहोस्"</string>
     <string name="lockpattern_recording_intro_footer" msgid="5426745740754065099">"मद्दतका लागि मेनुमा थिच्नुहोस्।"</string>
     <string name="lockpattern_recording_inprogress" msgid="4060818382176523671">"सकिएपछि औँला उचाल्नुहोस्।"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="6374760294545431845">"कम्तीमा <xliff:g id="NUMBER">%d</xliff:g>वटा थोप्लाहरू जोड्नुहोस्। फेरि प्रयास गर्नुहोस्:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="2108106638322637851">"ढाँचा रेकर्ड भयो।"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="2108106638322637851">"प्याटर्न रेकर्ड भयो।"</string>
     <string name="lockpattern_need_to_confirm" msgid="4079482507985867389">"पुष्टि गर्न प्याटर्न फेरि बनाउनुहोस्"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="5603156929428721407">"नयाँ अनलक प्याटर्न:"</string>
     <string name="lockpattern_confirm_button_text" msgid="7059311304112902598">"निश्चित गर्नुहोस्"</string>
@@ -1762,16 +1762,16 @@
     <string name="lockpattern_retry_button_text" msgid="5473976578241534298">"खाली गर्नुहोस्"</string>
     <string name="lockpattern_continue_button_text" msgid="3328913552656376892">"जारी राख्नुहोस्"</string>
     <string name="lockpattern_settings_title" msgid="5152005866870766842">"प्याटर्न अनलक गर्नुहोस्"</string>
-    <string name="lockpattern_settings_enable_title" msgid="8508410891939268080">"ढाँचा आवश्यक पर्छ"</string>
-    <string name="lockpattern_settings_enable_summary" msgid="8027605503917737512">"स्क्रिन अनलक गर्न ढाँचा चित्रण गर्नै पर्छ"</string>
+    <string name="lockpattern_settings_enable_title" msgid="8508410891939268080">"प्याटर्न आवश्यक पर्छ"</string>
+    <string name="lockpattern_settings_enable_summary" msgid="8027605503917737512">"स्क्रिन अनलक गर्न प्याटर्न कोर्नै पर्छ"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="4935583222709647096">"ढाँचालाई देख्न मिल्ने बनाउनुहोस्"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="5338893138982642228">"प्रोफाइलको ढाँचालाई देखिने बनाउनुहोस्"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="3203621862806531947">"ट्याप गर्दा भाइब्रेट गर्नुहोस्"</string>
     <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5890335732200257777">"पावर बटनले तुरुन्त लक गर्दछ"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="1279989004145567840">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> जे अनलक अवस्थामा राखेका बेला बाहेक"</string>
-    <string name="lockpattern_settings_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_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="activity_not_found" msgid="3492413375341165453">"एप तपाईँको फोनमा स्थापना गरिएको छैन।"</string>
     <string name="lock_settings_profile_title" msgid="3928992050074556160">"कार्य प्रोफाइलको सुरक्षा"</string>
@@ -1841,9 +1841,9 @@
     <string name="sort_order_frequent_notification" msgid="5640245013098010347">"प्रायःजसो प्रयोग हुने"</string>
     <string name="show_running_services" msgid="1895994322704667543">"चालु सेवाहरू देखाउनुहोस्"</string>
     <string name="show_background_processes" msgid="88012264528093617">"केस गरिएका प्रक्रियाहरू"</string>
-    <string name="default_emergency_app" msgid="286530070173495823">"आपतकालीन एप"</string>
-    <string name="reset_app_preferences" msgid="1426500030595212077">"अनुप्रयोगका प्राथमिकताहरू रिसेट गर्नुहोस् रिसेट गर्नुहोस्"</string>
-    <string name="reset_app_preferences_title" msgid="792909865493673598">"अनुप्रयोगका अनुप्रयोगका प्राथमिकताहरू रिसेट गर्ने हो?"</string>
+    <string name="default_emergency_app" msgid="286530070173495823">"आपत्‌कालीन एप"</string>
+    <string name="reset_app_preferences" msgid="1426500030595212077">"एपका प्राथमिकताहरू रिसेट गर्नुहोस् रिसेट गर्नुहोस्"</string>
+    <string name="reset_app_preferences_title" msgid="792909865493673598">"एपका एपका प्राथमिकताहरू रिसेट गर्ने हो?"</string>
     <string name="reset_app_preferences_desc" msgid="7935273005301096031">"यसले सबै  प्राथमिकताहरूलाई रिसेट गर्ने छ:\n\n "<li>"असक्षम पारिएका एपहरू"</li>\n" "<li>"असक्षम पारिएका एप सूचनाहरू"</li>\n" "<li>"कार्यका लागि पूर्वनिर्धारित एपहरू"</li>\n" "<li>"एपहरूको लागि पृष्ठभूमि डेटा प्रतिबन्धहरू"</li>\n" "<li>"कुनै अनुमति प्रतिबन्धहरू"</li>\n\n" तपाईँले कुनै पनि एप डेटा गुमाउनु हुने छैन।"</string>
     <string name="reset_app_preferences_button" msgid="2041894727477934656">"एपहरू रिसेट गर्नुहोस्"</string>
     <string name="manage_space_text" msgid="6166469422303124302">"ठाउँको प्रबन्ध गर्नुहोस्"</string>
@@ -1861,12 +1861,12 @@
     <string name="internal_storage" msgid="7392373600013294853">"आन्तरिक भण्डारण"</string>
     <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="clear_data_dlg_text" msgid="6849657743695013414">"यस एपका सम्पूर्ण डेटाहरू स्थायी रूपमा मेटाइने छ। यसमा सम्पूर्ण फाइल, सेटिङ, खाताहरू, डेटाबेस आदि पर्दछन्।"</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>
@@ -1886,7 +1886,7 @@
     <string name="force_stop_dlg_title" msgid="8822779487097246675">"बलपूर्वक रोक्ने हो?"</string>
     <string name="force_stop_dlg_text" msgid="7435245769456493398">"यदि तपाईँले एपलाई जबर्जस्ती रोक्नु भएको खण्डमा त्यसले चाहेअनुसार काम नगर्न सक्छ।"</string>
     <string name="app_install_location_title" msgid="5121617802063021720">"मन परेको स्थापना स्थान"</string>
-    <string name="app_install_location_summary" msgid="109719780117187797">"नयाँ अनुप्रयोगका लागि रुचाइएको स्थापना स्थान बदल्नुहोस्"</string>
+    <string name="app_install_location_summary" msgid="109719780117187797">"नयाँ एपका लागि रुचाइएको स्थापना स्थान बदल्नुहोस्"</string>
     <string name="app_disable_dlg_positive" msgid="5508828271100168073">"एप असक्षम गर्नुहोस्"</string>
     <string name="app_disable_dlg_text" msgid="9221864774943530281">"तपाईंले यो एपलाई असक्षम पार्नुभयो भने Android र अन्य एपहरूले अब उप्रान्त अपेक्षाअनुसार कार्य नगर्न सक्छन्। स्मरण रहोस्, तपाईं यो एप तपाईंको यन्त्रसँग पहिल्यै स्थापना भएर आएको हुँदा तपाईं यसलाई मेट्न सक्नुहुन्न। यो एप असक्षम पारेर, तपाईं यसलाई निष्क्रिय पार्नुहुन्छ र यसलाई आफ्नो यन्त्रमा लुकाउनुहुन्छ।"</string>
     <string name="app_disable_notifications_dlg_title" msgid="699530661413553928">"सूचनाहरू बन्द गर्नुहोस्?"</string>
@@ -2240,7 +2240,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>
@@ -2290,11 +2290,11 @@
     <string name="battery_tip_dialog_message" product="device" msgid="6348123094674390337">"तपाईंको यन्त्र असामान्य ढङ्गले धेरै पटक प्रयोग गरिएको छ। तपाईंको ब्याट्रीको चार्ज अपेक्षा गरिएभन्दा चाँडो सकिने छ।\n \n चार्ज पूरा भएपछि सबैभन्दा बढी प्रयोग गरिएका एपहरू:"</string>
     <string name="battery_tip_dialog_message_footer" msgid="1118827395267487197">"यसले उच्च क्षमतायुक्त पृष्ठभूमिको गतिविधि समावेश गर्दछ"</string>
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="7140926804142734420">
-      <item quantity="other">%1$d अनुप्रयोगहरूमाथि बन्देज लगाउनुहोस्</item>
+      <item quantity="other">%1$d एपमाथि बन्देज लगाउनुहोस्</item>
       <item quantity="one">%1$d माथि बन्देज लगाउनुहोस्</item>
     </plurals>
     <plurals name="battery_tip_restrict_handled_title" formatted="false" msgid="5509363095891806748">
-      <item quantity="other">%1$d अनुप्रयोगहरूमाथि हालसालै बन्देज लगाइयो</item>
+      <item quantity="other">%1$d एपमाथि हालसालै बन्देज लगाइयो</item>
       <item quantity="one">%1$s माथि हालसालै बन्देज लगाइयो</item>
     </plurals>
     <plurals name="battery_tip_restrict_summary" formatted="false" msgid="984148373944071669">
@@ -2306,8 +2306,8 @@
       <item quantity="one">यो एप पृष्ठभूमिमा चल्न सक्दैन</item>
     </plurals>
     <plurals name="battery_tip_restrict_app_dialog_title" formatted="false" msgid="3042021435866172168">
-      <item quantity="other">%1$d अनुप्रयोगमाथि बन्देज लगाउने हो?</item>
-      <item quantity="one">अनुप्रयोगमाथि बन्देज लगाउने हो?</item>
+      <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>
@@ -2321,11 +2321,11 @@
     <string name="battery_tip_dialog_summary_message" product="tablet" msgid="1721081030632329647">"तपाईंका एपहरूले सामान्य मात्रामा ब्याट्रीको प्रयोग गर्दै छन्‌। एपहरूले अत्यन्त धेरै ब्याट्रीको प्रयोग गरेको खण्डमा तपाईंको ट्याब्लेटले कारबाहीको सुझाव दिन्छ। \n\nतपाईंको ब्याट्री कम हुँदै गएको छ भने तपाईंले सधैँ ब्याट्री सेभर सक्रिय पार्न सक्नुहुन्छ।"</string>
     <string name="battery_tip_dialog_summary_message" product="device" msgid="146872407040848465">"तपाईंका एपहरूले सामान्य मात्रामा ब्याट्रीको प्रयोग गर्दै छन्‌। एपहरूले अत्यन्त धेरै ब्याट्रीको प्रयोग गरेको खण्डमा तपाईंको यन्त्रले कारबाहीको सुझाव दिन्छ। \n\nतपाईंको ब्याट्री कम हुँदै गएको छ भने तपाईंले सधैँ ब्याट्री सेभर सक्रिय पार्न सक्नुहुन्छ।"</string>
     <string name="smart_battery_manager_title" msgid="5744035036663849515">"ब्याट्री प्रबन्धक"</string>
-    <string name="smart_battery_title" msgid="4919670408532804351">"अनुप्रयोगहरूलाई स्वतः व्यवस्थित गर्नुहोस्"</string>
+    <string name="smart_battery_title" msgid="4919670408532804351">"एपहरूलाई स्वतः व्यवस्थित गर्नुहोस्"</string>
     <string name="smart_battery_summary" msgid="640027046471198174">"तपाईंले प्रायः प्रयोग नगर्ने एपहरूमा ब्याट्री सीमित गर्नुहोस्"</string>
-    <string name="smart_battery_footer" product="default" msgid="3971715848890205632">"ब्याट्री प्रबन्धकले एपहरूले ब्याट्री खर्च गरिरहेको पता लगाउँदा, तपाईंसँग यी अनुप्रयोगहरूलाई प्रतिबन्धित गर्ने विकल्प हुन्छ। प्रतिबन्धित एपहरूले सही किसिमले काम नगर्न सक्छन् र सूचनाहरू आउन ढिलाइ हुन सक्छ।"</string>
-    <string name="smart_battery_footer" product="tablet" msgid="3971715848890205632">"ब्याट्री प्रबन्धकले एपहरूले ब्याट्री खर्च गरिरहेको पता लगाउँदा, तपाईंसँग यी अनुप्रयोगहरूलाई प्रतिबन्धित गर्ने विकल्प हुन्छ। प्रतिबन्धित एपहरूले सही किसिमले काम नगर्न सक्छन् र सूचनाहरू आउन ढिलाइ हुन सक्छ।"</string>
-    <string name="smart_battery_footer" product="device" msgid="3971715848890205632">"ब्याट्री प्रबन्धकले एपहरूले ब्याट्री खर्च गरिरहेको पता लगाउँदा, तपाईंसँग यी अनुप्रयोगहरूलाई प्रतिबन्धित गर्ने विकल्प हुन्छ। प्रतिबन्धित एपहरूले सही किसिमले काम नगर्न सक्छन् र सूचनाहरू आउन ढिलाइ हुन सक्छ।"</string>
+    <string name="smart_battery_footer" product="default" msgid="3971715848890205632">"ब्याट्री प्रबन्धकले एपहरूले ब्याट्री खर्च गरिरहेको पता लगाउँदा, तपाईंसँग यी एपहरूलाई प्रतिबन्धित गर्ने विकल्प हुन्छ। प्रतिबन्धित एपहरूले सही किसिमले काम नगर्न सक्छन् र सूचनाहरू आउन ढिलाइ हुन सक्छ।"</string>
+    <string name="smart_battery_footer" product="tablet" msgid="3971715848890205632">"ब्याट्री प्रबन्धकले एपहरूले ब्याट्री खर्च गरिरहेको पता लगाउँदा, तपाईंसँग यी एपहरूलाई प्रतिबन्धित गर्ने विकल्प हुन्छ। प्रतिबन्धित एपहरूले सही किसिमले काम नगर्न सक्छन् र सूचनाहरू आउन ढिलाइ हुन सक्छ।"</string>
+    <string name="smart_battery_footer" product="device" msgid="3971715848890205632">"ब्याट्री प्रबन्धकले एपहरूले ब्याट्री खर्च गरिरहेको पता लगाउँदा, तपाईंसँग यी एपहरूलाई प्रतिबन्धित गर्ने विकल्प हुन्छ। प्रतिबन्धित एपहरूले सही किसिमले काम नगर्न सक्छन् र सूचनाहरू आउन ढिलाइ हुन सक्छ।"</string>
     <string name="restricted_app_title" msgid="4957644700640127606">"प्रतिबन्धित एपहरू"</string>
     <plurals name="restricted_app_summary" formatted="false" msgid="7609538735465186040">
       <item quantity="other">ब्याट्रीको प्रयोग %1$d एपहरूमा सीमित पार्दै</item>
@@ -2427,7 +2427,7 @@
     <string name="battery_used_by" msgid="840331542883421888">"<xliff:g id="APP">%2$s</xliff:g> ले प्रयोग गरेको <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="5874301442415987516">"समग्र ब्याट्रीको <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="3814176986148084378">"पछिल्लो पटक पूर्ण चार्ज भएदेखिको विश्लेषण"</string>
-    <string name="battery_last_full_charge" msgid="5624033030647170717">"पछिल्लो पटकको पूर्ण चार्ज"</string>
+    <string name="battery_last_full_charge" msgid="5624033030647170717">"पछिल्लो पटक पूर्ण चार्ज भएको समय"</string>
     <string name="battery_full_charge_last" msgid="4614554109170251301">"पूरा चार्ज हुँदा लगभग यति समय टिक्छ"</string>
     <string name="battery_footer_summary" msgid="4828444679643906943">"ब्याट्री प्रयोगसम्बन्धी डेटा अनुमानित हो र प्रयोगको अनुसार यो मान बदलिन सक्छ"</string>
     <string name="battery_detail_foreground" msgid="6616408559186553085">"सक्रिय प्रयोगमा रहँदा"</string>
@@ -2455,9 +2455,9 @@
     <string name="battery_saver_auto_percentage_summary" msgid="2036128588460338677">"<xliff:g id="PERCENT">%1$s</xliff:g> हुँदा सक्रिय हुने छ"</string>
     <string name="battery_saver_schedule_settings_title" msgid="574233428557678128">"समयतालिका सेट गर्नुहोस्‌"</string>
     <string name="battery_saver_sticky_title_new" msgid="5328707297110866082">"चार्ज पूरा भएपछि निष्क्रिय पार्नुहोस्"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="3406582427270935879">"तपाईंको फोन <xliff:g id="PERCENT">%1$s</xliff:g> भएपछि ब्याट्री सेभर अफ हुन्छ"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="3406582427270935879">"तपाईंको फोनको चार्ज <xliff:g id="PERCENT">%1$s</xliff:g> भएपछि ब्याट्री सेभर अफ हुन्छ"</string>
     <string name="battery_saver_sticky_description_new" product="tablet" msgid="3284967694001857194">"तपाईंको ट्याब्लेटको चार्ज <xliff:g id="PERCENT">%1$s</xliff:g> भएपछि ब्याट्री सेभर अफ हुन्छ"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="5056520668081504111">"तपाईंको यन्त्र <xliff:g id="PERCENT">%1$s</xliff:g> भएपछि ब्याट्री सेभर अफ हुन्छ"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="5056520668081504111">"तपाईंको यन्त्रको चार्ज <xliff:g id="PERCENT">%1$s</xliff:g> भएपछि ब्याट्री सेभर अफ हुन्छ"</string>
     <!-- no translation found for battery_saver_seekbar_title (7607123201469333645) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="2321082163892561703">"सक्रिय गर्नुहोस्"</string>
@@ -2563,7 +2563,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>
@@ -2631,13 +2631,13 @@
     <string name="really_remove_account_title" msgid="4166512362915154319">"खाता हटाउने हो?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"यो खाता मेटाउँदा ट्याब्लेटबाट यसका सबै सन्देश,सम्पर्क र अन्य डेटा मेटाइनेछन्!"</string>
     <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"यस खातालाई हटाउँदा फोनबाट सम्पूर्ण सन्देश, सम्पर्क र अन्य डेटा हट्छ!"</string>
-    <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"यो खातालाई हटाउनुले यस यन्त्रबाट यस खातामा रहेका सम्पूर्ण सन्देश, सम्पर्कहरू र अन्य डेटा मेटाउने छ!"</string>
+    <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="enter_password" msgid="2963496904625715235">"Android सुरु गर्न, आफ्नो पासवर्ड प्रविष्टि गर्नुहोस्"</string>
     <string name="enter_pin" msgid="7140938268709546890">"Android सुरु गर्न, आफ्नो पिन प्रविष्टि गर्नुहोस्"</string>
-    <string name="enter_pattern" msgid="1653841963422825336">"Android सुरु गर्न, आफ्नो ढाँचा कोर्नुहोस्"</string>
+    <string name="enter_pattern" msgid="1653841963422825336">"Android सुरु गर्न, आफ्नो प्याटर्न कोर्नुहोस्"</string>
     <string name="cryptkeeper_wrong_pattern" msgid="4580105105385125467">"प्याटर्न मिलेन"</string>
     <string name="cryptkeeper_wrong_password" msgid="1709534330303983166">"गलत पासवर्ड"</string>
     <string name="cryptkeeper_wrong_pin" msgid="857757190077859245">"गलत PIN"</string>
@@ -2737,7 +2737,7 @@
     <string name="data_usage_metered_yes" msgid="7333744880035386073">"शुल्क लाग्ने"</string>
     <string name="data_usage_metered_no" msgid="1961524615778610008">"शुल्क लाग्ने प्रावधान तय नगरिसकिएको"</string>
     <string name="data_usage_disclaimer" msgid="4683321532922590425">"वाहक डेटा लेखाकृत गर्ने तपाईँको उपकरणबाट फरक हुन सक्छ।"</string>
-    <string name="cryptkeeper_emergency_call" msgid="4625420047524693116">"आपतकालीन कल"</string>
+    <string name="cryptkeeper_emergency_call" msgid="4625420047524693116">"आपत्‌कालीन कल"</string>
     <string name="cryptkeeper_return_to_call" msgid="4433942821196822815">"कलमा फर्किनुहोस्"</string>
     <string name="vpn_name" msgid="3538818658670774080">"नाम"</string>
     <string name="vpn_type" msgid="6389116710008658550">"प्रकार"</string>
@@ -2871,7 +2871,7 @@
     <string name="user_add_profile_item_title" msgid="4932743891449790664">"प्रतिबन्धित प्रोफाइल"</string>
     <string name="user_add_user_title" msgid="2320897397066676472">"नयाँ प्रयोगकर्ता थप्ने हो?"</string>
     <string name="user_add_user_message_long" msgid="686637203224195465">"तपाईं थप प्रयोगकर्ताहरू सिर्जना गरेर ती प्रयोगकर्तालाई यो यन्त्र प्रयोग गर्न दिन सक्नुहुन्छ। हरेक प्रयोगकर्ताको आफ्नै ठाउँ हुन्छ। उनीहरू यो ठाउँमा आफ्नै एप, वालपेपर आदिका लागि प्रयोग गर्न सक्छन्। उनीहरू सबैजनालाई असर पार्ने Wi-Fi जस्ता यन्त्रका सेटिङहरू पनि परिवर्तन गर्न सक्छन्।\n\nतपाईंले नयाँ प्रयोगकर्ता थप्दा उक्त व्यक्तिले आफ्नो ठाउँ सेटअप गर्नु पर्ने हुन्छ।\n\nसबै प्रयोगकर्ता अन्य सबै प्रयोगकर्ताले प्रयोग गर्ने एपहरू अद्यावधिक गर्न सक्छन्। तर पहुँचसम्बन्धी सेटिङ तथा सेवाहरू नयाँ प्रयोगकर्तामा नसर्न सक्छ।"</string>
-    <string name="user_add_user_message_short" msgid="1802594476285458254">"जब तपाईंले नयाँ प्रयोगकर्ता थप्नुहुन्छ, त्यो व्यक्तिले आफ्नो ठाउँ सेट गर्न आवश्यक छ।\n\nकुनै पनि प्रयोगकर्ताले सबै अन्य प्रयोगकर्ताहरूका लागि एपहरू अद्यावधिक गर्न सक्छन्।"</string>
+    <string name="user_add_user_message_short" msgid="1802594476285458254">"तपाईंले नयाँ प्रयोगकर्ता थप्नुभयो भने ती प्रयोगकर्ताले आफ्नो स्पेस सेट गर्नु पर्ने हुन्छ।\n\nसबै प्रयोगकर्ताले अरू प्रयोगकर्ताका एपहरू अपडेट गर्न सक्छन्।"</string>
     <string name="user_setup_dialog_title" msgid="6748950002206392396">"अहिले प्रयोगकर्ता सेटअप गर्ने हो?"</string>
     <string name="user_setup_dialog_message" msgid="2988559933258353919">"यी व्यक्ति यन्त्र यो यन्त्र चलाउन र आफ्नो ठाउँ सेट गर्न उपलब्ध छन् भन्ने कुरा सुनिश्चित गर्नुहोस्"</string>
     <string name="user_setup_profile_dialog_message" msgid="7611900802824048526">"अहिले प्रोफाइल सेटअप गर्ने हो?"</string>
@@ -2900,7 +2900,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>
@@ -2909,7 +2909,7 @@
     <string name="user_enable_calling_confirm_message" msgid="2490126715153125970">"कल इतिहासमा यो प्रयोगकर्ता सँग साझेदारी गरिने छ।"</string>
     <string name="user_enable_calling_and_sms_confirm_title" msgid="4153856398523366976">"फोन कल तथा SMS सक्षम गर्ने हो?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="3278802798876095734">"कल र SMS इतिहास यो प्रयोगकर्तासँग साझेदारी गरिने छ।"</string>
-    <string name="emergency_info_title" msgid="1522609271881425375">"आपतकालीन सूचना"</string>
+    <string name="emergency_info_title" msgid="1522609271881425375">"आपत्‌कालीन सूचना"</string>
     <string name="emergency_info_summary" msgid="7280464759837387342">"<xliff:g id="USER_NAME">%1$s</xliff:g> का बारेमा जानकारी र सम्पर्क ठेगानाहरू"</string>
     <string name="application_restrictions" msgid="6871981013736536763">"एपहरू र सामग्री अनुमति दिनुहोस्"</string>
     <string name="apps_with_restrictions_header" msgid="8656739605673756176">"प्रतिबन्धको साथ एपहरू"</string>
@@ -2938,7 +2938,7 @@
     <string name="help_label" msgid="1296484776243905646">"मद्दत र प्रतिक्रिया"</string>
     <string name="support_summary" msgid="3278943815956130740">"मद्दतसम्बन्धी लेखहरू, फोन, कुराकानी र सुरूवात गर्नेसम्बन्धी सहायता"</string>
     <string name="user_account_title" msgid="2108666882630552859">"सामग्रीको लागि खाता"</string>
-    <string name="user_picture_title" msgid="6664602422948159123">"तस्बिर ID"</string>
+    <string name="user_picture_title" msgid="6664602422948159123">"फोटो ID"</string>
     <string name="extreme_threats_title" msgid="1405820547540456436">"चरम धम्की"</string>
     <string name="extreme_threats_summary" msgid="4967919167246852181">"जीवन र सम्पत्तिको चरम खतराहरूको लागि चेतावनीहरू प्राप्त"</string>
     <string name="severe_threats_title" msgid="1987698359027211862">"गम्भीर खतराहरू"</string>
@@ -2951,7 +2951,7 @@
     <string name="call_manager_title" msgid="1118074011469650421">"प्रबन्धक कल"</string>
     <!-- no translation found for call_manager_summary (1232655174841493040) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="5750066270993255966">"आपतकालीन सतर्कताहरू"</string>
+    <string name="cell_broadcast_settings" msgid="5750066270993255966">"आपत्‌कालीन सतर्कताहरू"</string>
     <string name="network_operators_settings" msgid="7822337582828465633">"सञ्जाल संचालकहरू"</string>
     <string name="access_point_names" msgid="7992382237358800596">"बिन्दु नामहरूमा पहुँच"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="1624079276378568594">"VoLTE"</string>
@@ -2981,9 +2981,9 @@
     <string name="wizard_back" msgid="223654213898117594">"पछाडि जानुहोस्"</string>
     <string name="wizard_next" msgid="5239664512608113542">"अर्को"</string>
     <string name="wizard_finish" msgid="3742102879981212094">"समाप्त गर्नुहोस्"</string>
-    <string name="user_image_take_photo" msgid="2000247510236178111">"तस्बिर खिच्नुहोस्"</string>
-    <string name="user_image_choose_photo" msgid="4920315415203051898">"कुनै तस्बिर छनौट गर्नुहोस्"</string>
-    <string name="user_image_photo_selector" msgid="8429694590849882411">"तस्बिर छान्नुहोस्"</string>
+    <string name="user_image_take_photo" msgid="2000247510236178111">"फोटो खिच्नुहोस्"</string>
+    <string name="user_image_choose_photo" msgid="4920315415203051898">"कुनै फोटो छनौट गर्नुहोस्"</string>
+    <string name="user_image_photo_selector" msgid="8429694590849882411">"फोटो छान्नुहोस्"</string>
     <string name="regulatory_info_text" msgid="9112993912873512834"></string>
     <string name="sim_setup_wizard_title" msgid="77627575294867180">"सिम कार्ड"</string>
     <string name="sim_settings_title" msgid="8818243954752261922">"SIM कार्डहरू"</string>
@@ -3091,7 +3091,7 @@
     <string name="keywords_ignore_optimizations" msgid="9127632532176249438">"अनुकूलनहरूलाई बेवास्ता गर्नुहोस्, डोज, एप स्ट्यान्डबाइ"</string>
     <string name="keywords_color_mode" msgid="8893345199519181751">"चम्किलो RGB, sRGB, रङ्ग, प्राकृतिक, मानक"</string>
     <string name="keywords_color_temperature" msgid="2255253972992035046">"रङ्ग, तापक्रम, D65, D73, सेतो, पहेँलो, निलो, न्यानो, शीतल"</string>
-    <string name="keywords_lockscreen" msgid="4936846554280830394">"अनलक गर्न स्लाइड गर्नुहोस्, पासवर्ड, ढाँचा, PIN"</string>
+    <string name="keywords_lockscreen" msgid="4936846554280830394">"अनलक गर्न स्लाइड गर्नुहोस्, पासवर्ड, प्याटर्न, PIN"</string>
     <string name="keywords_profile_challenge" msgid="8653718001253979611">"कार्य चुनौती, कार्य, प्रोफाइल"</string>
     <string name="keywords_unification" msgid="2020759909366983593">"कार्यको प्रोफाइल, व्यवस्थापन गरिएको प्रोफाइल, एकरूपता ल्याउनु, एकरूपता, कार्य, प्रोफाइल"</string>
     <string name="keywords_gesture" msgid="5031323247529869644">"इसाराहरू"</string>
@@ -3141,13 +3141,13 @@
     <string name="ring_volume_option_title" msgid="2038924918468372264">"घन्टीको भोल्युम"</string>
     <string name="notification_volume_option_title" msgid="1358512611511348260">"ध्वनी सूचना"</string>
     <string name="ringtone_title" msgid="1409086028485922583">"फोनको रिङटोन"</string>
-    <string name="notification_ringtone_title" msgid="2932960620843976285">"सूचना सम्बन्धी पूर्वनिर्धारित ध्वनि"</string>
+    <string name="notification_ringtone_title" msgid="2932960620843976285">"सूचनाको पूर्वनिर्धारित ध्वनि"</string>
     <string name="notification_unknown_sound_title" msgid="8043718667804838398">"अनुप्रयोगले प्रदान गरेको ध्वनि"</string>
-    <string name="notification_sound_default" msgid="2664544380802426260">"सूचना सम्बन्धी पूर्वनिर्धारित ध्वनि"</string>
+    <string name="notification_sound_default" msgid="2664544380802426260">"सूचनाको पूर्वनिर्धारित ध्वनि"</string>
     <string name="alarm_ringtone_title" msgid="6411326147408635902">"अलार्मको पूर्वनिर्धारित ध्वनि"</string>
-    <string name="vibrate_when_ringing_title" msgid="2757996559847126952">"कलका बेला कम्पन गर्नुहोस्"</string>
+    <string name="vibrate_when_ringing_title" msgid="2757996559847126952">"कल आउँदा भाइब्रेट गरियोस्"</string>
     <string name="other_sound_settings" msgid="5250376066099818676">"अन्य ध्वनिहरू"</string>
-    <string name="dial_pad_tones_title" msgid="8877212139988655769">"प्याड टोनहरू डायल गर्नुहोस्"</string>
+    <string name="dial_pad_tones_title" msgid="8877212139988655769">"डायल प्याडको टोन"</string>
     <string name="screen_locking_sounds_title" msgid="4407110895465866809">"स्किन लक आवाज"</string>
     <string name="charging_sounds_title" msgid="5070437987230894287">"चार्ज गर्दाको ध्वनि तथा कम्पन"</string>
     <string name="docking_sounds_title" msgid="2573137471605541366">"डाकिंग आवाज"</string>
@@ -3216,7 +3216,7 @@
     <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_status" msgid="6516614225115681068">"स्क्रीनको शीर्षमा वस्तुस्थिति पट्टीका आइकनहरू लुकाउनुहोस्"</string>
-    <string name="zen_mode_block_effect_badge" msgid="3891743027347075136">"एप आइकनमा सूचनाको प्रतीक जनाउने थोप्लो लुकाउनुहोस्‌"</string>
+    <string name="zen_mode_block_effect_badge" msgid="3891743027347075136">"एप आइकनमा नोटिफिकेसन डट लुकाउनुहोस्‌"</string>
     <string name="zen_mode_block_effect_ambient" msgid="6382013125863616197">"सूचना आउँदा सक्रिय नहोस्‌"</string>
     <string name="zen_mode_block_effect_list" msgid="6081548478844912181">"सूचनाको सूचीबाट लुकाउनुहोस्"</string>
     <string name="zen_mode_block_effect_summary_none" msgid="7166175186759564510">"कहिल्यै होइन"</string>
@@ -3284,7 +3284,7 @@
     <string name="work_use_personal_sounds_title" msgid="531727195073003599">"व्यक्तिगत प्रोफाइलका ध्वनिहरूको प्रयोग गर्नुहोस्"</string>
     <string name="work_use_personal_sounds_summary" msgid="2886871383995187441">"कार्य र व्यक्तिगत दुवै प्रोफाइलका लागि आवाज उही नै हो"</string>
     <string name="work_ringtone_title" msgid="5499360583947410224">"कार्यको फोनको रिङटोन"</string>
-    <string name="work_notification_ringtone_title" msgid="8059159087214025757">"सूचना सम्बन्धी पूर्वनिर्धारित आवाज"</string>
+    <string name="work_notification_ringtone_title" msgid="8059159087214025757">"सूचनाको पूर्वनिर्धारित आवाज"</string>
     <string name="work_alarm_ringtone_title" msgid="5328487181385375130">"कार्य अलार्मको पूर्वनिर्धाित आवाज"</string>
     <string name="work_sound_same_as_personal" msgid="7728560881697159758">"व्यक्तिगत प्रोफाइलको जस्तै"</string>
     <string name="work_sync_dialog_title" msgid="4799120971202956837">"आवाजलाई प्रतिस्थापन गर्ने हो?"</string>
@@ -3307,7 +3307,7 @@
     <string name="hide_silent_icons_summary" msgid="2624346914488256888">"स्टाटस बारमा मौन सूचनाका आइकनहरू लुकाउनुहोस्"</string>
     <string name="notification_badging_title" msgid="6311699476970264712">"सूचनाको प्रतीक जनाउने थोप्लोहरूलाई अनुमति दिनुहोस्"</string>
     <string name="notification_bubbles_title" msgid="9196562435741861317">"बबलहरू"</string>
-    <string name="notification_bubbles_summary" msgid="4624512775901949578">"तैरने सर्टकटहरूको प्रयोग गरी अनुप्रयोगका सामग्रीमाथि जुनसुकै ठाउँबाट द्रुत पहुँच राख्नुहोस्"</string>
+    <string name="notification_bubbles_summary" msgid="4624512775901949578">"तैरने सर्टकटहरूको प्रयोग गरी एपका सामग्रीमाथि जुनसुकै ठाउँबाट द्रुत पहुँच राख्नुहोस्"</string>
     <string name="bubbles_feature_education" msgid="8979109826818881018">"केही सूचनाहरू र अन्य सामग्री स्क्रिनमा बबलका रूपमा देखिन सक्छन्। कुनै बबल खोल्न यसमा ट्याप गर्नुहोस्। यसलाई खारेज गर्न यसलाई स्क्रिनका पुछारतिर ड्र्याग गर्नुहोस्।"</string>
     <string name="bubbles_app_toggle_title" msgid="6401217027603326439">"बबलहरू"</string>
     <string name="bubbles_app_toggle_summary" msgid="7707611139796553855">"<xliff:g id="APP_NAME">%1$s</xliff:g> लाई केही सूचनाहरू बबलका रूपमा देखाउन दिनुहोस्"</string>
@@ -3331,7 +3331,7 @@
     <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="app_notifications_title" msgid="1141791221581312325">"एपसम्बन्धी सूचनाहरू"</string>
     <string name="notification_channel_title" msgid="6637705960909690229">"सूचनाको प्रकार"</string>
     <string name="notification_group_title" msgid="6105337987437608590">"सूचनासम्बन्धी कोटिको समूह"</string>
     <string name="notification_importance_title" msgid="4131979083408000545">"व्यवहार"</string>
@@ -3341,11 +3341,11 @@
     <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>
-    <string name="notification_importance_high_title" msgid="7258373094258585858">"स्क्रिनमा देखाउनुहोस्"</string>
+    <string name="notification_importance_high_title" msgid="7258373094258585858">"स्क्रिनमा देखाइयोस्"</string>
     <string name="notification_block_title" msgid="2570364198866886906">"रोक लगाउनुहोस्"</string>
     <string name="notification_silence_title" msgid="6959637402003838093">"मौन रूपमा देखाउनुहोस्"</string>
     <string name="notification_alert_title" msgid="750683027055192648">"अलर्ट"</string>
@@ -3371,7 +3371,7 @@
     <string name="no_notification_assistant" msgid="9140123568386413264">"सहायकसम्बन्धी कुनै सेवा छैन"</string>
     <string name="no_notification_listeners" msgid="1366386609506834717">"कुनै स्थापित एपहरूले सूचना पहुँच अनुरोध गरेका छैनन्।"</string>
     <string name="notification_assistant_security_warning_title" msgid="4190584438086738496">"<xliff:g id="SERVICE">%1$s</xliff:g> लाई सूचनामाथि पहुँच राख्ने अनुमति दिने हो?"</string>
-    <string name="notification_assistant_security_warning_summary" msgid="6924513399671031930">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> ले सम्पर्कको नाम र तपाईंले प्राप्त गर्नुभएका पाठ सन्देशहरू जस्ता व्यक्तिगत जानकारीलगायत सबै सूचनाहरू पढ्न सक्ने छ। यसले सूचनाहरू परिमार्जन गर्न वा खारेज गर्न वा तिनमा रहेका कारबाहीमूलक बटनहरू ट्रिगर गर्न पनि सक्ने छ। \n\nयसले उक्त एपलाई बाधा नपुऱ्याउनुहोस् नामक मोड सक्रिय गर्ने वा निष्क्रिय पार्ने र सम्बन्धित सेटिङहरू परिवर्तन गर्ने क्षमता पनि प्रदान गर्ने छ।"</string>
+    <string name="notification_assistant_security_warning_summary" msgid="6924513399671031930">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> ले सम्पर्कको नाम र तपाईंले प्राप्त गर्नुभएका टेक्स्ट म्यासेजहरू जस्ता व्यक्तिगत जानकारीलगायत सबै सूचनाहरू पढ्न सक्ने छ। यसले सूचनाहरू परिमार्जन गर्न वा खारेज गर्न वा तिनमा रहेका कारबाहीमूलक बटनहरू ट्रिगर गर्न पनि सक्ने छ। \n\nयसले उक्त एपलाई बाधा नपुऱ्याउनुहोस् नामक मोड सक्रिय गर्ने वा निष्क्रिय पार्ने र सम्बन्धित सेटिङहरू परिवर्तन गर्ने क्षमता पनि प्रदान गर्ने छ।"</string>
     <string name="notification_listener_security_warning_title" msgid="4902253246428777797">"<xliff:g id="SERVICE">%1$s</xliff:g> का लागि सूचना पहुँच अनुमति दिने हो?"</string>
     <string name="notification_listener_security_warning_summary" msgid="4454702907350100288">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> तपाईँले पाउनुहुने सन्देशहरूका सम्पर्कका नाम र पाठ जस्ता व्यक्तिगत जानकारी लगायत सबै सूचनाहरूलाई पढ्न सक्षम हुनेछ। यसले सूचनाहरूलाई खारेज गर्न वा तिनीहरूमा रहेका कारबाही सम्बन्धी बटनहरूलाई ट्रिगर गर्न पनि सक्नेछ। \n\nयसले एपलाई बाधा नपुर्याउनुहोस् मोडलाई सक्रिय वा निष्क्रिय पार्ने र सम्बन्धित सेटिङहरूलाई परिवर्तन गर्ने क्षमता पनि दिनेछ।"</string>
     <string name="notification_listener_disable_warning_summary" msgid="162165151519082978">"यदि तपाईं <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> का लागि सूचना सम्बन्धी पहुँचलाई निष्क्रिय पार्नुहुन्छ भने बाधा नपुर्याउनुहोस् सम्बन्धी पहुँच पनि निष्क्रिय हुन सक्छ।"</string>
@@ -3380,13 +3380,13 @@
     <string name="vr_listeners_title" msgid="511483902408792832">"VR का सहायक सेवाहरू"</string>
     <string name="no_vr_listeners" msgid="7675484190394450979">"कुनै पनि स्थापित एपहरूले VR का सहायक सेवाहरूको रूपमा चल्नका लागि अनुरोध गरेका छैनन्।"</string>
     <string name="vr_listener_security_warning_title" msgid="7019322246707645361">"<xliff:g id="SERVICE">%1$s</xliff:g> लाई VR को सेवामा पहुँचका लागि अनुमति दिने हो?"</string>
-    <string name="vr_listener_security_warning_summary" msgid="5093225583584522067">"तपाईँले अनुप्रयोगहरूलाई भर्चुअल रियालिटी मोडमा प्रयोग गरिरहेको बेला <xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> चल्नका लागि सक्षम हुनेछ।"</string>
+    <string name="vr_listener_security_warning_summary" msgid="5093225583584522067">"तपाईँले एपहरूलाई भर्चुअल रियालिटी मोडमा प्रयोग गरिरहेको बेला <xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> चल्नका लागि सक्षम हुनेछ।"</string>
     <string name="display_vr_pref_title" msgid="1088464812293416981">"यन्त्र VR मा हुँदा"</string>
     <string name="display_vr_pref_low_persistence" msgid="3132583929174794245">"अस्पष्टता कम पार्नुहोस् (सिफारिस गरिएको)"</string>
     <string name="display_vr_pref_off" msgid="4681320968818852691">"स्क्रिन झिलमिलाउने प्रभाव कम गर्नुहोस्"</string>
     <string name="picture_in_picture_title" msgid="4960733106166035448">"Picture-in-picture"</string>
     <string name="picture_in_picture_empty_text" msgid="8664071475324685241">"स्थापना गरिएका कुनै पनि एपहरूले Picture-in-picture मोडलाई समर्थन गर्दैनन्"</string>
-    <string name="picture_in_picture_keywords" msgid="7326958702002259262">"तस्बिरमा तस्बिर मोडमा तस्बिर"</string>
+    <string name="picture_in_picture_keywords" msgid="7326958702002259262">"फोटोमा फोटो मोडमा फोटो"</string>
     <string name="picture_in_picture_app_detail_title" msgid="3916189052657425936">"Picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"Picture-in-picture लाई अनुमति दिनुहोस्"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="918632751775525347">"यो एप खुला रहेको अवस्थामा वा तपाईंले यसलाई छाड्नुभएपछि (उदाहरणका लागि, भिडियो हेर्ने कार्य जारी राख्न) यस एपलाई picture-in-picture विन्डो सिर्जना गर्न अनुमति दिनुहोस्। यो विन्डो तपाईंले प्रयोग गरिरहनुभएका अन्य एपहरूको शीर्ष भागमा देखिन्छ।"</string>
@@ -3394,7 +3394,7 @@
     <string name="zen_access_detail_switch" msgid="8706332327904974500">"बाधा नपुर्‍याउनुहोस् नामक सुविधा सक्रिय गर्ने अनुमति दिनुहोस्"</string>
     <string name="zen_access_empty_text" msgid="7667538993781607731">"कुनै पनि स्थापित एपहरू द्वारा बाधा नपुर्‍यानुहोस् पहुँच को माग गरेका छैनन्"</string>
     <string name="loading_notification_apps" msgid="1978345231934072091">"एपहरू लोड हुँदै..."</string>
-    <string name="app_notifications_off_desc" msgid="3904090905748895146">"तपाईंको अनुरोधबमोजिम Android ले यस अनुप्रयोगका सूचनाहरूलाई यो यन्त्रमा देखाउन दिइरहेको छैन"</string>
+    <string name="app_notifications_off_desc" msgid="3904090905748895146">"तपाईंको अनुरोधबमोजिम Android ले यस एपका सूचनाहरूलाई यो यन्त्रमा देखाउन दिइरहेको छैन"</string>
     <string name="channel_notifications_off_desc" msgid="8005444443218306611">"तपाईंको अनुरोधबमोजिम Android ले सूचनाहरूको यस कोटिलाई यो यन्त्रमा देखिन दिइरहेको छैन"</string>
     <string name="channel_group_notifications_off_desc" msgid="7154205544298672850">"तपाईंको अनुरोधबमोजिम Android ले सूचनाहरूको यस समूहलाई यो यन्त्रमा देखाउन दिइरहेको छैन"</string>
     <string name="notification_channels" msgid="956764228116145956">"कोटिहरू"</string>
@@ -3404,11 +3404,11 @@
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> कोटी</item>
     </plurals>
     <string name="no_channels" msgid="8884254729302501652">"यो अनुप्रयोगले कुनै पनि सूचना पोस्ट गरेको छैन"</string>
-    <string name="app_settings_link" msgid="8465287765715790984">"अनुप्रयोगका अतिरिक्त सेटिङहरू"</string>
+    <string name="app_settings_link" msgid="8465287765715790984">"एपका अतिरिक्त सेटिङहरू"</string>
     <string name="app_notification_listing_summary_zero" msgid="4047782719487686699">"सबै एपहरूमा सक्रिय छ"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="1161774065480666519">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> अनुप्रयोगहरूका लागि निष्क्रिय पारिएका छन्‌</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> अनुप्रयोगका लागि निष्क्रिय परिएको छ</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> एपका लागि निष्क्रिय परिएको छ</item>
     </plurals>
     <plurals name="deleted_channels" formatted="false" msgid="7741359084299446208">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> मेटाइएका कोटीहरू</item>
@@ -3422,8 +3422,8 @@
     <string name="notification_content_block_summary" msgid="2743896875255591743">"ओझेलमा वा पेरिफेरल यन्त्रहरूमा कहिल्यै सूचनाहरू नदेखाउनुहोस्"</string>
     <string name="notification_badge_title" msgid="8989086619255666442">"सूचनाको प्रतीक जनाउने थोप्लोलाई अनुमति दिनुहोस्"</string>
     <string name="notification_channel_badge_title" msgid="8228215248332054612">"सूचनाको प्रतीक जनाउने थोप्लो देखाउनुहोस्"</string>
-    <string name="app_notification_override_dnd_title" msgid="1757042206738172601">"बाधा नपुर्याउनुहोस् नामक सुविधालाई ओभरराइड गर्नुहोस्"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3152957611171210980">"बाधा नपुर्‍याउनुहोस् नामक सुविधा सक्रिय भएका बेला यी सूचनाहरूलाई अवरोध जारी राख्न दिनुहोस्"</string>
+    <string name="app_notification_override_dnd_title" msgid="1757042206738172601">"बाधा नपुर्याउनुहोस् नामक सुविधा ओभरराइड गरियोस्"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3152957611171210980">"बाधा नपुर्‍याउनुहोस् नामक सुविधा अन भएका बेला पनि यी नोटिफिकेसन आइरहन दिनुहोस्"</string>
     <string name="app_notification_visibility_override_title" msgid="2349335170165637672">"लक स्क्रिनमा"</string>
     <string name="app_notification_row_banned" msgid="2079325338122151677">"अवरूद्ध गरियो"</string>
     <string name="app_notification_row_priority" msgid="432299064888787236">"प्राथमिकता"</string>
@@ -3508,11 +3508,11 @@
     <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>
-      <item quantity="one">१ अनुप्रयोगका सूचनाहरूले बाधा नपुऱ्याउनुहोस्‌ नामक मोडलाई ओभरराइड गर्न सक्छन्</item>
+      <item quantity="other"><xliff:g id="NUMBER">%1$d</xliff:g> एपका सूचनाहरूले बाधा नपुऱ्याउनुहोस्‌ नामक मोडलाई ओभरराइड गर्न सक्छन्</item>
+      <item quantity="one">१ एपका सूचनाहरूले बाधा नपुऱ्याउनुहोस्‌ नामक मोडलाई ओभरराइड गर्न सक्छन्</item>
     </plurals>
     <string name="zen_mode_events_list" msgid="8578102701815684873">"खेलहरू"</string>
     <string name="zen_mode_all_callers" msgid="4455039040077343838">"जोसुकै"</string>
@@ -3556,7 +3556,7 @@
     <string name="switch_off_text" msgid="3539551289454353555">"निष्क्रिय"</string>
     <string name="screen_pinning_title" msgid="578020318289781102">"पर्दा पिन गर्दै"</string>
     <string name="screen_pinning_description" msgid="3814537379086412278">"यो सेटिङ सक्रिय गर्दा, हालको स्क्रिनलाई तपाईंले अनपिन नगरुन्जेल दृश्य अवस्थामा राख्न स्क्रिन पिनिङ प्रयोग गर्न सक्नुहुन्छ।\n\nस्क्रिन पिनिङ सुविधा प्रयोग गर्न:\n\n१. स्क्रिन पिनिङ सक्रिय रहेको सुनिश्चित गर्नुहोस् \n\n२. ओभरभ्यू खोल्नुहोस्\n\n३. स्क्रिनको सिरानमा रहेको एप आइकनमा ट्याप गरी  पिनमा ट्याप गर्नुहोस्"</string>
-    <string name="screen_pinning_unlock_pattern" msgid="1060334707088339444">"पिन निकाल्नुअघि खोल्ने ढाँचा सोध्नुहोस्"</string>
+    <string name="screen_pinning_unlock_pattern" msgid="1060334707088339444">"पिन निकाल्नुअघि अनलक प्याटर्न सोध्नुहोस्"</string>
     <string name="screen_pinning_unlock_pin" msgid="1441705536015645023">"पिन निकाल्नुअघि PIN सोध्नुहोस्"</string>
     <string name="screen_pinning_unlock_password" msgid="1017776884000170841">"पिन निकाल्नुअघि पासवर्ड सोध्नुहोस्"</string>
     <string name="screen_pinning_unlock_none" msgid="9183040569733226911">"अनपिन गर्दा उपकरण लक गर्नुहोस्"</string>
@@ -3566,13 +3566,13 @@
     <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_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_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_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>
@@ -3582,7 +3582,7 @@
     <string name="encrypt_talkback_dialog_require_pattern" msgid="8705104812047332411">"प्याटर्न आवश्यक छ?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="5070710417271353306">"पासवर्ड आवश्यक छ?"</string>
     <string name="encrypt_talkback_dialog_message_pin" msgid="1912533826818077891">"यो उपकरण सुरु गर्न जब तपाईँले आफ्नो PIN प्रविष्टि गर्नुहुन्छ, पहुँच सेवा जस्तै <xliff:g id="SERVICE">%1$s</xliff:g> अझै उपलब्ध हुने छैन।"</string>
-    <string name="encrypt_talkback_dialog_message_pattern" msgid="4415837749933863432">"यो उपकरण सुरु गर्न जब तपाईँले आफ्नो ढाँचा प्रविष्टि गर्नुहुन्छ, पहुँच सेवा जस्तै <xliff:g id="SERVICE">%1$s</xliff:g> अझै उपलब्ध हुने छैन।"</string>
+    <string name="encrypt_talkback_dialog_message_pattern" msgid="4415837749933863432">"यो यन्त्र सुरु गर्न जब तपाईंले आफ्नो प्याटर्न प्रविष्टि गर्नुहुन्छ, पहुँच सेवा जस्तै <xliff:g id="SERVICE">%1$s</xliff:g> अझै उपलब्ध हुने छैन।"</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="4276703366120881008">"यो उपकरण सुरु गर्न जब तपाईँले आफ्नो पासवर्ड प्रविष्टि गर्नुहुन्छ, पहुँच सेवा <xliff:g id="SERVICE">%1$s</xliff:g> जस्तो अझै उपलब्ध हुने छैन।"</string>
     <string name="direct_boot_unaware_dialog_message" msgid="5253248227337914350">"टिपोट: तपाईंले आफ्नो फोन पुनः सुरु गर्नुभयो र त्यसमा स्क्रिन लक सेट गरिएको छ भने तपाईंले आफ्नो फोन अनलक नगरून्जेल यो एप सुरु हुन सक्दैन"</string>
     <string name="imei_information_title" msgid="7666097743700170757">"IMEI जानकारी"</string>
@@ -3645,7 +3645,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>
@@ -3852,8 +3852,8 @@
     <string name="data_usage_summary_format" msgid="7788095271598602797">"डेटाको <xliff:g id="AMOUNT">%1$s</xliff:g> प्रयोग गरियो"</string>
     <string name="data_usage_wifi_format" msgid="9028934101966264710">"Wi‑Fi मा प्रयोग भएको <xliff:g id="AMOUNT">^1</xliff:g>"</string>
     <plurals name="notification_summary" formatted="false" msgid="761061343339229103">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> अनुप्रयोगका लागि निष्क्रिय पारिएको छ</item>
-      <item quantity="one">१ अनुप्रयोगका लागि निष्क्रिय पारिएको छ</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> एपका लागि निष्क्रिय पारिएको छ</item>
+      <item quantity="one">१ एपका लागि निष्क्रिय पारिएको छ</item>
     </plurals>
     <string name="notification_summary_none" msgid="5003043219430054784">"सबै अनुप्रयोगहरूका लागि खुला"</string>
     <string name="apps_summary" msgid="8355759446490212195">"<xliff:g id="COUNT">%1$d</xliff:g> एपहरू स्थापना गरियो"</string>
@@ -3964,7 +3964,7 @@
     <string name="configure" msgid="8232696842838580549">"कन्फिगर गर्नुहोस्"</string>
     <string name="data_usage_other_apps" msgid="7002491980141402084">"प्रयोगमा समावेश गरिएका अन्य एपहरू"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="6046013861315713697">
-      <item quantity="other">डेटा सेभर अन हुँदा <xliff:g id="COUNT">%1$d</xliff:g> अनुप्रयोगहरूलाई असीमित डेटाको प्रयोग गर्न अनुमति दिइयो</item>
+      <item quantity="other">डेटा सेभर अन हुँदा <xliff:g id="COUNT">%1$d</xliff:g> एपहरूलाई असीमित डेटाको प्रयोग गर्न अनुमति दिइयो</item>
       <item quantity="one">डेटा सेभर अन हुँदा १ एपलाई असीमित डेटाको प्रयोग गर्न अनुमति दिइयो</item>
     </plurals>
     <string name="data_usage_title" msgid="7874606430902201083">"प्राथमिक डेटा"</string>
@@ -3996,7 +3996,7 @@
     <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_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>
@@ -4038,7 +4038,7 @@
     <string name="notification_log_details_alerted" msgid="1891749888625061319">"सूचनाबारे सतर्क गरियो"</string>
     <string name="notification_log_details_sound" msgid="4028782443557466322">"ध्वनि"</string>
     <string name="notification_log_details_vibrate" msgid="8372400602058888072">"कम्पन हुने"</string>
-    <string name="notification_log_details_vibrate_pattern" msgid="7015554755444260922">"ढाँचा"</string>
+    <string name="notification_log_details_vibrate_pattern" msgid="7015554755444260922">"प्याटर्न"</string>
     <string name="notification_log_details_default" msgid="455451833359888182">"पूर्वनिर्धारित"</string>
     <string name="notification_log_details_none" msgid="4294690532744821638">"कुनै पनि होइन"</string>
     <string name="notification_log_details_ranking_null" msgid="3907234749871463339">"वर्गीकरण सम्बन्धी वस्तु उपलब्ध छैन।"</string>
@@ -4075,7 +4075,7 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="596205630653123250">"धेरै यन्त्रहरूमा जडान गरियो"</string>
     <string name="demo_mode" msgid="3831081808592541104">"प्रणालीको UI को प्रदर्शन मोड"</string>
     <string name="dark_ui_mode" msgid="703844190192599217">"विषयवस्तु"</string>
-    <string name="dark_ui_mode_title" msgid="8774932716427742413">"विषयवस्तु छनौट गर्नुहोस्"</string>
+    <string name="dark_ui_mode_title" msgid="8774932716427742413">"थिम छनौट गर्नुहोस्"</string>
     <string name="dark_ui_settings_light_summary" msgid="5219102347744462812">"यो सेटिङ एपहरूमा पनि लागू हुन्छ"</string>
     <string name="dark_ui_settings_dark_summary" msgid="7042737828943784289">"समर्थन गरिएका एपहरू पनि बदलिएर गाढा विषयवस्तुमा जाने छन्"</string>
     <string name="quick_settings_developer_tiles" msgid="7423485925757678719">"द्रुत सेटिङहरू सम्बन्धी विकासकर्ताका टाइलहरू"</string>
@@ -4086,7 +4086,7 @@
     <string name="managed_profile_contact_search_summary" msgid="7278267480246726951">"कलर र सम्पर्कहरूको पहिचान गर्न तपाईँको संगठन अनुसार गरिने सम्पर्कका खोजीहरूलाई अनुमति दिनुहोस्"</string>
     <string name="cross_profile_calendar_title" msgid="2351605904015067145">"अन्तरप्रोफाइल पात्रो"</string>
     <string name="cross_profile_calendar_summary" msgid="3196258680438896098">"व्यक्तिगत पात्रोमा कार्यस्थलसम्बन्धी कार्यक्रमहरू देखाउनुहोस्"</string>
-    <string name="cross_profile_calendar_restricted_summary" msgid="6892589892357409107">"तपाईंको सङ्गठनले निजी अनुप्रयोगहरूलाई तपाईंको कार्यस्थलको पात्रोमाथि पहुँच गर्ने अनुमति दिँदैन"</string>
+    <string name="cross_profile_calendar_restricted_summary" msgid="6892589892357409107">"तपाईंको सङ्गठनले निजी एपहरूलाई तपाईंको कार्यस्थलको पात्रोमाथि पहुँच गर्ने अनुमति दिँदैन"</string>
     <plurals name="hours" formatted="false" msgid="135936773984899873">
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> घन्टा</item>
       <item quantity="one">१ घन्टा</item>
@@ -4100,8 +4100,8 @@
       <item quantity="one">१ सेकेन्ड</item>
     </plurals>
     <string name="automatic_storage_manager_settings" msgid="2403621409625820182">"भण्डारणको व्यवस्थापन गर्नुहोस्"</string>
-    <string name="automatic_storage_manager_text" msgid="4270379105066667493">"भण्डारण प्रबन्धकले भण्डारणको ठाउँ खाली गर्न मद्दतका लागि तपाईँको यन्त्रबाट ब्याक अप गरिएका तस्बिर र भिडियोहरू हटाउँदछ।"</string>
-    <string name="automatic_storage_manager_days_title" msgid="1783767804707813799">"तस्बिर र भिडियोहरूलाई मेट्नुहोस्"</string>
+    <string name="automatic_storage_manager_text" msgid="4270379105066667493">"भण्डारण प्रबन्धकले भण्डारणको ठाउँ खाली गर्न मद्दतका लागि तपाईँको यन्त्रबाट ब्याक अप गरिएका फोटो र भिडियोहरू हटाउँदछ।"</string>
+    <string name="automatic_storage_manager_days_title" msgid="1783767804707813799">"फोटो र भिडियोहरूलाई मेट्नुहोस्"</string>
     <string name="automatic_storage_manager_preference_title" msgid="4668642150512639466">"भण्डारण प्रबन्धक"</string>
     <string name="automatic_storage_manager_master_switch_title" msgid="1456978117739582562">"भण्डारण प्रबन्धक प्रयोग गर्नुहोस्"</string>
     <string name="deletion_helper_automatic_title" msgid="4370975149425263205">"स्वतः"</string>
@@ -4152,7 +4152,7 @@
     <string name="web_action_enable_title" msgid="4462106633708675959">"तात्कालिक एपहरू"</string>
     <string name="web_action_enable_summary" msgid="1729016644691793085">"अनुप्रयोगहरूको स्थापना नगरिए तापनि लिंकहरूलाई तिनीहरूमा खोल्नुहोस्"</string>
     <string name="web_action_section_title" msgid="5563229447734734662">"तात्कालिक एपहरू"</string>
-    <string name="instant_apps_settings" msgid="879003203555847537">"तात्कालिक अनुप्रयोगका प्राथमिकताहरू"</string>
+    <string name="instant_apps_settings" msgid="879003203555847537">"तात्कालिक एपका प्राथमिकताहरू"</string>
     <string name="domain_url_section_title" msgid="206403507921518321">"स्थापना गरिएका एपहरू"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="2630083316417707308">"तपाईंको भण्डारण अहिले भण्डारण प्रबन्धकद्वारा व्यवस्थापन भइरहेको छ"</string>
     <string name="account_for_section_header" msgid="5975241715840642563">"<xliff:g id="USER_NAME">%1$s</xliff:g> का खाताहरू"</string>
@@ -4160,7 +4160,7 @@
     <string name="auto_sync_account_title" msgid="2394463123733529506">"स्वत: डेटा सिंक गर्नुहोस्"</string>
     <string name="auto_sync_personal_account_title" msgid="6844465157916100655">"व्यक्तिगत डेटा स्वत: सिंक गर्नुहोस्"</string>
     <string name="auto_sync_work_account_title" msgid="2403222633447522376">"कार्य सम्बन्धी डेटा स्वत: सिंक गर्नुहोस्"</string>
-    <string name="auto_sync_account_summary" msgid="6316230976974033772">"अनुप्रयोगहरूलाई स्वत: डेटा रिफ्रेस गर्न दिनुहोस्"</string>
+    <string name="auto_sync_account_summary" msgid="6316230976974033772">"एपहरूलाई स्वत: डेटा रिफ्रेस गर्न दिनुहोस्"</string>
     <string name="account_sync_title" msgid="1570164819114297154">"खाताको सिंक"</string>
     <string name="account_sync_summary_some_on" msgid="1934556869158274053">"<xliff:g id="ID_2">%2$d</xliff:g> मध्ये <xliff:g id="ID_1">%1$d</xliff:g> वस्तुहरूका लागि सिंक गर्ने सेवा सक्रिय छ"</string>
     <string name="account_sync_summary_all_on" msgid="3634161204232431700">"सबै वस्तुहरूका लागि सिंक गर्ने सेवा सक्रिय छ"</string>
@@ -4180,7 +4180,7 @@
     <string name="enterprise_privacy_security_logs" msgid="8936969480449604726">"सबैभन्दा पछिल्लो सुरक्षा लग"</string>
     <string name="enterprise_privacy_none" msgid="5990646476868794882">"कुनै पनि होइन"</string>
     <string name="enterprise_privacy_enterprise_installed_packages" msgid="6575025134782391212">"एपहरू स्थापना गरियो"</string>
-    <string name="enterprise_privacy_apps_count_estimation_info" msgid="5020730108878608500">"एपको संख्या अनुमानित हो। Play Store भन्दा बाहिरबाट स्थापना गरिएका अनुप्रयोगहरूलाई यसले नसमेट्न सक्छ।"</string>
+    <string name="enterprise_privacy_apps_count_estimation_info" msgid="5020730108878608500">"एपको संख्या अनुमानित हो। Play Store भन्दा बाहिरबाट स्थापना गरिएका एपहरूलाई यसले नसमेट्न सक्छ।"</string>
     <plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="5161417161943060602">
       <item quantity="other">न्यूनतम <xliff:g id="COUNT_1">%d</xliff:g> एप</item>
       <item quantity="one">न्यूनतम <xliff:g id="COUNT_0">%d</xliff:g> एप</item>
@@ -4235,7 +4235,7 @@
     </plurals>
     <string name="app_names_concatenation_template_2" msgid="8267577900046506189">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
     <string name="app_names_concatenation_template_3" msgid="5129064036161862327">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
-    <string name="storage_photos_videos" msgid="1890829312367477559">"तस्बिर र भिडियोहरू"</string>
+    <string name="storage_photos_videos" msgid="1890829312367477559">"फोटो र भिडियोहरू"</string>
     <string name="storage_music_audio" msgid="3661289086715297149">"सङ्गीत तथा अडियो"</string>
     <string name="storage_games" msgid="7740038143749092373">"खेलहरू"</string>
     <string name="storage_other_apps" msgid="3202407095387420842">"अन्य एपहरू"</string>
@@ -4253,7 +4253,7 @@
     <string name="webview_disabled_for_user" msgid="8057805373224993504">"(प्रयोगकर्ता <xliff:g id="USER">%s</xliff:g> को लागि असक्षम पारियो)"</string>
     <string name="autofill_app" msgid="3990765434980280073">"स्वतः भरण सेवा"</string>
     <string name="autofill_keywords" msgid="7717726766232862218">"स्वतः, भरण, स्वतः भरण"</string>
-    <string name="autofill_confirmation_message" msgid="1385894598730361304">"&lt;b&gt;तपाईं यो अनुप्रयोगमाथि भरोसा गर्नुहुन्छ भन्ने कुरा पक्का गर्नुहोस्&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; यस अनुप्रयोगले स्वतः भर्नसकिने कुराहरूको निर्धारण गर्न तपाईंको स्क्रिनमा भएका वस्तुहरूको प्रयोग गर्छ।"</string>
+    <string name="autofill_confirmation_message" msgid="1385894598730361304">"&lt;b&gt;तपाईं यो एपमाथि भरोसा गर्नुहुन्छ भन्ने कुरा पक्का गर्नुहोस्&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; यस अनुप्रयोगले स्वतः भर्नसकिने कुराहरूको निर्धारण गर्न तपाईंको स्क्रिनमा भएका वस्तुहरूको प्रयोग गर्छ।"</string>
     <string name="debug_autofill_category" msgid="6262526615416295645">"स्वतः भरण"</string>
     <string name="autofill_logging_level_title" msgid="2577340324541102626">"लगिङको स्तर"</string>
     <string name="autofill_max_partitions" msgid="125269645910590057">"प्रति सत्र अनुरोधको अधिकतम सङ्ख्या"</string>
@@ -4385,7 +4385,7 @@
     <string name="carrier_settings_title" msgid="7989949967020825268">"सेवा प्रदायकसम्बन्धी सेटिङहरू"</string>
     <string name="cdma_lte_data_service" msgid="8996857851150069339">"डेटा सेवा सेटअप गर्नुहोस्"</string>
     <string name="mobile_data_settings_title" msgid="3439626666647519547">"मोबाइल डेटा"</string>
-    <string name="mobile_data_settings_summary" msgid="6492798151325636912">"मोबाइल नेटवर्क प्रयोग गरी डेटामाथि पहुँच राख्नुहोस्"</string>
+    <string name="mobile_data_settings_summary" msgid="6492798151325636912">"मोबाइल नेटवर्कबाट इन्टरनेट चलाउनुहोस्"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="3665863214578471494">"फोन दायरामा हुँदा यस सेवा प्रदायकमा स्वत: स्विच हुने छ"</string>
     <string name="calls_preference" msgid="2076353032705811243">"कलसम्बन्धी प्राथमिकता"</string>
     <string name="sms_preference" msgid="8449270011976880">"SMS सम्बन्धी प्राथमिकता"</string>
@@ -4445,7 +4445,7 @@
     <string name="mobile_network_mode_error" msgid="6818434186286086554">"अमान्य नेटवर्क मोड <xliff:g id="NETWORKMODEID">%1$d</xliff:g>। बेवास्ता गर्नुहोस्।"</string>
     <string name="mobile_network_apn_title" msgid="5628635067747404382">"एक्सेस पोइन्ट नामहरू"</string>
     <string name="manual_mode_disallowed_summary" msgid="799800630000340665">"<xliff:g id="CARRIER">%1$s</xliff:g> मा जडान हुँदा उपलब्ध छैन"</string>
-    <string name="emergency_info_contextual_card_summary" msgid="5541444321969803486">"चिकित्सकीय जानकारी, आपतकालीन सम्पर्कहरू"</string>
+    <string name="emergency_info_contextual_card_summary" msgid="5541444321969803486">"चिकित्सकीय जानकारी, आपत्‌कालीन सम्पर्कहरू"</string>
     <string name="see_more" msgid="7463940160389802632">"थप हेर्नुहोस्"</string>
     <string name="see_less" msgid="3718892257002813387">"कम हेर्नुहोस्"</string>
     <string name="network_connection_request_dialog_title" msgid="3150489262902506588">"<xliff:g id="APPNAME">%1$s</xliff:g> प्रयोग गरिने यन्त्र"</string>
@@ -4520,5 +4520,5 @@
     <string name="automatic_system_heap_dump_summary" msgid="4962129546638974661">"Android प्रणालीले अत्यधिक मेमोरी प्रयोग गर्दा यसका लागि स्वतः हिप डम्प समावेश गर्नुहोस्"</string>
     <string name="wifi_disconnect_button_text" msgid="787688024070426706">"विच्छेद गर्नुहोस्"</string>
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="26884532087670844">"आपताकालीन कल"</string>
-    <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="8726152486964822599">"तपाईंको सेवा प्रदायकले Wi‑Fi मार्फत आपतकालीन कल गर्ने सुविधा समर्थन गदैन। \nअपतकालीन कल गर्नका लागि उक्त यन्त्रले स्वतः सेलुलर नेटवर्क प्रयोग गर्छ।\n सेलुलर नेटवर्कको कभरेज राम्रो भएका क्षेत्रमा मात्र अपतकालीन कल गर्न सम्भव हुन्छ।"</string>
+    <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="8726152486964822599">"तपाईंको सेवा प्रदायकले Wi‑Fi मार्फत आपत्‌कालीन कल गर्ने सुविधा समर्थन गदैन। \nअपतकालीन कल गर्नका लागि उक्त यन्त्रले स्वतः सेलुलर नेटवर्क प्रयोग गर्छ।\n सेलुलर नेटवर्कको कभरेज राम्रो भएका क्षेत्रमा मात्र अपतकालीन कल गर्न सम्भव हुन्छ।"</string>
 </resources>
diff --git a/tests/CarDeveloperOptions/res/values-nl/strings.xml b/tests/CarDeveloperOptions/res/values-nl/strings.xml
index b4d03b2..60336e6 100644
--- a/tests/CarDeveloperOptions/res/values-nl/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-nl/strings.xml
@@ -112,7 +112,7 @@
     <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="7322773998151831579">"De verbinding tussen je tablet en <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wordt verbroken."</string>
     <string name="bluetooth_disconnect_all_profiles" product="device" msgid="4707569949253450208">"De verbinding tussen je apparaat en <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wordt verbroken."</string>
     <string name="bluetooth_disconnect_dialog_ok" msgid="4183522987246110145">"Koppel los"</string>
-    <string name="bluetooth_empty_list_user_restricted" msgid="3616298363281495777">"Je hebt geen toestemming om de Bluetooth-instellingen te wijzigen."</string>
+    <string name="bluetooth_empty_list_user_restricted" msgid="3616298363281495777">"Je hebt geen rechten om de Bluetooth-instellingen te wijzigen."</string>
     <string name="bluetooth_pairing_pref_title" msgid="2904954138013884029">"Apparaat koppelen"</string>
     <string name="bluetooth_is_visible_message" msgid="6341088682252805612">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> is zichtbaar voor apparaten in de buurt wanneer het venster \'Bluetooth-instellingen\' is geopend."</string>
     <string name="bluetooth_footer_mac_message" product="default" msgid="335341476746836260">"Bluetooth-adres van je telefoon: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
@@ -198,7 +198,7 @@
     <string name="proxy_port_label" msgid="8285157632538848509">"Proxy-poort"</string>
     <string name="proxy_exclusionlist_label" msgid="8179084955547941904">"Proxy omzeilen voor"</string>
     <string name="proxy_defaultView_text" msgid="5785775257042403261">"Standaardwaarden herstellen"</string>
-    <string name="proxy_action_text" msgid="814511434843981413">"Gereed"</string>
+    <string name="proxy_action_text" msgid="814511434843981413">"Klaar"</string>
     <string name="proxy_hostname_label" msgid="6798891831427287847">"Hostnaam van proxy"</string>
     <string name="proxy_error" msgid="5036164133669802299">"Let op"</string>
     <string name="proxy_error_dismiss" msgid="883805570485635650">"OK"</string>
@@ -293,7 +293,7 @@
     <string name="okay" msgid="5838476766924989056">"OK"</string>
     <string name="forget" msgid="7735525146062672874">"Vergeten"</string>
     <string name="save" msgid="3418211178410498517">"Opslaan"</string>
-    <string name="done" msgid="5143229467535372339">"Gereed"</string>
+    <string name="done" msgid="5143229467535372339">"Klaar"</string>
     <string name="apply" msgid="951230399613164126">"Toepassen"</string>
     <string name="share" msgid="3567029787293158575">"Delen"</string>
     <string name="add" msgid="903114118076816060">"Toevoegen"</string>
@@ -415,7 +415,7 @@
     <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="4917894418448325405">"Tijdlimiet voor gezichtsregistratie is bereikt. Probeer het opnieuw."</string>
     <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="5160473187142616862">"Gezichtsregistratie is mislukt"</string>
     <string name="security_settings_face_enroll_finish_title" msgid="6800717857394410769">"Alles is ingesteld."</string>
-    <string name="security_settings_face_enroll_done" msgid="5409739233373490971">"Gereed"</string>
+    <string name="security_settings_face_enroll_done" msgid="5409739233373490971">"Klaar"</string>
     <string name="security_settings_face_settings_use_face_category" msgid="1586532139528115416">"Gezicht gebr. voor"</string>
     <string name="security_settings_face_settings_use_face_unlock_phone" msgid="318274519126401671">"Apparaatontgrendeling"</string>
     <string name="security_settings_face_settings_use_face_for_apps" msgid="5479369083370664351">"App-login en -betalingen"</string>
@@ -467,10 +467,10 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4312297515772004580">"Verwijderen"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="1346287821809975177">"Raak de sensor aan"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="750040530347336376">"Plaats je vinger op de sensor en til deze op nadat je een trilling hebt gevoeld."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="1764145704166303842">"Til op en raak opnieuw aan"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="1764145704166303842">"Raak de sensor aan"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4434560313661204448">"Raak de sensor meerdere keren aan om de verschillende delen van je vingerafdruk toe te voegen."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="2987918958909117821">"Vingerafdruk toegevoegd"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="5862643337893923347">"Wanneer je dit pictogram ziet, kun je je vingerafdruk gebruiken voor identificatie of om een aankoop goed te keuren."</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="5862643337893923347">"Als je dit icoon ziet, kun je je vingerafdruk gebruiken voor identificatie of om een aankoop goed te keuren."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="1473280156532146933">"Later doen"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="2816424026528101690">"Instellen van vingerafdruk overslaan?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="8139299964344809780">"Je hebt ervoor gekozen je vingerafdruk te gebruiken als manier om je telefoon te ontgrendelen. Als je dit nu overslaat, moet je het later instellen. Het instellen neemt ongeveer een minuut in beslag."</string>
@@ -484,7 +484,7 @@
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Instell. wachtwoord overslaan?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Instellen patroon overslaan?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Schermvergrendeling instellen"</string>
-    <string name="security_settings_fingerprint_enroll_done" msgid="4111289529758845926">"Gereed"</string>
+    <string name="security_settings_fingerprint_enroll_done" msgid="4111289529758845926">"Klaar"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="7410398793283818609">"Dat is niet de sensor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="7192100314788868883">"Raak de sensor achter op je telefoon aan. Gebruik je wijsvinger."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="1415709674142168770">"Registratie is niet voltooid"</string>
@@ -565,7 +565,7 @@
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="9070847611379078795">"Kies een methode voor schermvergrendeling"</string>
     <string name="unlock_set_unlock_off_title" msgid="5049876793411416079">"Geen"</string>
     <string name="unlock_set_unlock_off_summary" msgid="3997346045783359119"></string>
-    <string name="unlock_set_unlock_none_title" msgid="1922027966983146392">"Vegen"</string>
+    <string name="unlock_set_unlock_none_title" msgid="1922027966983146392">"Swipen"</string>
     <string name="unlock_set_unlock_none_summary" msgid="4044529413627659031">"Geen beveiliging"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="7533759994999423587">"Patroon"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="8858697834522201333">"Gemiddelde beveiliging"</string>
@@ -587,7 +587,7 @@
     <string name="face_unlock_title" msgid="1298031162909236127">"Je kunt je telefoon ontgrendelen met je gezicht. Uit beveiligingsoverwegingen is voor deze optie een extra schermvergrendeling vereist."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="1713159782896140817">"Uitgeschakeld door beheerder, versleutelingsbeleid of opslag certificaatgegevens"</string>
     <string name="unlock_set_unlock_mode_off" msgid="2950701212659081973">"Geen"</string>
-    <string name="unlock_set_unlock_mode_none" msgid="3441605629077912292">"Vegen"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="3441605629077912292">"Swipen"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="8564909572968419459">"Patroon"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="7828354651668392875">"Pincode"</string>
     <string name="unlock_set_unlock_mode_password" msgid="397703731925549447">"Wachtwoord"</string>
@@ -808,7 +808,7 @@
     <string name="wifi_display_details" msgid="6379855523460749126">"Weergave-instellingen"</string>
     <string name="wifi_display_options_title" msgid="4587264519668872213">"Opties voor draadloze weergave"</string>
     <string name="wifi_display_options_forget" msgid="7882982544626742073">"Vergeten"</string>
-    <string name="wifi_display_options_done" msgid="5922060890309265817">"Gereed"</string>
+    <string name="wifi_display_options_done" msgid="5922060890309265817">"Klaar"</string>
     <string name="wifi_display_options_name" msgid="8477627781133827607">"Naam"</string>
     <string name="wifi_band_24ghz" msgid="2973143764653628618">"2,4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6469832209748522207">"5 GHz"</string>
@@ -890,7 +890,7 @@
     <string name="wifi_menu_modify" msgid="4080178040721021101">"Netwerk aanpassen"</string>
     <string name="wifi_empty_list_wifi_off" msgid="272877164691346240">"Schakel wifi in om beschikbare netwerken te zien."</string>
     <string name="wifi_empty_list_wifi_on" msgid="881478805041020600">"Wifi-netwerken zoeken…"</string>
-    <string name="wifi_empty_list_user_restricted" msgid="2341613007817352431">"Je hebt geen toestemming om het wifi-netwerk te wijzigen."</string>
+    <string name="wifi_empty_list_user_restricted" msgid="2341613007817352431">"Je hebt geen rechten om het wifi-netwerk te wijzigen."</string>
     <string name="wifi_more" msgid="3538241640407382185">"Meer"</string>
     <string name="wifi_setup_wps" msgid="6730131677695521321">"Autom. config. (WPS)"</string>
     <string name="wifi_settings_scanning_required_title" msgid="3593457187659922490">"Wifi-scannen inschakelen?"</string>
@@ -1239,7 +1239,7 @@
     <string name="screen_timeout_title" msgid="150117777762864112">"Scherm wordt uitgeschakeld"</string>
     <string name="screen_timeout_summary" msgid="8644192861778491060">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inactiviteit"</string>
     <string name="wallpaper_settings_title" msgid="347390905813529607">"Achtergrond"</string>
-    <string name="style_and_wallpaper_settings_title" msgid="8898539141152705754">"Stijlen en achtergronden"</string>
+    <string name="style_and_wallpaper_settings_title" msgid="8898539141152705754">"Stijl en achtergronden"</string>
     <string name="wallpaper_settings_summary_default" msgid="2626880032742784599">"Standaard"</string>
     <string name="wallpaper_settings_summary_custom" msgid="8950504698015331202">"Aangepast"</string>
     <string name="wallpaper_suggestion_title" msgid="3012130414886743201">"Achtergrond wijzigen"</string>
@@ -1625,7 +1625,7 @@
     <string name="usb_tethering_subtext" product="tablet" msgid="154536000235361034">"Internetverbinding van tablet delen via USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="7257293066139372774">"Bluetooth-tethering"</string>
     <string name="bluetooth_tethering_subtext" product="tablet" msgid="6868756914621131635">"Internetverbinding van deze tablet delen via bluetooth"</string>
-    <string name="bluetooth_tethering_subtext" product="default" msgid="9167912297565425178">"Internetverbinding van deze telefoon delen via bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="9167912297565425178">"Internetverbinding van telefoon delen via bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="3981528184780083266">"Internetverbinding van deze <xliff:g id="DEVICE_NAME">%1$d</xliff:g> delen via bluetooth"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="6946561351369376943">"Kan niet meer dan <xliff:g id="MAXCONNECTION">%1$d</xliff:g> apparaten tetheren."</string>
     <string name="bluetooth_untether_blank" msgid="5428300773782256084">"Tethering van <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wordt opgeheven."</string>
@@ -1678,7 +1678,7 @@
     <string name="use_location_title" msgid="7724788634359496634">"Locatie en Google Zoeken"</string>
     <string name="use_location_summary" msgid="7396716606067400283">"Google toestaan je locatie te gebruiken om zoekresultaten en andere services te verbeteren"</string>
     <string name="location_access_title" msgid="8587974819606800029">"Toegang tot mijn locatie"</string>
-    <string name="location_access_summary" msgid="6919495149026354355">"Apps die je toestemming hebben gevraagd, toestaan je locatiegegevens te gebruiken"</string>
+    <string name="location_access_summary" msgid="6919495149026354355">"Apps die rechten hebben gevraagd, toestaan om je locatiegegevens te gebruiken"</string>
     <string name="location_sources_heading" msgid="8526658357120282741">"Locatiebronnen"</string>
     <string name="about_settings" product="tablet" msgid="4869626690708456341">"Over tablet"</string>
     <string name="about_settings" product="default" msgid="6019547763377294261">"Over de telefoon"</string>
@@ -1945,7 +1945,7 @@
     <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">"Talen en invoer"</string>
-    <string name="language_empty_list_user_restricted" msgid="3837176532474949716">"Je hebt geen toestemming om de apparaattaal te wijzigen."</string>
+    <string name="language_empty_list_user_restricted" msgid="3837176532474949716">"Je hebt geen rechten om de apparaattaal te wijzigen."</string>
     <string name="language_keyboard_settings_title" msgid="2672573191605298938">"Talen en invoer"</string>
     <string name="input_assistance" msgid="6442646949054057707">"Tools"</string>
     <string name="keyboard_settings_category" msgid="5857591390023852850">"Toetsenbord en invoermethoden"</string>
@@ -2099,15 +2099,15 @@
     <string name="accessibility_daltonizer_master_switch_title" msgid="4855011639012300777">"Kleurcorrectie gebruiken"</string>
     <string name="accessibility_caption_master_switch_title" msgid="6373335123229234053">"Ondertiteling gebruiken"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="4650111296711466691">"Doorgaan"</string>
-    <string name="accessibility_hearingaid_title" msgid="3700978781235124891">"Gehoorapparaten"</string>
-    <string name="accessibility_hearingaid_not_connected_summary" msgid="634573930469952213">"Geen gehoorapparaten verbonden"</string>
-    <string name="accessibility_hearingaid_adding_summary" msgid="4139031880828714300">"Gehoorapparaten toevoegen"</string>
-    <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="2671518890909750740">"Tik op het volgende scherm op je gehoorapparaat om dit te koppelen."</string>
-    <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="1584538735488464991">"Controleer of je gehoorapparaat zich in de koppelingsmodus bevindt."</string>
+    <string name="accessibility_hearingaid_title" msgid="3700978781235124891">"Hoortoestellen"</string>
+    <string name="accessibility_hearingaid_not_connected_summary" msgid="634573930469952213">"Geen hoortoestellen verbonden"</string>
+    <string name="accessibility_hearingaid_adding_summary" msgid="4139031880828714300">"Hoortoestellen toevoegen"</string>
+    <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="2671518890909750740">"Tik op het volgende scherm op je hoortoestel om dit te koppelen."</string>
+    <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="1584538735488464991">"Controleer of je hoortoestel zich in de koppelingsmodus bevindt."</string>
     <string name="accessibility_hearingaid_active_device_summary" msgid="6081382497207168885">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> actief"</string>
     <plurals name="show_number_hearingaid_count" formatted="false" msgid="7906547154695855096">
-      <item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> opgeslagen gehoorapparaten</item>
-      <item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> opgeslagen gehoorapparaat</item>
+      <item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> opgeslagen hoortoestellen</item>
+      <item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> opgeslagen hoortoestel</item>
     </plurals>
     <string name="accessibility_summary_state_enabled" msgid="7357731696603247963">"Aan"</string>
     <string name="accessibility_summary_state_disabled" msgid="9197369047683087620">"Uit"</string>
@@ -2179,7 +2179,7 @@
     <string name="color_magenta" msgid="721976999611563071">"Magenta"</string>
     <string name="enable_service_title" msgid="2746143093464928251">"\'<xliff:g id="SERVICE">%1$s</xliff:g>\' gebruiken?"</string>
     <string name="capabilities_list_title" msgid="8177719542886123788">"\'<xliff:g id="SERVICE">%1$s</xliff:g>\' moet het volgende kunnen:"</string>
-    <string name="touch_filtered_warning" msgid="3072665526993043879">"Aangezien een app een toestemmingsverzoek afdekt, kan Instellingen je reactie niet verifiëren."</string>
+    <string name="touch_filtered_warning" msgid="3072665526993043879">"Aangezien een app een rechtenverzoek afdekt, kan Instellingen je reactie niet verifiëren."</string>
     <string name="enable_service_encryption_warning" msgid="3580275420826492351">"Als je <xliff:g id="SERVICE">%1$s</xliff:g> inschakelt, maakt je apparaat geen gebruik van schermvergrendeling om de gegevensversleuteling te verbeteren."</string>
     <string name="secure_lock_encryption_warning" msgid="8724670910924531152">"Omdat je een toegankelijkheidsservice hebt ingeschakeld, maakt je apparaat geen gebruik van schermvergrendeling om de gegevensversleuteling te verbeteren."</string>
     <string name="enable_service_pattern_reason" msgid="7415969807374459848">"Aangezien het inschakelen van <xliff:g id="SERVICE">%1$s</xliff:g> van invloed is op de gegevensversleuteling, moet je je patroon bevestigen."</string>
@@ -2455,7 +2455,7 @@
     <string name="battery_saver_auto_percentage_summary" msgid="2036128588460338677">"Wordt ingeschakeld bij <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_saver_schedule_settings_title" msgid="574233428557678128">"Een planning instellen"</string>
     <string name="battery_saver_sticky_title_new" msgid="5328707297110866082">"Uitschakelen wanneer volledig opgeladen"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="3406582427270935879">"Batterijbesparing wordt uitgeschakeld wanneer je telefoon <xliff:g id="PERCENT">%1$s</xliff:g> batterijlading heeft"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="3406582427270935879">"Batterijbesparing wordt uitgeschakeld als je telefoon <xliff:g id="PERCENT">%1$s</xliff:g> batterijlading heeft"</string>
     <string name="battery_saver_sticky_description_new" product="tablet" msgid="3284967694001857194">"Batterijbesparing wordt uitgeschakeld wanneer je tablet <xliff:g id="PERCENT">%1$s</xliff:g> batterijlading heeft"</string>
     <string name="battery_saver_sticky_description_new" product="device" msgid="5056520668081504111">"Batterijbesparing wordt uitgeschakeld wanneer je apparaat <xliff:g id="PERCENT">%1$s</xliff:g> batterijlading heeft"</string>
     <!-- no translation found for battery_saver_seekbar_title (7607123201469333645) -->
@@ -2629,9 +2629,9 @@
     <string name="remove_account_label" msgid="5885425720323823387">"Account verwijderen"</string>
     <string name="header_add_an_account" msgid="8482614556580804956">"Account toevoegen"</string>
     <string name="really_remove_account_title" msgid="4166512362915154319">"Account verwijderen?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Als dit account wordt verwijderd, worden ook alle accountberichten, contacten en andere gegevens van de tablet verwijderd."</string>
-    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Als dit account wordt verwijderd, worden ook alle account­berichten, contacten en andere gegevens van de telefoon verwijderd."</string>
-    <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Als dit account wordt verwijderd, worden ook alle bijbehorende berichten, contacten en andere gegevens van het apparaat verwijderd."</string>
+    <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Als dit je account verwijdert, worden ook alle accountberichten, contacten en andere gegevens van de tablet verwijderd."</string>
+    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Als je dit account verwijdert, worden ook alle account­berichten, contacten en andere gegevens van de telefoon verwijderd."</string>
+    <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Als je dit account verwijdert, worden ook alle bijbehorende berichten, contacten en andere gegevens van het apparaat verwijderd."</string>
     <string name="remove_account_failed" msgid="491458185327106966">"Deze wijziging is niet toegestaan door je beheerder"</string>
     <string name="cant_sync_dialog_title" msgid="5483419398223189881">"Kan niet handmatig synchroniseren"</string>
     <string name="cant_sync_dialog_message" msgid="3467126947262857534">"Synchroniseren is op dit moment uitgeschakeld voor dit item. Als je deze instelling wilt wijzigen, schakel je achtergrondgegevens en automatisch synchroniseren tijdelijk in."</string>
@@ -2679,7 +2679,7 @@
     <string name="data_usage_label_background" msgid="1618794447370396845">"Achtergrond"</string>
     <string name="data_usage_app_restricted" msgid="7569077654579299326">"beperkt"</string>
     <string name="data_usage_disable_mobile" msgid="4125335076749119451">"Mobiele data uitschakelen?"</string>
-    <string name="data_usage_disable_mobile_limit" msgid="1937796699758613667">"Mobiele gegevenslimiet instellen"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="1937796699758613667">"Mobiele-datalimiet instellen"</string>
     <string name="data_usage_disable_4g_limit" msgid="7131367986548147266">"4G-gegevenslimiet instellen"</string>
     <string name="data_usage_disable_3g_limit" msgid="6746819313032692220">"2G-3G-gegevenslimiet instellen"</string>
     <string name="data_usage_disable_wifi_limit" msgid="8214267551888018353">"Wifi-datalimiet instellen"</string>
@@ -2699,7 +2699,7 @@
     <string name="data_usage_app_settings" msgid="3276444867375694809">"App-instellingen"</string>
     <string name="data_usage_app_restrict_background" msgid="649167881583859169">"Achtergrondgegevens"</string>
     <string name="data_usage_app_restrict_background_summary" msgid="2703967920234671881">"Gebruik van mobiele data op de achtergrond toestaan"</string>
-    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7211921499365814638">"Als je achtergrondgegevens wilt beperken voor deze app, moet je eerst een mobiele gegevenslimiet instellen."</string>
+    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7211921499365814638">"Als je achtergrondgegevens wilt beperken voor deze app, moet je eerst een mobiele-datalimiet instellen."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="750037964591673167">"Achtergrondgegevens beperken?"</string>
     <string name="data_usage_app_restrict_dialog" msgid="4022530391896478031">"Deze functie kan ervoor zorgen dat een app die afhankelijk is van achtergrondgegevens, stopt als er alleen mobiele netwerken beschikbaar zijn.\n\nJe kunt meer geschikte besturingselementen voor datagebruik vinden in de instellingen van de app."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="18928292832775805">"Je kunt achtergrondgegevens alleen beperken als je een limiet voor mobiele data hebt ingesteld."</string>
@@ -2829,7 +2829,7 @@
     <string name="backup_pw_cancel_button_text" msgid="6170984655621611957">"Annuleren"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="8674710454802166341">"Aanvullende systeemupdates"</string>
     <string name="ssl_ca_cert_warning" msgid="7794291734272626026">"Netwerk kan worden gemonitord"</string>
-    <string name="done_button" msgid="7652373284597307008">"Gereed"</string>
+    <string name="done_button" msgid="7652373284597307008">"Klaar"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7323708984446517980">
       <item quantity="other">Certificaten vertrouwen of verwijderen</item>
       <item quantity="one">Certificaat vertrouwen of verwijderen</item>
@@ -2871,7 +2871,7 @@
     <string name="user_add_profile_item_title" msgid="4932743891449790664">"Beperkt profiel"</string>
     <string name="user_add_user_title" msgid="2320897397066676472">"Nieuwe gebruiker toevoegen?"</string>
     <string name="user_add_user_message_long" msgid="686637203224195465">"Je kunt dit apparaat met anderen delen door extra gebruikers te maken. Elke gebruiker heeft een eigen profiel met zelf gekozen apps, achtergrond, enzovoort. Gebruikers kunnen ook apparaatinstellingen aanpassen die van invloed zijn op alle gebruikers, zoals wifi.\n\nWanneer je een nieuwe gebruiker toevoegt, moet die persoon een eigen profiel instellen.\n\nElke gebruiker kan apps updaten voor alle andere gebruikers. Toegankelijkheidsinstellingen en -services worden mogelijk niet overgezet naar de nieuwe gebruiker."</string>
-    <string name="user_add_user_message_short" msgid="1802594476285458254">"Wanneer je een nieuwe gebruiker toevoegt, moet die persoon zijn eigen profiel instellen.\n\nElke gebruiker kan apps updaten voor alle andere gebruikers."</string>
+    <string name="user_add_user_message_short" msgid="1802594476285458254">"Als je een nieuwe gebruiker toevoegt, moet die persoon een eigen profiel instellen.\n\nElke gebruiker kan apps updaten voor alle andere gebruikers."</string>
     <string name="user_setup_dialog_title" msgid="6748950002206392396">"Gebruiker nu instellen?"</string>
     <string name="user_setup_dialog_message" msgid="2988559933258353919">"Zorg ervoor dat de persoon het apparaat kan overnemen om een profiel in te stellen"</string>
     <string name="user_setup_profile_dialog_message" msgid="7611900802824048526">"Profiel nu instellen?"</string>
@@ -2934,7 +2934,7 @@
     <string name="restriction_settings_title" msgid="4143751894908963736">"Beperkingen"</string>
     <string name="restriction_menu_reset" msgid="3642252461410370554">"Beperkingen verwijderen"</string>
     <string name="restriction_menu_change_pin" msgid="592512748243421101">"Pincode wijzigen"</string>
-    <string name="app_notifications_switch_label" msgid="670683308275498821">"Meldingen weergeven"</string>
+    <string name="app_notifications_switch_label" msgid="670683308275498821">"Meldingen tonen"</string>
     <string name="help_label" msgid="1296484776243905646">"Hulp en feedback"</string>
     <string name="support_summary" msgid="3278943815956130740">"Help-artikelen, bel- en chatsupport, aan de slag"</string>
     <string name="user_account_title" msgid="2108666882630552859">"Account voor content"</string>
@@ -3295,7 +3295,7 @@
     <string name="ringtones_category_preference_title" msgid="4491932700769815470">"Ringtones"</string>
     <string name="other_sound_category_preference_title" msgid="2045757472469840859">"Andere geluiden en trillingen"</string>
     <string name="configure_notification_settings" msgid="291914315140851270">"Meldingen"</string>
-    <string name="recent_notifications" msgid="8125865995065032049">"Recent verzonden"</string>
+    <string name="recent_notifications" msgid="8125865995065032049">"Recent verstuurd"</string>
     <string name="recent_notifications_see_all_title" msgid="4089007770442871469">"Alles weergeven van de afgelopen zeven dagen"</string>
     <string name="advanced_section_header" msgid="984680389373090015">"Geavanceerd"</string>
     <string name="profile_section_header" msgid="5471479005472037417">"Werkmeldingen"</string>
@@ -3315,15 +3315,15 @@
     <string name="bubbles_feature_disabled_dialog_text" msgid="326945485806386477">"Als je ballonnen wilt inschakelen voor deze app, moet je ze eerst inschakelen voor je apparaat. Dit heeft effect op andere apps waarin je eerder ballonnen hebt ingeschakeld."</string>
     <string name="bubbles_feature_disabled_button_approve" msgid="6661464849674493351">"Inschakelen voor apparaat"</string>
     <string name="bubbles_feature_disabled_button_cancel" msgid="4807286844588486198">"Annuleren"</string>
-    <string name="swipe_direction_title" msgid="7535031630668873009">"Veegacties"</string>
-    <string name="swipe_direction_ltr" msgid="944932514821822709">"Veeg naar rechts om te sluiten of naar links voor het menu"</string>
-    <string name="swipe_direction_rtl" msgid="4521416787262888813">"Veeg naar links om te sluiten of naar rechts voor het menu"</string>
+    <string name="swipe_direction_title" msgid="7535031630668873009">"Swipe-acties"</string>
+    <string name="swipe_direction_ltr" msgid="944932514821822709">"Swipe naar rechts om te sluiten of naar links voor het menu"</string>
+    <string name="swipe_direction_rtl" msgid="4521416787262888813">"Swipe naar links om te sluiten of naar rechts voor het menu"</string>
     <string name="notification_pulse_title" msgid="4861418327614907116">"Knipperlicht"</string>
     <string name="lock_screen_notifications_title" msgid="6889072265118747835">"Op vergrendelscherm"</string>
     <string name="locked_work_profile_notification_title" msgid="8307025804986190658">"Als werkprofiel is vergrendeld"</string>
     <string name="lock_screen_notifications_summary_show" msgid="5788874994455257378">"Content van alle meldingen weergeven"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="3668806866535260143">"Gevoelige content verbergen"</string>
-    <string name="lock_screen_notifications_summary_disable" msgid="3259929507369817672">"Helemaal geen meldingen weergeven"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="3259929507369817672">"Helemaal geen meldingen tonen"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="4230189215124387818">"Hoe moeten meldingen worden weergegeven wanneer je apparaat is vergrendeld?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="2832587379332443505">"Meldingen"</string>
     <string name="lock_screen_notifications_summary_show_profile" msgid="8908775469657073273">"Content van alle werkmeldingen weergeven"</string>
@@ -3336,7 +3336,7 @@
     <string name="notification_group_title" msgid="6105337987437608590">"Groep meldingscategorieën"</string>
     <string name="notification_importance_title" msgid="4131979083408000545">"Gedrag"</string>
     <string name="notification_importance_unspecified" msgid="2515778981253707724">"Geluid toestaan"</string>
-    <string name="notification_importance_blocked" msgid="446807935484629222">"Nooit meldingen weergeven"</string>
+    <string name="notification_importance_blocked" msgid="446807935484629222">"Nooit meldingen tonen"</string>
     <string name="notification_importance_min" msgid="4622854784474818944">"Stil weergeven en minimaliseren"</string>
     <string name="notification_importance_low" msgid="7609797151662295364">"Zonder geluid weergeven"</string>
     <string name="notification_importance_default" msgid="4091563759103917166">"Geluid laten horen"</string>
@@ -3355,7 +3355,7 @@
     <string name="notification_channel_summary_low" msgid="7753266237705850510">"Gemiddeld belang"</string>
     <string name="notification_channel_summary_default" msgid="7529537115678964164">"Groot belang"</string>
     <string name="notification_channel_summary_high" msgid="8145287829836059819">"Urgent belang"</string>
-    <string name="notification_switch_label" msgid="8127781780859504064">"Meldingen weergeven"</string>
+    <string name="notification_switch_label" msgid="8127781780859504064">"Meldingen tonen"</string>
     <string name="default_notification_assistant" msgid="6526952155788472774">"Meldingsassistent"</string>
     <string name="notifications_sent_daily" msgid="6874886521964822824">"~<xliff:g id="NUMBER">%1$s</xliff:g> per dag"</string>
     <string name="notifications_sent_weekly" msgid="5859675428990259432">"~<xliff:g id="NUMBER">%1$s</xliff:g> per week"</string>
@@ -3418,17 +3418,17 @@
     <string name="notification_toggle_off" msgid="5289843670514922751">"Uit"</string>
     <string name="app_notification_block_title" msgid="7898269373875294367">"Alles blokkeren"</string>
     <string name="app_notification_block_summary" msgid="4502146897785692336">"Deze meldingen nooit weergeven"</string>
-    <string name="notification_content_block_title" msgid="2805138591864484587">"Meldingen weergeven"</string>
-    <string name="notification_content_block_summary" msgid="2743896875255591743">"Nooit meldingen weergeven in het meldingenpaneel of op randapparaten"</string>
+    <string name="notification_content_block_title" msgid="2805138591864484587">"Meldingen tonen"</string>
+    <string name="notification_content_block_summary" msgid="2743896875255591743">"Nooit meldingen tonen in het meldingenpaneel of op randapparaten"</string>
     <string name="notification_badge_title" msgid="8989086619255666442">"Meldingsstipje toestaan"</string>
-    <string name="notification_channel_badge_title" msgid="8228215248332054612">"Meldingsstipje weergeven"</string>
+    <string name="notification_channel_badge_title" msgid="8228215248332054612">"Meldingsstipje tonen"</string>
     <string name="app_notification_override_dnd_title" msgid="1757042206738172601">"\'Niet storen\' negeren"</string>
     <string name="app_notification_override_dnd_summary" msgid="3152957611171210980">"Deze meldingen nog steeds ontvangen, ook wanneer \'Niet storen\' is ingeschakeld"</string>
     <string name="app_notification_visibility_override_title" msgid="2349335170165637672">"Op vergrendelscherm"</string>
     <string name="app_notification_row_banned" msgid="2079325338122151677">"Geblokkeerd"</string>
     <string name="app_notification_row_priority" msgid="432299064888787236">"Prioriteit"</string>
     <string name="app_notification_row_sensitive" msgid="4919671519227722958">"Gevoelig"</string>
-    <string name="app_notifications_dialog_done" msgid="5395611029779655968">"Gereed"</string>
+    <string name="app_notifications_dialog_done" msgid="5395611029779655968">"Klaar"</string>
     <string name="app_notification_importance_title" msgid="1902794400671001142">"Belang"</string>
     <string name="notification_show_lights_title" msgid="5381920725933228542">"Knipperlicht"</string>
     <string name="notification_vibrate_title" msgid="8221718258793835282">"Trillen"</string>
@@ -3544,7 +3544,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="2462898862757904560">"Wijzigen in \'Alleen wekkers\' tot <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="2703276042913200837">"Wijzigen in \'Altijd onderbreken\'"</string>
     <string name="zen_mode_screen_on" msgid="7098470659072167219">"Wanneer het scherm is ingeschakeld"</string>
-    <string name="zen_mode_screen_on_summary" msgid="8275416649295357524">"Meldingen die door \'Niet storen\' zijn gedempt, op het scherm laten weergeven en een pictogram in de statusbalk weergeven"</string>
+    <string name="zen_mode_screen_on_summary" msgid="8275416649295357524">"Meldingen die door \'Niet storen\' zijn gedempt, op het scherm laten weergeven en een icoon in de statusbalk weergeven"</string>
     <string name="zen_mode_screen_off" msgid="84211490206459038">"Wanneer het scherm is uitgeschakeld"</string>
     <string name="zen_mode_screen_off_summary" msgid="8592179073243001267">"Toestaan dat meldingen die op stil zijn gezet door \'Niet storen\', het scherm inschakelen of het meldingslampje laten knipperen"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="7255874108150630145">"Meldingen die op stil zijn gezet door \'Niet storen\', het scherm laten inschakelen"</string>
@@ -3555,7 +3555,7 @@
     <string name="switch_on_text" msgid="7100491749799298324">"Aan"</string>
     <string name="switch_off_text" msgid="3539551289454353555">"Uit"</string>
     <string name="screen_pinning_title" msgid="578020318289781102">"Scherm vastzetten"</string>
-    <string name="screen_pinning_description" msgid="3814537379086412278">"Wanneer deze instelling is ingeschakeld, kun je \'Scherm vastzetten\' gebruiken om het scherm in beeld te houden tot je het losmaakt.\n\nZo zet je je scherm vast:\n\n1. Zorg dat \'Scherm vastzetten\' is ingeschakeld\n\n2. Open \'Overzicht\'\n\n3. Tik op het app-pictogram bovenaan en tik op de speld"</string>
+    <string name="screen_pinning_description" msgid="3814537379086412278">"Als deze instelling is ingeschakeld, kun je \'Scherm vastzetten\' gebruiken om het scherm in beeld te houden tot je het losmaakt.\n\nZo zet je je scherm vast:\n\n1. Zorg dat \'Scherm vastzetten\' is ingeschakeld\n\n2. Open \'Overzicht\'\n\n3. Tik op het app-icoon bovenaan en tik op de speld"</string>
     <string name="screen_pinning_unlock_pattern" msgid="1060334707088339444">"Vraag patroon voor losmaken"</string>
     <string name="screen_pinning_unlock_pin" msgid="1441705536015645023">"Vraag pin voor losmaken"</string>
     <string name="screen_pinning_unlock_password" msgid="1017776884000170841">"Vraag wachtwoord voor losmaken"</string>
@@ -3809,7 +3809,7 @@
     <string name="keywords_system_alert_window" msgid="3936658600272194599">"systeemmelding venster dialoogvenster weergeven over andere apps"</string>
     <string name="overlay_settings" msgid="3325154759946433666">"Weergeven vóór andere apps"</string>
     <string name="system_alert_window_summary" msgid="7703582115861844158">"<xliff:g id="COUNT_0">%1$d</xliff:g> van <xliff:g id="COUNT_1">%2$d</xliff:g> apps mogen worden weergegeven vóór andere apps"</string>
-    <string name="filter_overlay_apps" msgid="6336897660213304743">"Apps met toestemming"</string>
+    <string name="filter_overlay_apps" msgid="6336897660213304743">"Apps met rechten"</string>
     <string name="app_permission_summary_allowed" msgid="6458476982015518778">"Toegestaan"</string>
     <string name="app_permission_summary_not_allowed" msgid="1171642541675462584">"Niet toegestaan"</string>
     <string name="keywords_install_other_apps" msgid="5383559540695847668">"apps installeren via onbekende bronnen"</string>
@@ -3862,7 +3862,7 @@
     <string name="storage_summary_with_sdcard" msgid="8742907204848352697">"Interne opslag: <xliff:g id="PERCENTAGE">%1$s</xliff:g> gebruikt - <xliff:g id="FREE_SPACE">%2$s</xliff:g> vrij"</string>
     <string name="display_summary" msgid="5725269449657325797">"Slaapstand na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inactiviteit"</string>
     <string name="display_dashboard_summary" msgid="7678566148167010682">"Achtergrond, slaapstand, lettergrootte"</string>
-    <string name="display_dashboard_summary_with_style" msgid="8981059474501210956">"Stijlen en achtergronden, slaapstand, tekengrootte"</string>
+    <string name="display_dashboard_summary_with_style" msgid="8981059474501210956">"Stijl en achtergronden, slaapstand, tekengrootte"</string>
     <string name="display_dashboard_nowallpaper_summary" msgid="8612534364908229000">"Slaapstand, lettergrootte"</string>
     <string name="display_summary_example" msgid="4555020581960719296">"Slaapstand na 10 minuten inactiviteit"</string>
     <string name="memory_summary" msgid="9121871336058042600">"Gem. <xliff:g id="USED_MEMORY">%1$s</xliff:g> van <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> geheugen gebruikt"</string>
@@ -4032,7 +4032,7 @@
     <string name="notification_log_details_remoteinput" msgid="739338559646354829">"externe invoer"</string>
     <string name="notification_log_details_content_view" msgid="6690611908715230584">"aangepaste weergave"</string>
     <string name="notification_log_details_extras" msgid="3202948662169885771">"extra\'s"</string>
-    <string name="notification_log_details_icon" msgid="8464763276104577811">"pictogram"</string>
+    <string name="notification_log_details_icon" msgid="8464763276104577811">"icoon"</string>
     <string name="notification_log_details_parcel" msgid="4024970850647594029">"pakketgrootte"</string>
     <string name="notification_log_details_ashmem" msgid="4272241723105041393">"ashmem"</string>
     <string name="notification_log_details_alerted" msgid="1891749888625061319">"waarschuwing voor melding weergegeven"</string>
@@ -4065,7 +4065,7 @@
     <string name="notification_suggestion_title" msgid="3292107671498148560">"Informatie op vergrendelscherm beheren"</string>
     <string name="notification_suggestion_summary" msgid="6516827892359614597">"Content van meldingen weergeven of verbergen"</string>
     <string name="page_tab_title_summary" msgid="4824744863994538006">"Alle"</string>
-    <string name="page_tab_title_support" msgid="5569262185010367870">"Tips en ondersteuning"</string>
+    <string name="page_tab_title_support" msgid="5569262185010367870">"Tips en support"</string>
     <string name="developer_smallest_width" msgid="2603134476228805075">"Kleinste breedte"</string>
     <string name="premium_sms_none" msgid="940723020871007898">"Er zijn geen geïnstalleerde apps die premium sms-toegang hebben aangevraagd"</string>
     <string name="premium_sms_warning" msgid="7604011651486294515">"Premium sms\'jes kunnen je geld kosten en worden toegevoegd aan de facturen van je provider. Als je rechten aan een app verleent, kun je premium sms\'jes verzenden met die app."</string>
@@ -4117,7 +4117,7 @@
     <string name="double_twist_for_camera_mode_title" msgid="2606032140297556018">"Schakelen tussen camera\'s"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="8979914206876018137"></string>
     <string name="double_twist_for_camera_suggestion_title" msgid="5932411386316771246">"Sneller selfies maken"</string>
-    <string name="swipe_up_to_switch_apps_summary" msgid="4644068184114154787">"Veeg omhoog over de startknop om tussen apps te schakelen. Veeg opnieuw omhoog om alle apps te bekijken. Dit werkt vanuit elk scherm. Je hebt aan de rechterkant van het scherm geen knop Overzicht meer."</string>
+    <string name="swipe_up_to_switch_apps_summary" msgid="4644068184114154787">"Swipe omhoog over de startknop om tussen apps te schakelen. Swipe opnieuw omhoog om alle apps te bekijken. Dit werkt vanuit elk scherm. Je hebt aan de rechterkant van het scherm geen knop Overzicht meer."</string>
     <string name="swipe_up_to_switch_apps_suggestion_title" msgid="7641846365137536128">"Probeer de nieuwe startknop"</string>
     <string name="swipe_up_to_switch_apps_suggestion_summary" msgid="7338653224520387852">"Schakel het nieuwe gebaar in om tussen apps te schakelen"</string>
     <string name="ambient_display_title" product="default" msgid="6785677099744344088">"Dubbeltikken om telefoon te checken"</string>
@@ -4135,11 +4135,11 @@
     <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>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="3676002930672489760">"Over vingerafdruksensor vegen voor meldingen"</string>
-    <string name="fingerprint_gesture_screen_title" msgid="8638932855807473479">"Over sensor vegen"</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="4347999905190477310">"Als je je meldingen wilt bekijken, veeg je omlaag over de vingerafdruksensor achter op je telefoon."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="3480057984564476283">"Als je je meldingen wilt bekijken, veeg je omlaag over de vingerafdruksensor achter op je tablet."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="7950264130913070035">"Als je je meldingen wilt bekijken, veeg je omlaag over de vingerafdruksensor achter op je apparaat."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="3676002930672489760">"Over vingerafdruksensor swipen voor meldingen"</string>
+    <string name="fingerprint_gesture_screen_title" msgid="8638932855807473479">"Over sensor swipen"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="4347999905190477310">"Als je je meldingen wilt bekijken, swipe je omlaag over de vingerafdruksensor achter op je telefoon."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="3480057984564476283">"Als je je meldingen wilt bekijken, swipe je omlaag over de vingerafdruksensor achter op je tablet."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="7950264130913070035">"Als je je meldingen wilt bekijken, swipe je omlaag over de vingerafdruksensor achter op je apparaat."</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="948946491233738823">"Snel meldingen bekijken"</string>
     <string name="gesture_setting_on" msgid="7573680730101327866">"Aan"</string>
     <string name="gesture_setting_off" msgid="2540159841716890511">"Uit"</string>
@@ -4251,15 +4251,15 @@
     <string name="app_info_storage_title" msgid="6643391804949509308">"Gebruikte ruimte"</string>
     <string name="webview_uninstalled_for_user" msgid="3407952144444040557">"(verwijderd voor gebruiker <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="8057805373224993504">"(uitgezet voor gebruiker <xliff:g id="USER">%s</xliff:g>)"</string>
-    <string name="autofill_app" msgid="3990765434980280073">"Service voor automatisch aanvullen"</string>
+    <string name="autofill_app" msgid="3990765434980280073">"Service voor automatisch invullen"</string>
     <string name="autofill_keywords" msgid="7717726766232862218">"auto, automatisch, invullen, aanvullen"</string>
     <string name="autofill_confirmation_message" msgid="1385894598730361304">"&lt;b&gt;Zorg dat je deze app vertrouwt&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; maakt gebruik van de content op je scherm om te bepalen wat automatisch kan worden aangevuld."</string>
-    <string name="debug_autofill_category" msgid="6262526615416295645">"Automatisch aanvullen"</string>
+    <string name="debug_autofill_category" msgid="6262526615416295645">"Automatisch invullen"</string>
     <string name="autofill_logging_level_title" msgid="2577340324541102626">"Logniveau"</string>
     <string name="autofill_max_partitions" msgid="125269645910590057">"Max. aantal verzoeken per sessie"</string>
     <string name="autofill_max_visible_datasets" msgid="2791081640248423492">"Max. zichtbare gegevenssets"</string>
     <string name="autofill_reset_developer_options" msgid="7208417230269613101">"Resetten naar standaardwaarden"</string>
-    <string name="autofill_reset_developer_options_complete" msgid="5686061993002179524">"Ontwikkelaarsopties voor automatisch aanvullen zijn gereset"</string>
+    <string name="autofill_reset_developer_options_complete" msgid="5686061993002179524">"Ontwikkelaarsopties voor automatisch invullen zijn gereset"</string>
     <string name="device_theme" msgid="8992291311481135893">"Apparaatthema"</string>
     <string name="default_theme" msgid="5986996377385956138">"Standaard"</string>
     <string name="show_operator_name_title" msgid="5056163028128447308">"Netwerknaam"</string>
diff --git a/tests/CarDeveloperOptions/res/values-or/strings.xml b/tests/CarDeveloperOptions/res/values-or/strings.xml
index f03cb53..f60b1ac 100644
--- a/tests/CarDeveloperOptions/res/values-or/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-or/strings.xml
@@ -20,7 +20,7 @@
     <string name="no" msgid="4709057267400907161">"ନାହିଁ"</string>
     <string name="create" msgid="5131953868544187847">"ତିଆରି କରନ୍ତୁ"</string>
     <string name="allow" msgid="128867119174713893">"ଅନୁମତି"</string>
-    <string name="deny" msgid="3998166389989144025">"ପ୍ରତ୍ୟାଖ୍ୟାନ"</string>
+    <string name="deny" msgid="3998166389989144025">"ଅଗ୍ରାହ୍ୟ କରନ୍ତୁ"</string>
     <string name="device_info_default" msgid="1548919563979154348">"ଅଜଣା"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="3953785659137161981">
       <item quantity="other">ଜଣେ ଡେଭଲପର୍ ହେବାରେ ଆପଣ ବର୍ତ୍ତମାନ <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ଟି ପଦାଙ୍କ ଦୂରରେ ଅଛନ୍ତି।</item>
@@ -263,7 +263,7 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="67933353112027726">"ମିଡିଆ ପାଇଁ SD କାର୍ଡ ସ୍କାନ୍‌ ହେଉଛି…"</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="7959964366461613091">"ମାଉଣ୍ଟ କରାଯାଇଥିବା SD କାର୍ଡରୁ କେବଳ ପଢ଼ିବା ସମ୍ଭବ।"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="8854112253788893415">"ମାଉଣ୍ଟ କରାଯାଇଥିବା SD କାର୍ଡରୁ କେବଳ ପଢ଼ିବା ସମ୍ଭବ।"</string>
-    <string name="skip_label" msgid="8067961347551157478">"ଛାଡ଼ି ଦିଅନ୍ତୁ"</string>
+    <string name="skip_label" msgid="8067961347551157478">"ବାଦ୍ ଦିଅନ୍ତୁ"</string>
     <string name="next_label" msgid="4710056309804362410">"ପରବର୍ତ୍ତୀ"</string>
     <string name="language_picker_title" msgid="7807759931261107686">"ଭାଷାଗୁଡିକ"</string>
     <string name="locale_remove_menu" msgid="3395565699934985486">"ବାହାର କରନ୍ତୁ"</string>
@@ -289,7 +289,7 @@
     <string name="sd_card_settings_label" product="nosdcard" msgid="3433188145440984933">"USB ଷ୍ଟୋରେଜ୍‌"</string>
     <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="cancel" msgid="2582602392048772404">"ବାତିଲ୍"</string>
     <string name="okay" msgid="5838476766924989056">"ଠିକ୍‌ ଅଛି"</string>
     <string name="forget" msgid="7735525146062672874">"ଭୁଲିଯାଆନ୍ତୁ"</string>
     <string name="save" msgid="3418211178410498517">"ସେଭ୍‌ କରନ୍ତୁ"</string>
@@ -442,9 +442,9 @@
     <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ଧ୍ୟାନଦିଅନ୍ତୁ: ଜଟିଳ ପାଟର୍ନ କିମ୍ୱା ପିନ୍‌ ତୁଳନାରେ ଆପଣଙ୍କର ଆଙ୍ଗୁଠି ଚିହ୍ନ କମ୍ ସୁରକ୍ଷିତ ହୋଇପାରେ।"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="9168637333731599827">"କ୍ୟାନ୍ସଲ୍‌"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="9168637333731599827">"ବାତିଲ୍"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="271662150372486535">"ଜାରି ରଖ"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="756928427429893070">"ଛାଡିଦିଅନ୍ତୁ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="756928427429893070">"ବାଦ୍ ଦିଅନ୍ତୁ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="4125977169169671144">"ପରବର୍ତ୍ତୀ"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="763018850721691594">"ଆଙ୍ଗୁଠି ଚିହ୍ନ ସେଟ୍‌ଅପ୍‌ କରିବାର ପଦକ୍ଷେପଟି ଏଡ଼ାଇ ଯିବେ?"</string>
     <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="8849928362049018680">"ଟିପଚିହ୍ନ ସେଟଅପ୍‌ କେବଳ ଏକ ମିନିଟ୍ କିମ୍ବା ଦୁଇ ମିନିଟ୍‌ ସମୟ ନିଏ। ଯଦି ଆପଣ ଏହାକୁ ବାଦ୍ ଦିଅନ୍ତି, ଆପଣ ପରେ ସେଟିଂସରେ ନିଜର ଟିପଚିହ୍ନ ଯୋଗ କରିପାରିବେ।"</string>
@@ -705,10 +705,10 @@
     <string name="lockpassword_password_blacklisted_by_admin" msgid="4988166770148440755">"ଆପଣଙ୍କର ଆଇଟି ଆଡ୍‌ମିନ୍‌ ଦ୍ୱାରା ସାଧାରଣ ପାସ୍‌ୱର୍ଡଗୁଡ଼ିକୁ ରୋକିଦିଆଯାଇଛି। ଏକ ଭିନ୍ନ ପାସ୍‌ୱର୍ଡ ଦିଅନ୍ତୁ।"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="3902387296149848324">"ସଂଖ୍ୟାର କ୍ରମବୃଦ୍ଧି, କ୍ରମହ୍ରାସ, କିମ୍ବା ପୁନରାବୃତ୍ତ କ୍ରମ ଅନୁମୋଦିତ ନୁହେଁ"</string>
     <string name="lockpassword_confirm_label" msgid="1512364313516715624">"ନିଶ୍ଚିତ"</string>
-    <string name="lockpassword_cancel_label" msgid="3799907375604482766">"କ୍ୟାନ୍ସଲ୍‌ କରନ୍ତୁ"</string>
+    <string name="lockpassword_cancel_label" msgid="3799907375604482766">"ବାତିଲ୍ କରନ୍ତୁ"</string>
     <string name="lockpassword_clear_label" msgid="3201458533657963554">"ଖାଲି କରନ୍ତୁ"</string>
     <string name="lockpassword_credential_changed" msgid="5183961439209866170">"ପୂର୍ବରୁ ସ୍କ୍ରିନ୍‍ ଲକ୍‌ ପରିବର୍ତ୍ତନ କରାଯାଇଥିଲା। ନୂତନ ସ୍କ୍ରିନ୍ ଲକ୍‌କୁ ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
-    <string name="lockpattern_tutorial_cancel_label" msgid="450401426127674369">"କ୍ୟାନ୍ସଲ୍‌"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="450401426127674369">"ବାତିଲ୍"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="8474690922559443018">"ଆଗକୁ"</string>
     <string name="lock_setup" msgid="8710689848703935088">"ସେଟଅପ୍‌ ସମ୍ପୂର୍ଣ୍ଣ।"</string>
     <string name="manage_device_admin" msgid="322047441168191695">"ଡିଭାଇସ୍‌ ଆଡମିନ୍‌ ଆପ୍‌"</string>
@@ -1009,7 +1009,7 @@
     <string name="wifi_failed_forget_message" msgid="2581434074764127531">"ନେଟ୍‌ୱର୍କ ଭୁଲିଯିବାରେ ବିଫଳ ହେଲା"</string>
     <string name="wifi_save" msgid="4658298322696587492">"ସେଭ୍‍ କରନ୍ତୁ"</string>
     <string name="wifi_failed_save_message" msgid="5068789092841891367">"ନେଟୱାର୍କ୍‌ ସେଭ୍‌ କରି ପାରିଲା ନାହିଁ"</string>
-    <string name="wifi_cancel" msgid="7618417075930426635">"କ୍ୟାନ୍ସଲ୍‌"</string>
+    <string name="wifi_cancel" msgid="7618417075930426635">"ବାତିଲ୍"</string>
     <string name="wifi_forget_dialog_title" msgid="1757468516279704915">"ନେଟୱର୍କକୁ ଭୁଲିଯିବେ?"</string>
     <string name="wifi_forget_dialog_message" msgid="7899220710587511375">"ଏହି ନେଟ୍‌ୱର୍କ ପାଇଁ ଥିବା ସବୁ ପାସ୍‌ୱର୍ଡକୁ ଡିଲିଟ୍ କରିଦିଆଯିବ"</string>
     <plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6199295921035663421">
@@ -1031,7 +1031,7 @@
     <string name="wifi_advanced_settings_label" msgid="9147669851658738784">"IP ସେଟିଂସ୍"</string>
     <string name="wifi_advanced_not_available" msgid="5751084989400195009">"ଏହି ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ପାଇଁ ୱାଇ-ଫାଇ ଉନ୍ନତ ସେଟିଙ୍ଗ ଉପଲବ୍ଧ ନାହିଁ"</string>
     <string name="wifi_ip_settings_menu_save" msgid="6557330818360425933">"ସେଭ୍‌ କରନ୍ତୁ"</string>
-    <string name="wifi_ip_settings_menu_cancel" msgid="8098696509412462494">"କ୍ୟାନ୍ସଲ୍‌ କରନ୍ତୁ"</string>
+    <string name="wifi_ip_settings_menu_cancel" msgid="8098696509412462494">"ବାତିଲ୍‌ କରନ୍ତୁ"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="7764507690387286292">"ଏକ ବୈଧ IP ଠିକଣା ଟାଇପ୍‌ କରନ୍ତୁ"</string>
     <string name="wifi_ip_settings_invalid_gateway" msgid="7602732367437862422">"ଏକ ମାନ୍ୟ ଗେଟ୍‌ୱେ ଠିକଣା ଟାଇପ୍‌ କରନ୍ତୁ"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="4471473055625376300">"ଏକ ବୈଧ DNS ଠିକଣା ଟାଇପ୍‌ କରନ୍ତୁ।"</string>
@@ -1053,7 +1053,7 @@
     <string name="wifi_p2p_disconnect_title" msgid="915880461655863812">"ବିଚ୍ଛିନ୍ନ କରିବେ?"</string>
     <string name="wifi_p2p_disconnect_message" msgid="3745286932812740784">"ଯଦି ଆପଣ ବିଚ୍ଛିନ୍ନ କରନ୍ତି, <xliff:g id="PEER_NAME">%1$s</xliff:g> ସହ ଆପଣଙ୍କ ସଂଯୋଗ ଶେଷ ହୋଇଯିବ।"</string>
     <string name="wifi_p2p_disconnect_multiple_message" msgid="6051173422663731688">"ଯଦି ଆପଣ ବିଚ୍ଛିନ୍ନ କରନ୍ତି, <xliff:g id="PEER_NAME">%1$s</xliff:g> ଏବଂ <xliff:g id="PEER_COUNT">%2$s</xliff:g> ଟି ଅନ୍ୟ ଡିଭାଇସ୍‌ ସହ ଆପଣଙ୍କ ସଂଯୋଜନା ଶେଷ ହେବ।"</string>
-    <string name="wifi_p2p_cancel_connect_title" msgid="2465200999145769427">"ନିମନ୍ତ୍ରଣକୁ କ୍ୟାନ୍ସଲ୍‌ କରିବେ?"</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="2465200999145769427">"ନିମନ୍ତ୍ରଣକୁ ବାତିଲ୍‌ କରିବେ?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="3752679335020392154">"<xliff:g id="PEER_NAME">%1$s</xliff:g> ସହ ସଂଯୋଗ କରିବାକୁ ନିମନ୍ତ୍ରଣକୁ ଆପଣ ବାତିଲ୍‌ କରିବାକୁ ଚାହାଁନ୍ତି କି?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="3206660449067701089">"ଏହି ଗ୍ରୁପ୍‌କୁ ଭୁଲିଯିବେ?"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="12062341344410520">"ୱାଇ-ଫାଇ ହଟସ୍ପଟ୍‌"</string>
@@ -1125,7 +1125,7 @@
     <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="notification_sound_title" msgid="6812164482799723931">"ପୂର୍ବ-ନିର୍ଦ୍ଧାରିତ ବିଜ୍ଞପ୍ତିର ଶବ୍ଦ"</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>
     <string name="checkbox_notification_same_as_incoming_call" msgid="7312942422655861175">"ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ପାଇଁ ଇନ୍‌କମିଙ୍ଗ କଲ୍‌ ଭଲ୍ୟୁମ୍‌କୁ ବ୍ୟବହାର କର"</string>
@@ -1168,7 +1168,7 @@
     <string name="accessibility_category_personal" msgid="1423427301759058762">"ବ୍ୟକ୍ତିଗତ ପ୍ରୋଫାଇଲ୍‌ ଆକାଉଣ୍ଟ"</string>
     <string name="accessibility_work_account_title" msgid="3195468574776888011">"କାର୍ଯ୍ୟ ଆକାଉଣ୍ଟ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_personal_account_title" msgid="7251761883688839354">"ବ୍ୟକ୍ତିଗତ ଆକାଉଣ୍ଟ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
-    <string name="search_settings" msgid="5809250790214921377">"ସନ୍ଧାନ"</string>
+    <string name="search_settings" msgid="5809250790214921377">"Search"</string>
     <string name="display_settings" msgid="1045535829232307190">"ଡିସ୍‌ପ୍ଲେ"</string>
     <string name="accelerometer_title" msgid="2427487734964971453">"ଅଟୋ-ରୋଟେଟ୍‌ ସ୍କ୍ରିନ୍"</string>
     <string name="color_mode_title" msgid="8164858320869449142">"ରଙ୍ଗ"</string>
@@ -1293,7 +1293,7 @@
     <string name="sim_pin_disable_failed" msgid="6780973900290546751">"PIN ଅକ୍ଷମ କରିହେବ ନାହିଁ।"</string>
     <string name="sim_pin_enable_failed" msgid="804897359922298792">"PIN ସକ୍ଷମ କରିହେବ ନାହିଁ।"</string>
     <string name="sim_enter_ok" msgid="5103626479976731229">"ଠିକ ଅଛି"</string>
-    <string name="sim_enter_cancel" msgid="2806801210236824592">"କ୍ୟାନ୍ସଲ୍‌ କରନ୍ତୁ"</string>
+    <string name="sim_enter_cancel" msgid="2806801210236824592">"ବାତିଲ୍‌ କରନ୍ତୁ"</string>
     <string name="sim_multi_sims_title" msgid="8816212852512189781">"ଏକାଧିକ ସିମ୍‌ ମିଳିଛି"</string>
     <string name="sim_multi_sims_summary" msgid="8237021982527032257">"ମୋବାଇଲ୍‌ ଡାଟା ପାଇଁ ନିଜ ପସନ୍ଦର SIM ବାଛନ୍ତୁ।"</string>
     <string name="sim_change_data_title" msgid="2512227368681250054">"ମୋବାଇଲ୍ ଡାଟା ପାଇଁ <xliff:g id="CARRIER">%1$s</xliff:g> ବ୍ୟବହାର କରିବେ?"</string>
@@ -1450,7 +1450,7 @@
     <string name="storage_internal_forget_confirm_title" msgid="331032276130605241">"<xliff:g id="NAME">^1</xliff:g> କୁ ଭୁଲିଯିବେ?"</string>
     <string name="storage_internal_forget_confirm" msgid="3052483375203727176">"ଏହି <xliff:g id="NAME">^1</xliff:g> ରେ ଷ୍ଟୋର୍‌ ହୋଇଥିବା ସମସ୍ତ ଆପସ, ଫଟୋଗୁଡିକ, ତଥା ଡାଟା ସବୁ ସମୟ ପାଇଁ ବାହାରିଯିବ।"</string>
     <string name="storage_detail_apps" msgid="8154648512504196820">"ଆପ୍‌‍"</string>
-    <string name="storage_detail_images" msgid="6996202225684468964">"ଇମେଜ୍‌"</string>
+    <string name="storage_detail_images" msgid="6996202225684468964">"Images"</string>
     <string name="storage_detail_videos" msgid="6030983354721080849">"ଭିଡିଓ"</string>
     <string name="storage_detail_audio" msgid="6011098436589663944">"ଅଡିଓ"</string>
     <string name="storage_detail_cached" msgid="5761648455067920683">"କ୍ୟାଶ୍‍ ହୋଇଥିବା ଡାଟା"</string>
@@ -1489,7 +1489,7 @@
     <string name="storage_wizard_move_unlock" msgid="7978193904519827600">"ଡାଟା ନେବାକୁ ଆପଣଙ୍କୁ ଉପଯୋଗକର୍ତ୍ତା <xliff:g id="APP">^1</xliff:g> ଅନଲକ୍‌ କରିବା ଆବଶ୍ୟକ।"</string>
     <string name="storage_wizard_move_progress_title" msgid="5250929161803336592">"<xliff:g id="APP">^1</xliff:g> ଚଳାଉଛି…"</string>
     <string name="storage_wizard_move_progress_body" msgid="1713792142250410169">"ଘୁଞ୍ଚାଇବାବେଳେ <xliff:g id="NAME">^1</xliff:g>କୁ କାଢ଼ନ୍ତୁ ନାହିଁ। \n\nଏହି ଡିଭାଇସ୍‌ରେ ଥିବା <xliff:g id="APP">^2</xliff:g> ଆପ୍‌, ଏହି କାର୍ଯ୍ୟ ନସରିବା ପର୍ଯ୍ୟନ୍ତ କାମ କରିବ ନାହିଁ।"</string>
-    <string name="storage_wizard_move_progress_cancel" msgid="9047521329704060401">"ଘୁଞ୍ଚାଇବା କ୍ୟାନ୍ସଲ୍‌ କରନ୍ତୁ"</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="9047521329704060401">"ମୁଭ୍ ବାତିଲ୍ କରନ୍ତୁ"</string>
     <string name="storage_wizard_slow_body" msgid="2307974936036261069">"ଏହି <xliff:g id="NAME_0">^1</xliff:g> ଧୀର ଥିବା ପରି ଜଣାପଡୁଛି। \n\nଆପଣ ଜାରିରଖିପାରିବେ, କିନ୍ତୁ ଏହି ଅବସ୍ଥାନକୁ ଚଳାଯାଇଥିବା ଆପ୍‌ଗୁଡ଼ିକ ରହି ରହି ଚାଲିପାରେ ଏବଂ ଡାଟା ସ୍ଥାନାନ୍ତର ବହୁତ ସମୟ ନେଇପାରେ। \n\nଉନ୍ନତ କାର୍ଯ୍ୟଦକ୍ଷତା ପାଇଁ ଏକ ଦ୍ରୁତତ୍ତମ <xliff:g id="NAME_1">^1</xliff:g> ପାଇଁ ବିବେଚନା କରନ୍ତୁ।"</string>
     <string name="storage_wizard_init_v2_title" msgid="7408910177547901960">"ଆପଣ କିପରି ଏହି <xliff:g id="NAME">^1</xliff:g>କୁ ବ୍ୟବହାର କରିବେ?"</string>
     <string name="storage_wizard_init_v2_internal_title" product="tablet" msgid="7948795312504302810">"ଅତିରିକ୍ତ ଟାବଲେଟ୍ ଷ୍ଟୋରେଜ୍ ପାଇଁ ବ୍ୟବହାର କରନ୍ତୁ"</string>
@@ -1615,7 +1615,7 @@
     <string name="tether_settings_title_bluetooth" msgid="1999590158102569959">"ବ୍ଲୁଟୁଥ ଟିଥରିଂ"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="1159128764162788159">"ଟିଥରିଂ"</string>
     <string name="tether_settings_title_all" msgid="6935843543433954181">"ହଟସ୍ପଟ୍‌ ଓ ଟିଥରିଂ"</string>
-    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="1289593649526514499">"Hotspot ଅନ୍‌ ଅଛି, ଟିଥର୍‌ କରୁଛି"</string>
+    <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>
@@ -1890,7 +1890,7 @@
     <string name="app_disable_dlg_positive" msgid="5508828271100168073">"ଆପ୍‌ ଅକ୍ଷମ କରନ୍ତୁ"</string>
     <string name="app_disable_dlg_text" msgid="9221864774943530281">"ଯଦି ଆପଣ ଏହି ଆପ୍‌କୁ ନିଷ୍କ୍ରିୟ କରନ୍ତି, ତେବେ Android ଓ ଅନ୍ୟାନ୍ୟ ଆପ୍ସ ଆଉ କାମ ନକରିପାରେ। ମନେ ରଖନ୍ତୁ, ଯେହେତୁ ଏହା ଆପଣଙ୍କ ଡିଭାଇସ୍‌ରେ ପୂର୍ବରୁ-ଇନ୍‌ଷ୍ଟଲ୍ ଅଛି, ତେଣୁ ଆପଣ ଏହି ଆପ୍‌କୁ ଡିଲିଟ୍ କରିପାରିବେ ନାହିଁ। ଏହାକୁ ଅକ୍ଷମ କରି, ଏହି ଆପ୍‌କୁ ଆପଣ ବନ୍ଦ କରିବେ ଏବଂ ଆପଣଙ୍କର ଡିଭାଇସ୍‌ରେ ଲୁଚାଇବେ।"</string>
     <string name="app_disable_notifications_dlg_title" msgid="699530661413553928">"ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ବନ୍ଦ କରିବେ?"</string>
-    <string name="app_install_details_group_title" msgid="2909597319422976921">"ଷ୍ଟୋର୍‌"</string>
+    <string name="app_install_details_group_title" msgid="2909597319422976921">"Store"</string>
     <string name="app_install_details_title" msgid="6954953384372934881">"ଆପ୍‌ ବିବରଣୀ"</string>
     <string name="app_install_details_summary" msgid="6612222941121363940">"<xliff:g id="APP_STORE">%1$s</xliff:g> ରୁ ଇନ୍‍‌ଷ୍ଟଲ୍‌ ହୋଇଥିବା ଆପ୍"</string>
     <string name="instant_app_details_summary" msgid="6384264315914966114">"<xliff:g id="APP_STORE">%1$s</xliff:g> ଉପରେ ଅଧିକ ସୂଚନା"</string>
@@ -2211,13 +2211,13 @@
     <string name="print_feature_state_off" msgid="208580346723223688">"ଅଫ୍"</string>
     <string name="print_menu_item_add_service" msgid="6803000110578493782">"ସେବା ଯୋଡ଼ନ୍ତୁ"</string>
     <string name="print_menu_item_add_printer" msgid="8529196211179574921">"ପ୍ରିଣ୍ଟର୍‌ ଯୋଡ଼ନ୍ତୁ"</string>
-    <string name="print_menu_item_search" msgid="1165316329772287360">"ସର୍ଚ୍ଚ"</string>
+    <string name="print_menu_item_search" msgid="1165316329772287360">"Search"</string>
     <string name="print_searching_for_printers" msgid="6538687129687642542">"ପ୍ରିଣ୍ଟର୍‌ ଖୋଜୁଛି"</string>
     <string name="print_service_disabled" msgid="6376344992705893436">"ସେବା ବନ୍ଦ ଅଛି"</string>
     <string name="print_print_jobs" msgid="7357841034181762157">"ପ୍ରିଣ୍ଟ ଜବ୍‌"</string>
     <string name="print_print_job" msgid="6846889971435170443">"ପ୍ରିଣ୍ଟ ଜବ୍‌"</string>
     <string name="print_restart" msgid="4090462480288441779">"ପୁଣି ଆରମ୍ଭ କରନ୍ତୁ"</string>
-    <string name="print_cancel" msgid="4567831028966698753">"କ୍ୟାନ୍ସଲ୍‌"</string>
+    <string name="print_cancel" msgid="4567831028966698753">"ବାତିଲ୍"</string>
     <string name="print_job_summary" msgid="438156926959424058">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="print_configuring_state_title_template" msgid="5052801061241050737">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> କନଫିଗର୍‌ କରାଯାଉଛି"</string>
     <string name="print_printing_state_title_template" msgid="8796814912920963803">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> ପ୍ରିଣ୍ଟ ହେଉଛି"</string>
@@ -2316,7 +2316,7 @@
     <string name="battery_tip_unrestrict_app_dialog_title" msgid="812458516399125710">"ପ୍ରତିବନ୍ଧକ ହଟାଇ ଦେବେ?"</string>
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="8120081438825031335">"ଏହି ଆପ୍‌ ବ୍ୟାକ୍‌ଗ୍ରାଉଣ୍ଡରେ ବ୍ୟାଟେରୀ ବ୍ୟବହାର କରି ପାରିବ। ଆପଣଙ୍କ ବ୍ୟାଟେରୀ ଅନୁମାନ କରିଥିବା ସମୟର ପୂର୍ବରୁହିଁ ସରିଯାଇପାରେ।"</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="9154938931448151479">"କାଢ଼ିଦିଅନ୍ତୁ"</string>
-    <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="7331148618292397166">"କ୍ୟାନ୍ସଲ୍"</string>
+    <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="7331148618292397166">"ବାତିଲ୍"</string>
     <string name="battery_tip_dialog_summary_message" product="default" msgid="7244950433272770280">"ଆପଣଙ୍କର ଆପ୍ସ ସାଧାରଣ ଭାବେ ବ୍ୟାଟେରୀ ଖର୍ଚ୍ଚ କରୁଛି। ଯଦି ଆପ୍ସ ଅଧିକ ବ୍ୟାଟେରୀ ଖର୍ଚ୍ଚ କରେ, ତେବେ ଆପଣଙ୍କ ଫୋନ୍ ପଦକ୍ଷେପ ନେବା ପାଇଁ ଆପଣଙ୍କୁ ପରାମର୍ଶ ଦେବ। \n\n ବ୍ୟାଟେରୀ ଅଧିକ ଖର୍ଚ୍ଚ ହେଉଥିଲେ ଆପଣ ସର୍ବଦା ବ୍ୟାଟେରୀ ସେଭର୍‌କୁ ଚାଲୁ କରିପାରିବେ।"</string>
     <string name="battery_tip_dialog_summary_message" product="tablet" msgid="1721081030632329647">"ଆପଣଙ୍କର ଆପ୍ ସାଧାରଣ ଭାବେ ବ୍ୟାଟେରୀ ଖର୍ଚ୍ଚ କରୁଛି। ଯଦି ଆପ୍ ଅଧିକ ବ୍ୟାଟେରୀ ଖର୍ଚ୍ଚ କରନ୍ତି, ତେବେ ଆପଣଙ୍କ ଟାବଲେଟ୍ ପଦକ୍ଷେପ ନେବା ପାଇଁ ଆପଣଙ୍କୁ ପରାମର୍ଶ ଦେବ। \n\n ବ୍ୟାଟେରୀ ଅଧିକ ଖର୍ଚ୍ଚ ହେଉଥିଲେ ଆପଣ ସର୍ବଦା ବ୍ୟାଟେରୀ ସେଭର୍‌କୁ ଚାଲୁ କରିପାରିବେ।"</string>
     <string name="battery_tip_dialog_summary_message" product="device" msgid="146872407040848465">"ଆପଣଙ୍କର ଆପ୍ ସାଧାରଣ ଭାବେ ବ୍ୟାଟେରୀ ଖର୍ଚ୍ଚ କରୁଛି। ଯଦି ଆପ୍ ଅଧିକ ବ୍ୟାଟେରୀ ଖର୍ଚ୍ଚ କରନ୍ତି, ତେବେ ଡିଭାଇସ୍ ପଦକ୍ଷେପ ନେବା ପାଇଁ ଆପଣଙ୍କୁ ପରାମର୍ଶ ଦେବ। \n\n ବ୍ୟାଟେରୀ ଅଧିକ ଖର୍ଚ୍ଚ ହେଉଥିଲେ ଆପଣ ସର୍ବଦା ବ୍ୟାଟେରୀ ସେଭର୍‌କୁ ଚାଲୁ କରିପାରିବେ।"</string>
@@ -2518,7 +2518,7 @@
     <string name="tts_install_voices_title" msgid="363811937643579286">"Voices ଇନ୍‌ଷ୍ଟଲ୍‍ କରନ୍ତୁ"</string>
     <string name="tts_install_voices_text" msgid="7464832428439739995">"ଭଏସ୍‌ ଇନ୍‌ଷ୍ଟଲ୍‌ କରିବାକୁ <xliff:g id="TTS_APP_NAME">%s</xliff:g> ଆପ୍‌ ଜାରି ରଖନ୍ତୁ"</string>
     <string name="tts_install_voices_open" msgid="686776451008134790">"ଆପ୍‌ ଖୋଲନ୍ତୁ"</string>
-    <string name="tts_install_voices_cancel" msgid="1622512922523479646">"କ୍ୟାନ୍ସଲ୍‌"</string>
+    <string name="tts_install_voices_cancel" msgid="1622512922523479646">"ବାତିଲ୍"</string>
     <string name="tts_reset" msgid="8864073594540705579">"ରିସେଟ୍‌ କରନ୍ତୁ"</string>
     <string name="tts_play" msgid="9023430029380675514">"ଚଲାନ୍ତୁ"</string>
     <string name="vpn_settings_title" msgid="7008219502396889192">"VPN"</string>
@@ -2615,7 +2615,7 @@
     <string name="settings_backup" msgid="3261579634252074247">"ବ୍ୟାକ୍‌ଅପ୍‌ ସେଟିଙ୍ଗ୍‌"</string>
     <string name="settings_backup_summary" msgid="2563360505501354777">"ମୋ ସେଟିଙ୍ଗଗୁଡ଼ିକର ବ୍ୟାକ୍‌ଅପ୍‌ ନିଅ"</string>
     <string name="sync_menu_sync_now" msgid="3840755364554567507">"ବର୍ତ୍ତମାନ ସିଙ୍କ କରନ୍ତୁ"</string>
-    <string name="sync_menu_sync_cancel" msgid="5111231351104284704">"ସିଙ୍କ୍‌ କ୍ୟାନ୍ସଲ୍‌‌ କରନ୍ତୁ"</string>
+    <string name="sync_menu_sync_cancel" msgid="5111231351104284704">"ସିଙ୍କ୍‌ ବାତିଲ୍ କରନ୍ତୁ"</string>
     <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>
@@ -2764,7 +2764,7 @@
     <string name="vpn_always_on_invalid_reason_no_dns" msgid="3814114757059738225">"ସର୍ବଦା-ଅନ୍‌ VPN ପାଇଁ ଏକ DNS ସର୍ଭର ଉଲ୍ଲେଖ କରିବା ଜରୁରୀ"</string>
     <string name="vpn_always_on_invalid_reason_dns" msgid="501388894176868973">"ସର୍ବଦା ଚାଲୁଥିବା VPN ପାଇଁ DNS ସର୍ଭର୍ ଠିକଣା ସଂଖ୍ୟା ବିଶିଷ୍ଟ ହୋଇଥିବା ଦରକାର"</string>
     <string name="vpn_always_on_invalid_reason_other" msgid="8504512156730364447">"ଏଣ୍ଟର୍‌ କରାଯାଇଥିବା ସୂଚନା ସର୍ବଦା-ଅନ୍‌ VPNକୁ ସପୋର୍ଟ କରେ ନାହିଁ"</string>
-    <string name="vpn_cancel" msgid="440645172381062337">"କ୍ୟାନ୍ସଲ୍‌ କରନ୍ତୁ"</string>
+    <string name="vpn_cancel" msgid="440645172381062337">"ବାତିଲ୍ କରନ୍ତୁ"</string>
     <string name="vpn_done" msgid="6314426362224527349">"ସମାପ୍ତ"</string>
     <string name="vpn_save" msgid="1332625259182278316">"ସେଭ୍‌ କରନ୍ତୁ"</string>
     <string name="vpn_connect" msgid="772295154834334710">"ସଂଯୋଗ କରନ୍ତୁ"</string>
@@ -3141,7 +3141,7 @@
     <string name="ring_volume_option_title" msgid="2038924918468372264">"ରିଙ୍ଗ ଭଲ୍ୟୁମ୍‌"</string>
     <string name="notification_volume_option_title" msgid="1358512611511348260">"ସୂଚନା ଭଲ୍ୟୁମ"</string>
     <string name="ringtone_title" msgid="1409086028485922583">"ଫୋନ୍‌ ରିଙ୍ଗଟୋନ୍‌"</string>
-    <string name="notification_ringtone_title" msgid="2932960620843976285">"ଡିଫଲ୍ଟ୍ ବିଜ୍ଞପ୍ତି ଶବ୍ଦ"</string>
+    <string name="notification_ringtone_title" msgid="2932960620843976285">"ଡିଫଲ୍ଟ ବିଜ୍ଞପ୍ତି ସାଉଣ୍ଡ"</string>
     <string name="notification_unknown_sound_title" msgid="8043718667804838398">"ଆପ୍‌ ଦ୍ୱାରା ପ୍ରଦତ୍ତ ଶବ୍ଦ"</string>
     <string name="notification_sound_default" msgid="2664544380802426260">"ଡିଫଲ୍ଟ ବିଜ୍ଞପ୍ତି ସାଉଣ୍ଡ"</string>
     <string name="alarm_ringtone_title" msgid="6411326147408635902">"ଡିଫଲ୍ଟ ଆଲାର୍ମ ସାଉଣ୍ଡ"</string>
@@ -3280,12 +3280,12 @@
     <string name="zen_onboarding_new_setting_summary" msgid="8264430315983860075">"ଆପଣ ବିଜ୍ଞପ୍ତିକୁ ଦେଖି କିମ୍ବା ଶୁଣିପାରିବେ ନାହିଁ। ତାରାଙ୍କିତ ଯୋଗାଯୋଗରୁ ଆସିଥିବା କଲ୍ ଏବଂ ପୁଣି କଲ୍ କରୁଥିବା କଲର୍‍ଙ୍କୁ ଅନୁମତି ଦିଆଯାଇଛି।"</string>
     <string name="zen_onboarding_current_setting_summary" msgid="3569246708507270821">"(ସାମ୍ପ୍ରତିକ ସେଟିଙ୍ଗ)"</string>
     <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="7584229011611927613">"’ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ’ ବିଜ୍ଞପ୍ତି ସେଟିଙ୍ଗ ବଦଳାଇବେ?"</string>
-    <string name="sound_work_settings" msgid="4140215240360927923">"କାର୍ଯ୍ୟ ପ୍ରୋଫାଇଲ୍‌ ଶବ୍ଦ"</string>
-    <string name="work_use_personal_sounds_title" msgid="531727195073003599">"ବ୍ୟକ୍ତିଗତ ପ୍ରୋଫାଇଲ୍‌ ଧ୍ୱନୀ ବ୍ୟବହାର କରନ୍ତୁ"</string>
-    <string name="work_use_personal_sounds_summary" msgid="2886871383995187441">"କାର୍ଯ୍ୟ ଓ ବ୍ୟକ୍ତିଗତ ପ୍ରୋଫାଇଲ୍‌ ପାଇଁ ଶବ୍ଦଗୁଡ଼ିକ ସମାନ ଅଟେ"</string>
+    <string name="sound_work_settings" msgid="4140215240360927923">"କାର୍ଯ୍ୟ ପ୍ରୋଫାଇଲ୍‌ ସାଉଣ୍ଡ"</string>
+    <string name="work_use_personal_sounds_title" msgid="531727195073003599">"ବ୍ୟକ୍ତିଗତ ପ୍ରୋଫାଇଲ୍‌ ସାଉଣ୍ଡ ବ୍ୟବହାର କରନ୍ତୁ"</string>
+    <string name="work_use_personal_sounds_summary" msgid="2886871383995187441">"କାର୍ଯ୍ୟ ଓ ବ୍ୟକ୍ତିଗତ ପ୍ରୋଫାଇଲ୍‌ ପାଇଁ ସାଉଣ୍ଡଗୁଡ଼ିକ ସମାନ ଅଟେ"</string>
     <string name="work_ringtone_title" msgid="5499360583947410224">"ଅଫିସ୍‌ ଫୋନ୍‌ର ରିଙ୍ଗଟୋନ୍‌"</string>
-    <string name="work_notification_ringtone_title" msgid="8059159087214025757">"ପୂର୍ବ-ନିର୍ଦ୍ଧାରିତ କାର୍ଯ୍ୟ ବିଜ୍ଞପ୍ତି ଶବ୍ଦ"</string>
-    <string name="work_alarm_ringtone_title" msgid="5328487181385375130">"ଡିଫଲ୍ଟ କାର୍ଯ୍ୟ ଆଲାର୍ମ ଶବ୍ଦ"</string>
+    <string name="work_notification_ringtone_title" msgid="8059159087214025757">"ଡିଫଲ୍ଟ କାର୍ଯ୍ୟ ବିଜ୍ଞପ୍ତି ସାଉଣ୍ଡ"</string>
+    <string name="work_alarm_ringtone_title" msgid="5328487181385375130">"ଡିଫଲ୍ଟ କାର୍ଯ୍ୟ ଆଲାର୍ମ ସାଉଣ୍ଡ"</string>
     <string name="work_sound_same_as_personal" msgid="7728560881697159758">"ବ୍ୟକ୍ତିଗତ ପ୍ରୋଫାଇଲ୍‌ ପରି ସମାନ"</string>
     <string name="work_sync_dialog_title" msgid="4799120971202956837">"ଶବ୍ଦ ବଦଳାଇବେ?"</string>
     <string name="work_sync_dialog_yes" msgid="2110726233746476066">"ବଦଳାଇବ"</string>
@@ -3728,7 +3728,7 @@
     <string name="decline_remote_bugreport_action" msgid="706319275774199033">"ଅଗ୍ରାହ୍ୟ କରନ୍ତୁ"</string>
     <string name="usb_use_charging_only" msgid="2344625733377110164">"ଡାଟା ସ୍ଥାନାନ୍ତର ହେବ ନାହିଁ"</string>
     <string name="usb_use_charging_only_desc" msgid="3283518562582478950">"ଏହି ଡିଭାଇସ୍‌କୁ ଚାର୍ଜ କରିଦିଅନ୍ତୁ"</string>
-    <string name="usb_use_power_only" msgid="6595783381323810697">"କନେକ୍ଟ ହୋଇଥିବା ଡିଭାଇସ୍‍ ଚାର୍ଜ କରନ୍ତୁ"</string>
+    <string name="usb_use_power_only" msgid="6595783381323810697">"ସଂଯୁକ୍ତ ହୋଇଥିବା ଡିଭାଇସ୍‍ ଚାର୍ଜ କରନ୍ତୁ"</string>
     <string name="usb_use_file_transfers" msgid="6153021302176151884">"ଫାଇଲ୍‌ ଟ୍ରାନ୍ସଫର୍‌"</string>
     <string name="usb_use_file_transfers_desc" msgid="6953866660041189580">"ଅନ୍ୟଏକ ଡିଭାଇସ୍‌କୁ ଫାଇଲ୍‌ ଟ୍ରାନ୍ସଫର୍‌ କରନ୍ତୁ"</string>
     <string name="usb_use_photo_transfers" msgid="5974236250197451257">"PTP"</string>
@@ -3792,7 +3792,7 @@
     <string name="zen_access_revoke_warning_dialog_title" msgid="6850994585577513299">"<xliff:g id="APP">%1$s</xliff:g> ପାଇଁ \"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ଆକ୍‌ସେସ୍‌ ରଦ୍ଦ କରିବେ?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="3487422193181311403">"ଏହି ଆପ୍‌ ଦ୍ୱାରା, \"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ପାଇଁ କରାଯାଇଥିବା ସମସ୍ତ ନିୟମ କାଢ଼ିଦିଆଯିବ।"</string>
     <string name="ignore_optimizations_on" msgid="4373971641328943551">"ଅନୁକୁଳ କରନାହିଁ"</string>
-    <string name="ignore_optimizations_off" msgid="4372289432580282870">"ଅନୁକୁଳ"</string>
+    <string name="ignore_optimizations_off" msgid="4372289432580282870">"ଅପ୍ଟିମାଇଜ୍ କରନ୍ତୁ"</string>
     <string name="ignore_optimizations_on_desc" msgid="2904484569799521559">"ଆପଣଙ୍କ ବ୍ୟାଟେରୀ ଖୁବ୍ ଶୀଘ୍ର ସରିଯାଇପାରେ। ବ୍ୟାକଗ୍ରାଉଣ୍ଡ ବ୍ୟାଟେରୀକୁ ବ୍ୟବହାର କରିବା ପାଇଁ ଆଉ ଆପ୍‍କୁ ବାଧା ଦେଇହେବ ନାହିଁ।"</string>
     <string name="ignore_optimizations_off_desc" msgid="5598702251817814289">"ବ୍ୟାଟେରୀ କାମ କରିବା ସମୟ ବଢାଇବାକୁ ସୁପାରିଶ କରାଯାଇଛି"</string>
     <string name="ignore_optimizations_title" msgid="7924345545276166305">"ବ୍ୟାଟେରୀ ଅନୁକୂଳନ ଏଡ଼ାଇବାକୁ <xliff:g id="APP">%s</xliff:g> କୁ ଅନୁମତି ଦେବେ?"</string>
diff --git a/tests/CarDeveloperOptions/res/values-pa/strings.xml b/tests/CarDeveloperOptions/res/values-pa/strings.xml
index c85ecaa..fb7d961 100644
--- a/tests/CarDeveloperOptions/res/values-pa/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-pa/strings.xml
@@ -1168,7 +1168,7 @@
     <string name="accessibility_category_personal" msgid="1423427301759058762">"ਨਿੱਜੀ ਪ੍ਰੋਫਾਈਲ ਖਾਤੇ"</string>
     <string name="accessibility_work_account_title" msgid="3195468574776888011">"ਕੰਮ ਖਾਤਾ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_personal_account_title" msgid="7251761883688839354">"ਨਿੱਜੀ ਖਾਤਾ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
-    <string name="search_settings" msgid="5809250790214921377">"ਖੋਜੋ"</string>
+    <string name="search_settings" msgid="5809250790214921377">"ਖੋਜ"</string>
     <string name="display_settings" msgid="1045535829232307190">"ਡਿਸਪਲੇ"</string>
     <string name="accelerometer_title" msgid="2427487734964971453">"ਸਕ੍ਰੀਨ ਸਵੈ-ਘੁਮਾਓ"</string>
     <string name="color_mode_title" msgid="8164858320869449142">"ਰੰਗ"</string>
diff --git a/tests/CarDeveloperOptions/res/values-pl/strings.xml b/tests/CarDeveloperOptions/res/values-pl/strings.xml
index 231b22b..518460e 100644
--- a/tests/CarDeveloperOptions/res/values-pl/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-pl/strings.xml
@@ -475,7 +475,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4312297515772004580">"Usuń"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="1346287821809975177">"Dotknij czytnika"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="750040530347336376">"Przyłóż palec do czytnika. Podnieś go, gdy poczujesz wibracje."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="1764145704166303842">"Podnieś i przyłóż ponownie"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="1764145704166303842">"Podnieś palec i przyłóż ponownie"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4434560313661204448">"Unoś palec, by odcisk był dokładniejszy"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="2987918958909117821">"Odcisk palca dodany"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="5862643337893923347">"Gdy zobaczysz tę ikonę, możesz użyć odcisku palca, aby się zidentyfikować lub zatwierdzić zakup"</string>
@@ -510,7 +510,7 @@
     <string name="fingerprint_delete_title" msgid="3120894112324235536">"Usuń odcisk palca „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>”"</string>
     <string name="fingerprint_delete_message" msgid="5895802741486967970">"Czy chcesz usunąć ten odcisk palca?"</string>
     <string name="fingerprint_last_delete_message" msgid="3346252479778971442">"Odcisków palców nie będzie można używać do odblokowywania telefonu, autoryzowania zakupów ani logowania się w aplikacjach"</string>
-    <string name="fingerprint_last_delete_message_profile_challenge" msgid="5385095150532247025">"Nie będziesz mieć możliwości używania odcisków palców, by odblokować profil służbowy, autoryzować zakupy czy logować się w aplikacjach używanych do pracy"</string>
+    <string name="fingerprint_last_delete_message_profile_challenge" msgid="5385095150532247025">"Nie będziesz mieć możliwości używania odcisków palców, by odblokować profil służbowy, autoryzować zakupy czy logować się w aplikacjach służbowych"</string>
     <string name="fingerprint_last_delete_confirm" msgid="7984595457589664004">"Tak, usuń"</string>
     <string name="crypt_keeper_settings_title" msgid="839783588093862748">"Szyfrowanie"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="2292129135369853167">"Zaszyfruj tablet"</string>
@@ -994,7 +994,7 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="2540529164687476827">"Udostępniam Wi‑temu urządzeniu…"</string>
     <string name="wifi_dpp_connecting" msgid="4229290407210299897">"Łączę…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="847987212473038179">"Udostępnij hotspot"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="3910665850075275963">"Potwierdź swoją tożsamość"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="3910665850075275963">"Potwierdź, że to Ty"</string>
     <string name="wifi_dpp_wifi_password" msgid="8007558344032612455">"Hasło do Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="6172326289042241924">"Hasło do hotspota: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_add_device" msgid="1347056725253936358">"Dodaj urządzenie"</string>
@@ -1165,7 +1165,7 @@
     <string name="incoming_call_volume_title" msgid="4736570528754310450">"Dzwonek"</string>
     <string name="notification_volume_title" msgid="6022562909288085275">"Powiadomienie"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="7312942422655861175">"Użyj głośności połączeń przychodzących dla powiadomień"</string>
-    <string name="home_work_profile_not_supported" msgid="6137073723297076818">"Nie obsługuje profili do pracy"</string>
+    <string name="home_work_profile_not_supported" msgid="6137073723297076818">"Nie obsługuje profili służbowych"</string>
     <string name="notification_sound_dialog_title" msgid="6653341809710423276">"Domyślny dźwięk powiadomienia"</string>
     <string name="media_volume_title" msgid="1030438549497800914">"Multimedia"</string>
     <string name="media_volume_summary" msgid="3142433516297061652">"Ustaw głośność muzyki oraz filmów wideo"</string>
@@ -1200,9 +1200,9 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="2125391395745266946">"Nie odtwarzaj dźwięku podczas umieszczania tabletu w doku i wyjmowania go"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="9075438702849896866">"Nie odtwarzaj dźwięku podczas umieszczania telefonu w podstawce i wyjmowania go"</string>
     <string name="account_settings" msgid="1937600532993930396">"Konta"</string>
-    <string name="accessibility_category_work" msgid="2808942060489460727">"Konta profili do pracy – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
+    <string name="accessibility_category_work" msgid="2808942060489460727">"Konta profili służbowych – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1423427301759058762">"Konta profili osobistych"</string>
-    <string name="accessibility_work_account_title" msgid="3195468574776888011">"Konto do pracy – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
+    <string name="accessibility_work_account_title" msgid="3195468574776888011">"Konto służbowe – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_personal_account_title" msgid="7251761883688839354">"Konto osobiste – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="search_settings" msgid="5809250790214921377">"Wyszukiwanie"</string>
     <string name="display_settings" msgid="1045535829232307190">"Wyświetlacz"</string>
@@ -1685,7 +1685,7 @@
     <string name="mobile_insert_sim_card" msgid="7594550403454243732">"Włóż kartę SIM i zrestartuj urządzenie"</string>
     <string name="mobile_connect_to_internet" msgid="6031886097365170913">"Połącz się z internetem"</string>
     <string name="location_title" msgid="8664674161765477168">"Moja lokalizacja"</string>
-    <string name="managed_profile_location_switch_title" msgid="8157384427925389680">"Lokalizacja dla profilu do pracy"</string>
+    <string name="managed_profile_location_switch_title" msgid="8157384427925389680">"Lokalizacja dla profilu służbowego"</string>
     <string name="location_app_level_permissions" msgid="1298041503927632960">"Uprawnienia aplikacji"</string>
     <string name="location_app_permission_summary_location_off" msgid="541372845344796336">"Lokalizacja jest wyłączona"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="7904821382328758218">
@@ -1775,9 +1775,9 @@
     <string name="lockpassword_strong_auth_required_device_pattern" msgid="1014214190135045781">"Ze względów bezpieczeństwa podaj wzór używany na urządzeniu"</string>
     <string name="lockpassword_strong_auth_required_device_pin" msgid="24030584350601016">"Ze względów bezpieczeństwa podaj kod PIN urządzenia"</string>
     <string name="lockpassword_strong_auth_required_device_password" msgid="7746588206458754598">"Ze względów bezpieczeństwa podaj hasło do urządzenia"</string>
-    <string name="lockpassword_strong_auth_required_work_pattern" msgid="6861154706098327320">"Ze względów bezpieczeństwa podaj wzór do profilu do pracy"</string>
-    <string name="lockpassword_strong_auth_required_work_pin" msgid="6306902249365524526">"Ze względów bezpieczeństwa podaj kod PIN do profilu do pracy"</string>
-    <string name="lockpassword_strong_auth_required_work_password" msgid="2917338218971012776">"Ze względów bezpieczeństwa podaj hasło do profilu do pracy"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="6861154706098327320">"Ze względów bezpieczeństwa podaj wzór do profilu służbowego"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="6306902249365524526">"Ze względów bezpieczeństwa podaj kod PIN do profilu służbowego"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="2917338218971012776">"Ze względów bezpieczeństwa podaj hasło do profilu służbowego"</string>
     <string name="lockpassword_confirm_your_pattern_details_frp" msgid="1085862410379709928">"Telefon został zresetowany do ustawień fabrycznych. Aby korzystać z tego telefonu, wprowadź poprzedni wzór."</string>
     <string name="lockpassword_confirm_your_pin_details_frp" msgid="6849889353126558761">"Telefon został zresetowany do ustawień fabrycznych. Aby korzystać z tego telefonu, wprowadź poprzedni kod PIN."</string>
     <string name="lockpassword_confirm_your_password_details_frp" msgid="3239944795659418737">"Telefon został zresetowany do ustawień fabrycznych. Aby korzystać z tego telefonu, wpisz poprzednie hasło."</string>
@@ -1814,13 +1814,13 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="6037403647312543908">"Jak narysować wzór odblokowania"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="3043127997770535921">"Zbyt wiele nieudanych prób. Spróbuj ponownie za <xliff:g id="NUMBER">%d</xliff:g> s."</string>
     <string name="activity_not_found" msgid="3492413375341165453">"Aplikacja nie jest zainstalowana na telefonie."</string>
-    <string name="lock_settings_profile_title" msgid="3928992050074556160">"Bezpieczeństwo profilu do pracy"</string>
+    <string name="lock_settings_profile_title" msgid="3928992050074556160">"Bezpieczeństwo profilu służbowego"</string>
     <string name="lock_settings_profile_screen_lock_title" msgid="285267471459162203">"Blokada ekranu w profilu służbowym"</string>
     <string name="lock_settings_profile_unification_title" msgid="2629698644191935287">"Używaj jednej blokady"</string>
-    <string name="lock_settings_profile_unification_summary" msgid="4797188229308317207">"Używaj jednej blokady dla profilu do pracy i ekranu urządzenia"</string>
+    <string name="lock_settings_profile_unification_summary" msgid="4797188229308317207">"Używaj jednej blokady dla profilu służbowego i ekranu urządzenia"</string>
     <string name="lock_settings_profile_unification_dialog_title" msgid="1690211342491067179">"Używać jednej blokady?"</string>
-    <string name="lock_settings_profile_unification_dialog_body" msgid="8629158560032603101">"Urządzenie użyje ekranu blokady profilu do pracy. Zasady służbowe dotyczą obu blokad."</string>
-    <string name="lock_settings_profile_unification_dialog_uncompliant_body" msgid="1217609779267643474">"Twoja blokada profilu do pracy nie spełnia wymagań bezpieczeństwa organizacji. Możesz ustawić nową blokadę zarówno dla ekranu urządzenia, jak i dla profilu do pracy, ale będą obowiązywać wszystkie zasady dotyczące blokady profilu do pracy."</string>
+    <string name="lock_settings_profile_unification_dialog_body" msgid="8629158560032603101">"Urządzenie użyje ekranu blokady profilu służbowego. Zasady służbowe dotyczą obu blokad."</string>
+    <string name="lock_settings_profile_unification_dialog_uncompliant_body" msgid="1217609779267643474">"Twoja blokada profilu służbowego nie spełnia wymagań bezpieczeństwa organizacji. Możesz ustawić nową blokadę zarówno dla ekranu urządzenia, jak i dla profilu służbowego, ale będą obowiązywać wszystkie zasady dotyczące blokady profilu służbowego."</string>
     <string name="lock_settings_profile_unification_dialog_confirm" msgid="888942752619181804">"Używaj jednej blokady"</string>
     <string name="lock_settings_profile_unification_dialog_uncompliant_confirm" msgid="8046452284593057185">"Używaj jednej blokady"</string>
     <string name="lock_settings_profile_unified_summary" msgid="5347244550751740962">"Taka sama jak blokada ekranu urządzenia"</string>
@@ -2015,7 +2015,7 @@
     <string name="show_ime_summary" msgid="3246628154011464373">"Pozostaw na ekranie, gdy aktywna jest klawiatura fizyczna"</string>
     <string name="keyboard_shortcuts_helper" msgid="6574386807271399788">"Informacje o skrótach klawiszowych"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="8024313306403779742">"Wyświetl dostępne skróty"</string>
-    <string name="language_and_input_for_work_category_title" msgid="2053255944038892588">"Klawiatura i narzędzia w profilu do pracy"</string>
+    <string name="language_and_input_for_work_category_title" msgid="2053255944038892588">"Klawiatura i narzędzia w profilu służbowym"</string>
     <string name="virtual_keyboards_for_work_title" msgid="3968291646938204523">"Wirtualna klawiatura do pracy"</string>
     <string name="default_keyboard_layout" msgid="9171704064451242230">"Domyślnie"</string>
     <string name="pointer_speed" msgid="800691982011350432">"Szybkość wskaźnika"</string>
@@ -2526,7 +2526,7 @@
     <string name="battery_saver_auto_routine_summary" msgid="9182044424547482889">"Oszczędzanie baterii włącza się, jeśli bateria jest prawie wyczerpana przed typową porą ładowania"</string>
     <string name="battery_saver_auto_percentage_summary" msgid="2036128588460338677">"Włączy się przy <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_saver_schedule_settings_title" msgid="574233428557678128">"Ustaw harmonogram"</string>
-    <string name="battery_saver_sticky_title_new" msgid="5328707297110866082">"Wyłącz, gdy w pełni naładowana"</string>
+    <string name="battery_saver_sticky_title_new" msgid="5328707297110866082">"Wyłącz po pełnym naładowaniu"</string>
     <string name="battery_saver_sticky_description_new" product="default" msgid="3406582427270935879">"Oszczędzanie baterii wyłączy się, gdy poziom naładowania telefonu wyniesie <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_saver_sticky_description_new" product="tablet" msgid="3284967694001857194">"Oszczędzanie baterii wyłączy się, gdy poziom naładowania tabletu wyniesie <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_saver_sticky_description_new" product="device" msgid="5056520668081504111">"Oszczędzanie baterii wyłączy się, gdy poziom naładowania urządzenia wyniesie <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2644,7 +2644,7 @@
     <string name="select_device_admin_msg" msgid="4173769638399075387">"Aplikacje do zarządzania urządzeniem"</string>
     <string name="no_device_admins" msgid="4129231900385977460">"Brak dostępnych aplikacji do zarządzania urządzeniem"</string>
     <string name="personal_device_admin_title" msgid="759440849188565661">"Osobiste"</string>
-    <string name="managed_device_admin_title" msgid="8021522755492551726">"Praca"</string>
+    <string name="managed_device_admin_title" msgid="8021522755492551726">"Służbowe"</string>
     <string name="sms_access_restriction_enabled" msgid="3006320256764718303">"Ogranicz dostęp do SMS-ów i rejestru połączeń"</string>
     <string name="sms_access_restriction_enabled_summary" msgid="9011946580977780063">"Tylko domyślne aplikacje do obsługi telefonu i wiadomości mają dostęp do SMS-ów i rejestru połączeń"</string>
     <string name="no_trust_agents" msgid="5757792915019113084">"Brak agentów zaufania"</string>
@@ -2743,7 +2743,7 @@
     <string name="data_usage_cellular_data_summary" msgid="9162777397135709280">"Wstrzymano na limicie"</string>
     <string name="account_settings_menu_auto_sync" msgid="2673669556006027506">"Autosynchronizacja danych"</string>
     <string name="account_settings_menu_auto_sync_personal" msgid="3235831897309033754">"Autosynchronizacja: osobiste"</string>
-    <string name="account_settings_menu_auto_sync_work" msgid="5721442464286552815">"Autosynchronizacja: do pracy"</string>
+    <string name="account_settings_menu_auto_sync_work" msgid="5721442464286552815">"Autosynchronizacja: służbowe"</string>
     <string name="data_usage_change_cycle" msgid="447761920472170031">"Zmień cykl"</string>
     <string name="data_usage_pick_cycle_day" msgid="6319750879145917066">"Resetowanie cyklu użycia danych – dzień miesiąca:"</string>
     <string name="data_usage_empty" msgid="7981405723435034032">"W tym okresie aplikacje nie pobierały danych."</string>
@@ -2915,10 +2915,10 @@
       <item quantity="one">Domena <xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> zainstalowała na Twoim urządzeniu certyfikat, który może zezwolić jej na monitorowanie aktywności urządzenia w sieci, w tym e-maili, aplikacji i bezpiecznych stron internetowych.\n\nAby dowiedzieć się więcej o tym certyfikacie, skontaktuj się z administratorem.</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="8271858091418779584">
-      <item quantity="few">Domena <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> zainstalowała na Twoim profilu do pracy certyfikaty, które mogą zezwolić jej na monitorowanie aktywności w sieci firmowej, w tym e-maili, aplikacji i bezpiecznych stron internetowych.\n\nAby dowiedzieć się więcej o tych certyfikatach, skontaktuj się z administratorem.</item>
-      <item quantity="many">Domena <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> zainstalowała na Twoim profilu do pracy certyfikaty, które mogą zezwolić jej na monitorowanie aktywności w sieci firmowej, w tym e-maili, aplikacji i bezpiecznych stron internetowych.\n\nAby dowiedzieć się więcej o tych certyfikatach, skontaktuj się z administratorem.</item>
-      <item quantity="other">Domena <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> zainstalowała na Twoim profilu do pracy certyfikaty, które mogą zezwolić jej na monitorowanie aktywności w sieci firmowej, w tym e-maili, aplikacji i bezpiecznych stron internetowych.\n\nAby dowiedzieć się więcej o tych certyfikatach, skontaktuj się z administratorem.</item>
-      <item quantity="one">Domena <xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> zainstalowała na Twoim profilu do pracy certyfikat, który może zezwolić jej na monitorowanie aktywności w sieci firmowej, w tym e-maili, aplikacji i bezpiecznych stron internetowych.\n\nAby dowiedzieć się więcej o tym certyfikacie, skontaktuj się z administratorem.</item>
+      <item quantity="few">Domena <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> zainstalowała na Twoim profilu służbowym certyfikaty, które mogą zezwolić jej na monitorowanie aktywności w sieci firmowej, w tym e-maili, aplikacji i bezpiecznych stron internetowych.\n\nAby dowiedzieć się więcej o tych certyfikatach, skontaktuj się z administratorem.</item>
+      <item quantity="many">Domena <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> zainstalowała na Twoim profilu służbowym certyfikaty, które mogą zezwolić jej na monitorowanie aktywności w sieci firmowej, w tym e-maili, aplikacji i bezpiecznych stron internetowych.\n\nAby dowiedzieć się więcej o tych certyfikatach, skontaktuj się z administratorem.</item>
+      <item quantity="other">Domena <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> zainstalowała na Twoim profilu służbowym certyfikaty, które mogą zezwolić jej na monitorowanie aktywności w sieci firmowej, w tym e-maili, aplikacji i bezpiecznych stron internetowych.\n\nAby dowiedzieć się więcej o tych certyfikatach, skontaktuj się z administratorem.</item>
+      <item quantity="one">Domena <xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> zainstalowała na Twoim profilu służbowym certyfikat, który może zezwolić jej na monitorowanie aktywności w sieci firmowej, w tym e-maili, aplikacji i bezpiecznych stron internetowych.\n\nAby dowiedzieć się więcej o tym certyfikacie, skontaktuj się z administratorem.</item>
     </plurals>
     <string name="ssl_ca_cert_warning_message" msgid="8692156828262606685">"Podmiot zewnętrzny może monitorować Twoją aktywność w sieci (np. e-maile, aplikacje i bezpieczne strony).\n\nUmożliwiają to dane uwierzytelniające zainstalowane na Twoim urządzeniu."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="3227175122066058245">
@@ -3124,7 +3124,7 @@
     <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="7881286613528299400">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="8448096608058843730">"Aplikacje i powiadomienia"</string>
     <string name="app_and_notification_dashboard_summary" msgid="4165181440955038145">"Asystent, ostatnio używane aplikacje, aplikacje domyślne"</string>
-    <string name="notification_settings_work_profile" msgid="7190550347842400029">"Aplikacje w profilu do pracy nie mają dostępu do powiadomień."</string>
+    <string name="notification_settings_work_profile" msgid="7190550347842400029">"Aplikacje w profilu służbowym nie mają dostępu do powiadomień."</string>
     <string name="account_dashboard_title" msgid="4734300939532555885">"Konta"</string>
     <string name="account_dashboard_default_summary" msgid="6822549669771936206">"Nie dodano kont"</string>
     <string name="app_default_dashboard_title" msgid="6575301028225232193">"Aplikacje domyślne"</string>
@@ -3187,7 +3187,7 @@
     <string name="keywords_android_version" msgid="4842749998088987740">"stan aktualizacji zabezpieczeń Androida, wersja pasma podstawowego, wersja jądra"</string>
     <string name="keywords_dark_ui_mode" msgid="1027966176887770318">"motyw, jasny, ciemny, tryb"</string>
     <string name="keywords_financial_apps_sms_access" msgid="3236014691838121857">"aplikacja finansowa, SMS, uprawnienia"</string>
-    <string name="keywords_systemui_theme" msgid="9150908170417305866">"tryb ciemny"</string>
+    <string name="keywords_systemui_theme" msgid="9150908170417305866">"ciemny motyw"</string>
     <string name="keywords_device_feedback" msgid="6948977907405738490">"błąd"</string>
     <string name="keywords_ambient_display_screen" msgid="5873935693887583428">"Wygaszacz z powiadomieniami, ekran blokady"</string>
     <string name="keywords_lock_screen_notif" msgid="4914337222856805463">"powiadomienia na ekranie blokady, powiadomienia"</string>
@@ -3368,16 +3368,16 @@
     <string name="zen_onboarding_new_setting_summary" msgid="8264430315983860075">"Powiadomienia nie będą wyświetlane ani sygnalizowane dźwiękiem. Dozwolone są połączenia od kontaktów oznaczonych gwiazdką i dzwoniących powtórnie."</string>
     <string name="zen_onboarding_current_setting_summary" msgid="3569246708507270821">"(Aktualne ustawienie)"</string>
     <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="7584229011611927613">"Zmienić ustawienia trybu Nie przeszkadzać?"</string>
-    <string name="sound_work_settings" msgid="4140215240360927923">"Dźwięki w profilu do pracy"</string>
+    <string name="sound_work_settings" msgid="4140215240360927923">"Dźwięki w profilu służbowym"</string>
     <string name="work_use_personal_sounds_title" msgid="531727195073003599">"Użyj dźwięków z profilu osobistego"</string>
-    <string name="work_use_personal_sounds_summary" msgid="2886871383995187441">"Dźwięki są takie same w profilu osobistym i do pracy"</string>
-    <string name="work_ringtone_title" msgid="5499360583947410224">"Dzwonek w profilu do pracy"</string>
+    <string name="work_use_personal_sounds_summary" msgid="2886871383995187441">"Dźwięki są takie same w profilu osobistym i służbowym"</string>
+    <string name="work_ringtone_title" msgid="5499360583947410224">"Dzwonek w profilu służbowym"</string>
     <string name="work_notification_ringtone_title" msgid="8059159087214025757">"Domyślny dźwięk powiadomienia w profilu służbowym"</string>
     <string name="work_alarm_ringtone_title" msgid="5328487181385375130">"Domyślny dźwięk alarmu w profilu służbowym"</string>
     <string name="work_sound_same_as_personal" msgid="7728560881697159758">"Taki sam jak w profilu osobistym"</string>
     <string name="work_sync_dialog_title" msgid="4799120971202956837">"Zastąpić dźwięki?"</string>
     <string name="work_sync_dialog_yes" msgid="2110726233746476066">"Zastąp"</string>
-    <string name="work_sync_dialog_message" msgid="944233463059129156">"W profilu do pracy będą używane dźwięki z profilu osobistego"</string>
+    <string name="work_sync_dialog_message" msgid="944233463059129156">"W profilu służbowym będą używane dźwięki z profilu osobistego"</string>
     <string name="ringtones_install_custom_sound_title" msgid="210551218424553671">"Dodać niestandardowy dźwięk?"</string>
     <string name="ringtones_install_custom_sound_content" msgid="6683649115132255452">"Ten plik zostanie skopiowany do folderu <xliff:g id="FOLDER_NAME">%s</xliff:g>"</string>
     <string name="ringtones_category_preference_title" msgid="4491932700769815470">"Dzwonki"</string>
@@ -3408,7 +3408,7 @@
     <string name="swipe_direction_rtl" msgid="4521416787262888813">"Przesuń w lewo, by zamknąć, i w prawo, by wyświetlić menu"</string>
     <string name="notification_pulse_title" msgid="4861418327614907116">"Migająca dioda"</string>
     <string name="lock_screen_notifications_title" msgid="6889072265118747835">"Na ekranie blokady"</string>
-    <string name="locked_work_profile_notification_title" msgid="8307025804986190658">"Gdy profil do pracy jest zablokowany"</string>
+    <string name="locked_work_profile_notification_title" msgid="8307025804986190658">"Gdy profil służbowy jest zablokowany"</string>
     <string name="lock_screen_notifications_summary_show" msgid="5788874994455257378">"Pokazuj wszystkie powiadomienia"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="3668806866535260143">"Ukrywaj informacje poufne"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="3259929507369817672">"Nie pokazuj żadnych powiadomień"</string>
@@ -3449,7 +3449,7 @@
     <string name="notifications_sent_weekly" msgid="5859675428990259432">"~<xliff:g id="NUMBER">%1$s</xliff:g> tygodniowo"</string>
     <string name="notifications_sent_never" msgid="237997329598144638">"Nigdy"</string>
     <string name="manage_notification_access_title" msgid="5348743662189787547">"Dostęp do powiadomień"</string>
-    <string name="work_profile_notification_access_blocked_summary" msgid="8148871282484870576">"Dostęp do powiadomień profilu do pracy jest zablokowany"</string>
+    <string name="work_profile_notification_access_blocked_summary" msgid="8148871282484870576">"Dostęp do powiadomień profilu służbowego jest zablokowany"</string>
     <string name="manage_notification_access_summary_zero" msgid="236809421271593016">"Aplikacje nie mogą odczytywać powiadomień"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="8496218948429646792">
       <item quantity="few">%d aplikacje mogą odczytywać powiadomienia</item>
@@ -3664,7 +3664,7 @@
     <string name="screen_pinning_unlock_pin" msgid="1441705536015645023">"Podaj PIN, aby odpiąć"</string>
     <string name="screen_pinning_unlock_password" msgid="1017776884000170841">"Aby odpiąć, poproś o hasło"</string>
     <string name="screen_pinning_unlock_none" msgid="9183040569733226911">"Zablokuj urządzenie przy odpinaniu"</string>
-    <string name="opening_paragraph_delete_profile_unknown_company" msgid="2350380017136403670">"Tym profilem do pracy zarządza:"</string>
+    <string name="opening_paragraph_delete_profile_unknown_company" msgid="2350380017136403670">"Tym profilem służbowym zarządza:"</string>
     <string name="managing_admin" msgid="3212584016377581608">"Zarządzane przez: <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="5903223408406906322">"(Funkcja eksperymentalna)"</string>
     <string name="encryption_interstitial_header" msgid="3298397268731647519">"Bezpieczne uruchamianie"</string>
@@ -3747,7 +3747,7 @@
     <string name="filter_enabled_apps" msgid="5888459261768538489">"Zainstalowane aplikacje"</string>
     <string name="filter_instant_apps" msgid="8087483282854072366">"Aplikacje błyskawiczne"</string>
     <string name="filter_personal_apps" msgid="3473268022652904457">"Osobiste"</string>
-    <string name="filter_work_apps" msgid="4202483998339465542">"Do pracy"</string>
+    <string name="filter_work_apps" msgid="4202483998339465542">"Służbowe"</string>
     <string name="filter_notif_all_apps" msgid="1862666327228804896">"Aplikacje: wszystkie"</string>
     <string name="filter_notif_blocked_apps" msgid="5694956954776028202">"Wyłączone"</string>
     <string name="filter_notif_urgent_channels" msgid="5000735867167027148">"Kategorie: pilne"</string>
@@ -3917,7 +3917,7 @@
     <string name="ignore_optimizations_off_desc" msgid="5598702251817814289">"Zalecane, by wydłużyć czas pracy baterii"</string>
     <string name="ignore_optimizations_title" msgid="7924345545276166305">"Zezwolić aplikacji <xliff:g id="APP">%s</xliff:g> na ignorowanie optymalizacji baterii?"</string>
     <string name="app_list_preference_none" msgid="7100409177446935028">"Brak"</string>
-    <string name="work_profile_usage_access_warning" msgid="403208064382097510">"Wyłączenie tej aplikacji dostępu do użytkowania nie uniemożliwi administratorowi śledzenia danych użytkowania aplikacji, które zostały dodane do Twojego profilu do pracy"</string>
+    <string name="work_profile_usage_access_warning" msgid="403208064382097510">"Wyłączenie w tej aplikacji dostępu do użytkowania nie uniemożliwi administratorowi śledzenia danych użytkowania aplikacji, które zostały dodane do Twojego profilu służbowego"</string>
     <string name="accessibility_lock_screen_progress" msgid="8242917828598820049">"Wykorzystałeś <xliff:g id="COUNT_0">%1$d</xliff:g> z <xliff:g id="COUNT_1">%2$d</xliff:g> znaków"</string>
     <string name="draw_overlay" msgid="2878665072530660668">"Wyświetlanie nad innymi"</string>
     <string name="system_alert_window_settings" msgid="3024330223417646567">"Wyświetlanie nad innymi aplikacjami"</string>
@@ -4002,7 +4002,7 @@
     <string name="disabled_by_policy_title_suspend_packages" msgid="4254714213391802322">"Nie można otworzyć tej aplikacji"</string>
     <string name="default_admin_support_msg" msgid="5789424433689798637">"Jeśli masz pytania, skontaktuj się z administratorem IT"</string>
     <string name="admin_support_more_info" msgid="8737842638087863477">"Więcej szczegółów"</string>
-    <string name="admin_profile_owner_message" msgid="3199544166281052845">"Administrator może monitorować aplikacje i dane powiązane z Twoim profilem do pracy (w tym ustawienia, uprawnienia, firmowe uprawnienia dostępu, aktywność w sieci i informacje o lokalizacji urządzenia) oraz nimi zarządzać."</string>
+    <string name="admin_profile_owner_message" msgid="3199544166281052845">"Administrator może monitorować aplikacje i dane powiązane z Twoim profilem służbowym (w tym ustawienia, uprawnienia, firmowe uprawnienia dostępu, aktywność w sieci i informacje o lokalizacji urządzenia) oraz nimi zarządzać."</string>
     <string name="admin_profile_owner_user_message" msgid="2991249382056855531">"Administrator może monitorować aplikacje i dane powiązane z tym użytkownikiem (w tym ustawienia, uprawnienia, firmowe uprawnienia dostępu, aktywność w sieci i informacje o lokalizacji urządzenia) oraz nimi zarządzać."</string>
     <string name="admin_device_owner_message" msgid="1823477572459610869">"Administrator może monitorować aplikacje i dane powiązane z tym urządzeniem (w tym ustawienia, uprawnienia, firmowe uprawnienia dostępu, aktywność w sieci i informacje o lokalizacji urządzenia) oraz nimi zarządzać."</string>
     <string name="condition_turn_off" msgid="4395150881365143558">"Wyłącz"</string>
@@ -4211,15 +4211,15 @@
     <string name="dark_ui_mode" msgid="703844190192599217">"Motyw"</string>
     <string name="dark_ui_mode_title" msgid="8774932716427742413">"Wybierz motyw"</string>
     <string name="dark_ui_settings_light_summary" msgid="5219102347744462812">"To ustawienie dotyczy również aplikacji"</string>
-    <string name="dark_ui_settings_dark_summary" msgid="7042737828943784289">"Obsługiwane aplikacje również zostaną przełączone na tryb ciemny"</string>
+    <string name="dark_ui_settings_dark_summary" msgid="7042737828943784289">"Obsługiwane aplikacje również zostaną przełączone na ciemny motyw"</string>
     <string name="quick_settings_developer_tiles" msgid="7423485925757678719">"Kafelki szybkich ustawień dla programisty"</string>
     <string name="winscope_trace_quick_settings_title" msgid="940971040388411374">"Śledzenie Winscope"</string>
     <string name="sensors_off_quick_settings_title" msgid="3655699045300438902">"Wyłącz czujniki"</string>
-    <string name="managed_profile_settings_title" msgid="4340409321523532402">"Ustawienia profilu do pracy"</string>
+    <string name="managed_profile_settings_title" msgid="4340409321523532402">"Ustawienia profilu służbowego"</string>
     <string name="managed_profile_contact_search_title" msgid="7337225196804457095">"Wyszukiwanie kontaktów"</string>
     <string name="managed_profile_contact_search_summary" msgid="7278267480246726951">"Zezwalaj na wyszukiwanie kontaktów do identyfikacji rozmówców i kontaktów przez Twoją organizację"</string>
     <string name="cross_profile_calendar_title" msgid="2351605904015067145">"Wszystkie profile w kalendarzu"</string>
-    <string name="cross_profile_calendar_summary" msgid="3196258680438896098">"Pokazuj zdarzenia w profilu do pracy w kalendarzu osobistym"</string>
+    <string name="cross_profile_calendar_summary" msgid="3196258680438896098">"Pokazuj zdarzenia w profilu służbowym w kalendarzu osobistym"</string>
     <string name="cross_profile_calendar_restricted_summary" msgid="6892589892357409107">"Twoja organizacja nie zezwala aplikacjom osobistym na dostęp do Twojego kalendarza służbowego"</string>
     <plurals name="hours" formatted="false" msgid="135936773984899873">
       <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> godziny</item>
@@ -4299,7 +4299,7 @@
     <string name="configure_section_header" msgid="6988981883075615136">"Konfiguracja"</string>
     <string name="auto_sync_account_title" msgid="2394463123733529506">"Automatycznie synchronizuj dane"</string>
     <string name="auto_sync_personal_account_title" msgid="6844465157916100655">"Automatycznie synchronizuj dane osobiste"</string>
-    <string name="auto_sync_work_account_title" msgid="2403222633447522376">"Automatycznie synchronizuj dane do pracy"</string>
+    <string name="auto_sync_work_account_title" msgid="2403222633447522376">"Automatycznie synchronizuj dane służbowe"</string>
     <string name="auto_sync_account_summary" msgid="6316230976974033772">"Pozwala aplikacjom automatycznie odświeżać dane"</string>
     <string name="account_sync_title" msgid="1570164819114297154">"Synchronizacja konta"</string>
     <string name="account_sync_summary_some_on" msgid="1934556869158274053">"Włącz synchronizację <xliff:g id="ID_1">%1$d</xliff:g> z <xliff:g id="ID_2">%2$d</xliff:g> elementów"</string>
@@ -4341,11 +4341,11 @@
     <string name="enterprise_privacy_input_method_name" msgid="439610095825218563">"Ustaw: <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="enterprise_privacy_always_on_vpn_device" msgid="2022700916516458213">"Włączono stały VPN"</string>
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="5644065780843002044">"Wyłączono stały VPN w Twoim profilu osobistym"</string>
-    <string name="enterprise_privacy_always_on_vpn_work" msgid="6443089897985373564">"Włączono stały VPN w Twoim profilu do pracy"</string>
+    <string name="enterprise_privacy_always_on_vpn_work" msgid="6443089897985373564">"Włączono stały VPN w Twoim profilu służbowym"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="3862135895716080830">"Ustawiono globalny serwer proxy HTTP"</string>
     <string name="enterprise_privacy_ca_certs_device" msgid="7715658848470643878">"Zaufane dane logowania"</string>
     <string name="enterprise_privacy_ca_certs_personal" msgid="1356447417193483802">"Zaufane dane logowania w Twoim profilu osobistym"</string>
-    <string name="enterprise_privacy_ca_certs_work" msgid="836419648894546893">"Zaufane dane logowania w Twoim profilu do pracy"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="836419648894546893">"Zaufane dane logowania w Twoim profilu służbowym"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="7953528945502561752">
       <item quantity="few">Co najmniej <xliff:g id="COUNT_1">%d</xliff:g> certyfikaty urzędu certyfikacji</item>
       <item quantity="many">Co najmniej <xliff:g id="COUNT_1">%d</xliff:g> certyfikatów urzędu certyfikacji</item>
@@ -4355,7 +4355,7 @@
     <string name="enterprise_privacy_lock_device" msgid="1533125067038409945">"Administrator może zablokować urządzenie i zresetować hasło"</string>
     <string name="enterprise_privacy_wipe_device" msgid="7555287990273929922">"Administrator może usunąć wszystkie dane z urządzenia"</string>
     <string name="enterprise_privacy_failed_password_wipe_device" msgid="4101502079202483156">"Nieudane próby podania hasła przed usunięciem wszystkich danych z urządzenia"</string>
-    <string name="enterprise_privacy_failed_password_wipe_work" msgid="2881646286634693392">"Nieudane próby podania hasła przed usunięciem danych z profilu do pracy"</string>
+    <string name="enterprise_privacy_failed_password_wipe_work" msgid="2881646286634693392">"Nieudane próby podania hasła przed usunięciem danych z profilu służbowego"</string>
     <plurals name="enterprise_privacy_number_failed_password_wipe" formatted="false" msgid="562550414712223382">
       <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> próby</item>
       <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> prób</item>
diff --git a/tests/CarDeveloperOptions/res/values-pt-rPT/strings.xml b/tests/CarDeveloperOptions/res/values-pt-rPT/strings.xml
index d7b618f..925c0ca 100644
--- a/tests/CarDeveloperOptions/res/values-pt-rPT/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-pt-rPT/strings.xml
@@ -711,7 +711,7 @@
     <string name="lockpattern_tutorial_cancel_label" msgid="450401426127674369">"Cancelar"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="8474690922559443018">"Seguinte"</string>
     <string name="lock_setup" msgid="8710689848703935088">"A configuração está concluída."</string>
-    <string name="manage_device_admin" msgid="322047441168191695">"Aplicações de administração do dispositivo"</string>
+    <string name="manage_device_admin" msgid="322047441168191695">"Apps de administração do dispositivo"</string>
     <string name="number_of_device_admins_none" msgid="8519193548630223132">"Sem aplicações ativas"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="6445613288828151224">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> aplicações ativas</item>
@@ -1369,7 +1369,7 @@
     <string name="memory_available_read_only" msgid="9125440204248584531">"Disponível (só de leitura)"</string>
     <string name="memory_size" msgid="6637939229251056764">"Espaço total"</string>
     <string name="memory_calculating_size" msgid="8407591625479256510">"A calcular..."</string>
-    <string name="memory_apps_usage" msgid="1886814780760368266">"Aplicações e respetivos dados"</string>
+    <string name="memory_apps_usage" msgid="1886814780760368266">"Apps e respetivos dados"</string>
     <string name="memory_media_usage" msgid="2744652206722240527">"Multimédia"</string>
     <string name="memory_downloads_usage" msgid="7039979723012065168">"Transferências"</string>
     <string name="memory_dcim_usage" msgid="599009211606524732">"Imagens, vídeos"</string>
@@ -1449,7 +1449,7 @@
     <string name="storage_internal_forget_details" msgid="5655856574682184453">"Para utilizar as aplicações, as fotos ou os dados incluídos em <xliff:g id="NAME">^1</xliff:g>, insira-o novamente. \n\nEm alternativa, pode optar por esquecer este armazenamento se o mesmo não estiver disponível. \n\nSe optar por esquecê-lo, todos os dados presentes no dispositivo são eliminados permanentemente. \n\nPode reinstalar as aplicações posteriormente, mas os dados armazenados neste dispositivo são eliminados."</string>
     <string name="storage_internal_forget_confirm_title" msgid="331032276130605241">"Pretende esquecer <xliff:g id="NAME">^1</xliff:g>?"</string>
     <string name="storage_internal_forget_confirm" msgid="3052483375203727176">"Todas as aplicações, as fotos e os dados armazenados neste <xliff:g id="NAME">^1</xliff:g> são eliminados definitivamente."</string>
-    <string name="storage_detail_apps" msgid="8154648512504196820">"Aplicações"</string>
+    <string name="storage_detail_apps" msgid="8154648512504196820">"Apps"</string>
     <string name="storage_detail_images" msgid="6996202225684468964">"Imagens"</string>
     <string name="storage_detail_videos" msgid="6030983354721080849">"Vídeos"</string>
     <string name="storage_detail_audio" msgid="6011098436589663944">"Áudio"</string>
@@ -1791,7 +1791,7 @@
     <string name="applications_settings_header" msgid="3766501606045211098">"Definições da aplicação"</string>
     <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="recent_app_category_title" msgid="7688788038277126727">"Apps abertas recentemente"</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>
@@ -1850,7 +1850,7 @@
     <string name="filter" msgid="2426943916212457962">"Filtrar"</string>
     <string name="filter_dlg_title" msgid="115313222190512670">"Escolher opções de filtro"</string>
     <string name="filter_apps_all" msgid="3938077534861382701">"Todas as aplicações"</string>
-    <string name="filter_apps_disabled" msgid="5394488790555678117">"Aplicações desativadas"</string>
+    <string name="filter_apps_disabled" msgid="5394488790555678117">"Apps desativadas"</string>
     <string name="filter_apps_third_party" msgid="3985794876813232322">"Transferidas"</string>
     <string name="filter_apps_running" msgid="6852975378502426359">"Em execução"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="3501701148760911442">"Armazenamento USB"</string>
@@ -1896,7 +1896,7 @@
     <string name="instant_app_details_summary" msgid="6384264315914966114">"Mais informações sobre <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_running" msgid="6378418969742957805">"Em execução"</string>
     <string name="app_ops_never_used" msgid="8305262378162525813">"(Nunca utilizado)"</string>
-    <string name="no_default_apps" msgid="4519038578011412532">"Sem Aplicações predefin."</string>
+    <string name="no_default_apps" msgid="4519038578011412532">"Sem Apps predefin."</string>
     <string name="storageuse_settings_title" msgid="3390798597982116048">"Utilização do armazenam."</string>
     <string name="storageuse_settings_summary" msgid="3013328092465903687">"Ver armazenamento utilizado pelas aplicações"</string>
     <string name="service_restarting" msgid="1190995225643385568">"A reiniciar"</string>
@@ -1919,7 +1919,7 @@
     <string name="running_processes_header_title" msgid="6505983796524910467">"Memória do dispositivo"</string>
     <string name="running_processes_header_footer" msgid="6365963816942632771">"Utilização da RAM da aplicação"</string>
     <string name="running_processes_header_system_prefix" msgid="3812089317725567449">"Sistema"</string>
-    <string name="running_processes_header_apps_prefix" msgid="4024980745400903746">"Aplicações"</string>
+    <string name="running_processes_header_apps_prefix" msgid="4024980745400903746">"Apps"</string>
     <string name="running_processes_header_free_prefix" msgid="1092348393136753031">"Livre"</string>
     <string name="running_processes_header_used_prefix" msgid="2984090414986096084">"Utilizada"</string>
     <string name="running_processes_header_cached_prefix" msgid="8398315634778729026">"Em cache"</string>
@@ -2285,9 +2285,9 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="1019583260005768965">"Tablet utilizado mais do que o habitual"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="8304138287288309490">"Dispositivo utilizado mais do que o habitual"</string>
     <string name="battery_tip_high_usage_summary" msgid="5514749872957528189">"Pode ficar sem bateria mais cedo do que o habitual."</string>
-    <string name="battery_tip_dialog_message" product="default" msgid="8453700079047810964">"O seu telemóvel tem sido utilizado com mais frequência do que o habitual. A bateria pode esgotar-se mais cedo do que o esperado.\n\nAplicações mais utilizadas desde a carga completa:"</string>
-    <string name="battery_tip_dialog_message" product="tablet" msgid="6489981050645444068">"O seu tablet tem sido utilizado com mais frequência do que o habitual. A bateria pode esgotar-se mais cedo do que o esperado.\n\nAplicações mais utilizadas desde a carga completa:"</string>
-    <string name="battery_tip_dialog_message" product="device" msgid="6348123094674390337">"O seu dispositivo tem sido utilizado com mais frequência do que o habitual. A bateria pode esgotar-se mais cedo do que o esperado.\n\nAplicações mais utilizadas desde a carga completa:"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="8453700079047810964">"O seu telemóvel tem sido utilizado com mais frequência do que o habitual. A bateria pode esgotar-se mais cedo do que o esperado.\n\nApps mais utilizadas desde a carga completa:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="6489981050645444068">"O seu tablet tem sido utilizado com mais frequência do que o habitual. A bateria pode esgotar-se mais cedo do que o esperado.\n\nApps mais utilizadas desde a carga completa:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="6348123094674390337">"O seu dispositivo tem sido utilizado com mais frequência do que o habitual. A bateria pode esgotar-se mais cedo do que o esperado.\n\nApps mais utilizadas desde a carga completa:"</string>
     <string name="battery_tip_dialog_message_footer" msgid="1118827395267487197">"Inclui atividade em segundo plano de potência elevada"</string>
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="7140926804142734420">
       <item quantity="other">Restringir %1$d aplicações</item>
@@ -2310,8 +2310,8 @@
       <item quantity="one">Restringir a aplicação?</item>
     </plurals>
     <string name="battery_tip_restrict_app_dialog_message" msgid="6905822297507947381">"Para poupar bateria, impeça que a aplicação <xliff:g id="APP">%1$s</xliff:g> consuma bateria em segundo plano. Esta aplicação poderá não funcionar corretamente e as notificações poderão sofrer atrasos."</string>
-    <string name="battery_tip_restrict_apps_less_than_5_dialog_message" msgid="4225881888543582456">"Para poupar bateria, impeça estas aplicações de consumir bateria em segundo plano. As aplicações restringidas poderão não funcionar corretamente e as notificações poderão sofrer atrasos.\n\nAplicações:"</string>
-    <string name="battery_tip_restrict_apps_more_than_5_dialog_message" msgid="1748375562539446634">"Para poupar bateria, impeça que estas aplicações consumam bateria em segundo plano. As aplicações restringidas poderão não funcionar corretamente e as notificações poderão sofrer atrasos.\n\nAplicações:\n<xliff:g id="APP_LIST">%1$s</xliff:g>."</string>
+    <string name="battery_tip_restrict_apps_less_than_5_dialog_message" msgid="4225881888543582456">"Para poupar bateria, impeça estas aplicações de consumir bateria em segundo plano. As aplicações restringidas poderão não funcionar corretamente e as notificações poderão sofrer atrasos.\n\nApps:"</string>
+    <string name="battery_tip_restrict_apps_more_than_5_dialog_message" msgid="1748375562539446634">"Para poupar bateria, impeça que estas aplicações consumam bateria em segundo plano. As aplicações restringidas poderão não funcionar corretamente e as notificações poderão sofrer atrasos.\n\nApps:\n<xliff:g id="APP_LIST">%1$s</xliff:g>."</string>
     <string name="battery_tip_restrict_app_dialog_ok" msgid="2573410775701913487">"Restringir"</string>
     <string name="battery_tip_unrestrict_app_dialog_title" msgid="812458516399125710">"Remover a restrição?"</string>
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="8120081438825031335">"Esta aplicação poderá utilizar a bateria em segundo plano e, por conseguinte, pode ficar sem bateria mais cedo do que o esperado."</string>
@@ -2326,7 +2326,7 @@
     <string name="smart_battery_footer" product="default" msgid="3971715848890205632">"Quando o Battery Manager deteta a existência de aplicações a consumir a bateria rapidamente, tem a opção de restringir estas aplicações. As aplicações restringidas poderão não funcionar corretamente e as notificações poderão sofrer atrasos."</string>
     <string name="smart_battery_footer" product="tablet" msgid="3971715848890205632">"Quando o Battery Manager deteta a existência de aplicações a consumir a bateria rapidamente, tem a opção de restringir estas aplicações. As aplicações restringidas poderão não funcionar corretamente e as notificações poderão sofrer atrasos."</string>
     <string name="smart_battery_footer" product="device" msgid="3971715848890205632">"Quando o Battery Manager deteta a existência de aplicações a consumir a bateria rapidamente, tem a opção de restringir estas aplicações. As aplicações restringidas poderão não funcionar corretamente e as notificações poderão sofrer atrasos."</string>
-    <string name="restricted_app_title" msgid="4957644700640127606">"Aplicações restritas"</string>
+    <string name="restricted_app_title" msgid="4957644700640127606">"Apps restritas"</string>
     <plurals name="restricted_app_summary" formatted="false" msgid="7609538735465186040">
       <item quantity="other">Limiar a utilização da bateria para %1$d aplicações</item>
       <item quantity="one">Limitar a utilização da bateria para %1$d aplicação</item>
@@ -2722,8 +2722,8 @@
     <string name="data_usage_restrict_background_multiuser" product="default" msgid="6846901756455789858">"Se restringir os dados móveis de segundo plano, algumas aplicações e serviços não funcionarão, exceto se estiver ligado a uma rede Wi-Fi.\n\nEsta definição afeta todos os utilizadores neste telemóvel."</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">"aviso"</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">"limite"</font></string>
-    <string name="data_usage_uninstalled_apps" msgid="4152786786140875769">"Aplicações removidas"</string>
-    <string name="data_usage_uninstalled_apps_users" msgid="61092462416505112">"Aplicações e utilizadores removidos"</string>
+    <string name="data_usage_uninstalled_apps" msgid="4152786786140875769">"Apps removidas"</string>
+    <string name="data_usage_uninstalled_apps_users" msgid="61092462416505112">"Apps e utilizadores removidos"</string>
     <string name="data_usage_received_sent" msgid="5532467049487334656">"<xliff:g id="RECEIVED">%1$s</xliff:g> recebidos, <xliff:g id="SENT">%2$s</xliff:g> enviados"</string>
     <string name="data_usage_total_during_range" msgid="7307562900020512747">"<xliff:g id="RANGE">%2$s</xliff:g>: cerca de <xliff:g id="TOTAL">%1$s</xliff:g> utilizado(s)"</string>
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="366118962920532455">"<xliff:g id="RANGE">%2$s</xliff:g>: cerca de <xliff:g id="TOTAL">%1$s</xliff:g> utilizado(s), conforme medido pelo tablet. O registo da utilização de dados do seu operador poderá ser diferente."</string>
@@ -2835,12 +2835,12 @@
       <item quantity="one">Confiar ou remover o certificado</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="9046046586061880100">
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação no seu dispositivo que podem permitir monitorizar a atividade na rede do dispositivo, incluindo emails, aplicações e Websites seguros.\n\nPara obter mais informações acerca destes certificados, contacte o gestor.</item>
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> instalou uma autoridade de certificação no seu dispositivo que pode permitir monitorizar a atividade na rede do dispositivo, incluindo emails, aplicações e Websites seguros.\n\nPara obter mais informações acerca deste certificado, contacte o gestor.</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação no seu dispositivo que podem permitir monitorizar a atividade na rede do dispositivo, incluindo emails, aplicações e Websites seguros.\n\nPara mais informações acerca destes certificados, contacte o gestor.</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> instalou uma autoridade de certificação no seu dispositivo que pode permitir monitorizar a atividade na rede do dispositivo, incluindo emails, aplicações e Websites seguros.\n\nPara mais informações acerca deste certificado, contacte o gestor.</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> instalou autoridades de certificação para o seu perfil de trabalho que podem permitir monitorizar a atividade na rede de trabalho, incluindo emails, aplicações e Websites seguros.\n\nPara obter mais informações acerca destes certificados, contacte o gestor.</item>
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> instalou uma autoridade de certificação para o seu perfil de trabalho que pode permitir monitorizar a atividade na rede de trabalho, incluindo emails, aplicações e Websites seguros.\n\nPara obter mais informações acerca deste certificado, contacte o gestor.</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação para o seu perfil de trabalho que podem permitir monitorizar a atividade na rede de trabalho, incluindo emails, aplicações e Websites seguros.\n\nPara mais informações acerca destes certificados, contacte o gestor.</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> instalou uma autoridade de certificação para o seu perfil de trabalho que pode permitir monitorizar a atividade na rede de trabalho, incluindo emails, aplicações e Websites seguros.\n\nPara mais informações acerca deste certificado, contacte o gestor.</item>
     </plurals>
     <string name="ssl_ca_cert_warning_message" msgid="8692156828262606685">"A sua atividade de rede, incluindo emails, aplicações e Sites seguros, pode ser monitorizada por terceiros.\n\nIsto é possível através de uma credencial fidedigna instalada no seu dispositivo."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="3227175122066058245">
@@ -2912,7 +2912,7 @@
     <string name="emergency_info_title" msgid="1522609271881425375">"Informações de emergência"</string>
     <string name="emergency_info_summary" msgid="7280464759837387342">"Informações e contactos de <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="6871981013736536763">"Permitir aplicações e conteúdo"</string>
-    <string name="apps_with_restrictions_header" msgid="8656739605673756176">"Aplicações com restrições"</string>
+    <string name="apps_with_restrictions_header" msgid="8656739605673756176">"Apps com restrições"</string>
     <string name="apps_with_restrictions_settings_button" msgid="5065896213467171744">"Expandir defin. da aplicação"</string>
     <string name="nfc_payment_settings_title" msgid="5070077706735415291">"Tocar e pagar"</string>
     <string name="nfc_payment_how_it_works" msgid="7607901964687787177">"Como funciona"</string>
@@ -3045,7 +3045,7 @@
     <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>
     <string name="account_dashboard_default_summary" msgid="6822549669771936206">"Nenhuma conta adicionada"</string>
-    <string name="app_default_dashboard_title" msgid="6575301028225232193">"Aplicações predefinidas"</string>
+    <string name="app_default_dashboard_title" msgid="6575301028225232193">"Apps predefinidas"</string>
     <string name="system_dashboard_summary" msgid="6582464466735779394">"Idiomas, gestos, hora, cópia de segurança"</string>
     <string name="search_results_title" msgid="4160717656435503940">"Definições"</string>
     <string name="keywords_wifi" msgid="8477688080895466846">"wifi, Wi-Fi, ligação de rede, Internet, sem fios, dados, wi fi"</string>
@@ -3055,7 +3055,7 @@
     <string name="keywords_time_format" msgid="8265826377023617424">"Utilizar formato de 24 horas"</string>
     <string name="keywords_storage_files" msgid="1995055540202216399">"Transferir"</string>
     <string name="keywords_app_default" msgid="1265502485415708667">"Abrir com"</string>
-    <string name="keywords_applications_settings" msgid="2078776051110952597">"Aplicações"</string>
+    <string name="keywords_applications_settings" msgid="2078776051110952597">"Apps"</string>
     <string name="keywords_time_zone" msgid="1571973084865023954">"fuso horário"</string>
     <string name="keywords_draw_overlay" msgid="3855954419750744775">"Balão de chat"</string>
     <string name="keywords_flashlight" msgid="7733996050628473024">"Lanterna, luz"</string>
@@ -3489,7 +3489,7 @@
     <string name="zen_mode_messages" msgid="2908722562188394107">"Permitir mensagens de texto"</string>
     <string name="zen_mode_messages_footer" msgid="5048951937714668561">"Para se certificar de que as mensagens permitidas emitem som, verifique se o dispositivo está definido para tocar, para vibrar ou para o modo silencioso."</string>
     <string name="zen_mode_custom_messages_footer" msgid="5566007423100361691">"As mensagens de texto recebidas são bloqueadas no horário \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Pode ajustar as definições para permitir que os seus amigos, a sua família ou outras pessoas o contactem."</string>
-    <string name="zen_mode_messages_title" msgid="786261471294055181">"Aplicações de SMS, de MMS e de mensagens"</string>
+    <string name="zen_mode_messages_title" msgid="786261471294055181">"Apps de SMS, de MMS e de mensagens"</string>
     <string name="zen_mode_from_anyone" msgid="7778836826814131083">"De qualquer pessoa"</string>
     <string name="zen_mode_from_contacts" msgid="267034158294332688">"Apenas de contactos"</string>
     <string name="zen_mode_from_starred" msgid="7349984569117392260">"Apenas de contactos com estrela"</string>
@@ -3632,11 +3632,11 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="3477934429220828771">"Nenhuma permissão concedida"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="3901636077467389637">"Nenhuma permissão solicitada"</string>
     <string name="filter_all_apps" msgid="4042756539846043675">"Todas as aplicações"</string>
-    <string name="filter_enabled_apps" msgid="5888459261768538489">"Aplicações instaladas"</string>
+    <string name="filter_enabled_apps" msgid="5888459261768538489">"Apps instaladas"</string>
     <string name="filter_instant_apps" msgid="8087483282854072366">"Apps instantâneas"</string>
     <string name="filter_personal_apps" msgid="3473268022652904457">"Pessoais"</string>
     <string name="filter_work_apps" msgid="4202483998339465542">"De trabalho"</string>
-    <string name="filter_notif_all_apps" msgid="1862666327228804896">"Aplicações: todas"</string>
+    <string name="filter_notif_all_apps" msgid="1862666327228804896">"Apps: todas"</string>
     <string name="filter_notif_blocked_apps" msgid="5694956954776028202">"Desativadas"</string>
     <string name="filter_notif_urgent_channels" msgid="5000735867167027148">"Categorias: importância alta"</string>
     <string name="filter_notif_low_channels" msgid="6859599463135775287">"Categorias: importância baixa"</string>
@@ -3646,7 +3646,7 @@
     <string name="configure_apps" msgid="4066683118857400943">"Configurar aplicações"</string>
     <string name="unknown_app" msgid="2312052973570376877">"Aplicação desconhecida"</string>
     <string name="app_permissions" msgid="3215958256821756086">"Gestor de autorizações"</string>
-    <string name="app_permissions_summary" msgid="8785798165776061594">"Aplicações que utilizam <xliff:g id="APPS">%1$s</xliff:g>"</string>
+    <string name="app_permissions_summary" msgid="8785798165776061594">"Apps que utilizam <xliff:g id="APPS">%1$s</xliff:g>"</string>
     <string name="tap_to_wake" msgid="1902991239401652323">"Tocar para ativar"</string>
     <string name="tap_to_wake_summary" msgid="8485222120721006793">"Tocar duas vezes em qualquer ponto do ecrã para ativar o dispositivo"</string>
     <string name="domain_urls_title" msgid="7939209950373945367">"Links de abertura"</string>
@@ -3712,7 +3712,7 @@
     <string name="high_power_system" msgid="739584574711292753">"Otimização da bateria não disponível"</string>
     <string name="high_power_desc" msgid="333756885680362741">"Não aplique a otimização da bateria. A bateria pode descarregar mais rapidamente."</string>
     <string name="high_power_prompt_title" msgid="2805745781720454052">"Permitir que a aplicação seja sempre executada em segundo plano?"</string>
-    <string name="high_power_prompt_body" msgid="8067395096053552289">"Permitir que a aplicação <xliff:g id="APP_NAME">%1$s</xliff:g> seja sempre executada em segundo plano pode reduzir a autonomia da bateria. \n\nPode alterar esta definição mais tarde em Definições &gt; Aplicações e notificações."</string>
+    <string name="high_power_prompt_body" msgid="8067395096053552289">"Permitir que a aplicação <xliff:g id="APP_NAME">%1$s</xliff:g> seja sempre executada em segundo plano pode reduzir a autonomia da bateria. \n\nPode alterar esta definição mais tarde em Definições &gt; Apps e notificações."</string>
     <string name="battery_summary" msgid="4345690800899981339">"Utilizou <xliff:g id="PERCENTAGE">%1$s</xliff:g> desde o último carregamento completo"</string>
     <string name="battery_power_management" msgid="2853925857548647969">"Gestão de energia"</string>
     <string name="no_battery_summary" msgid="4105932628367471314">"Não utilizou bateria desde o último carregamento completo"</string>
@@ -3801,7 +3801,7 @@
     <string name="accessibility_lock_screen_progress" msgid="8242917828598820049">"<xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g> carateres utilizados"</string>
     <string name="draw_overlay" msgid="2878665072530660668">"Sobrepor a outras aplicações"</string>
     <string name="system_alert_window_settings" msgid="3024330223417646567">"Sobrepor a outras aplicações"</string>
-    <string name="system_alert_window_apps_title" msgid="9188448296493699566">"Aplicações"</string>
+    <string name="system_alert_window_apps_title" msgid="9188448296493699566">"Apps"</string>
     <string name="system_alert_window_access_title" msgid="5187343732185369675">"Sobrepor a outras aplicações"</string>
     <string name="permit_draw_overlay" msgid="9039092257052422344">"Permitir sobreposição a outras aplicações"</string>
     <string name="allow_overlay_description" msgid="6669524816705082807">"Permita que esta aplicação se sobreponha a outras aplicações que esteja a utilizar. Pode interferir com a sua utilização dessas aplicações ou alterar a forma como estas aparecem ou se comportam."</string>
@@ -3809,7 +3809,7 @@
     <string name="keywords_system_alert_window" msgid="3936658600272194599">"janela de alerta do sistema caixa de diálogo sobrepor-se a outras aplicações"</string>
     <string name="overlay_settings" msgid="3325154759946433666">"Sobrepor a outras aplicações"</string>
     <string name="system_alert_window_summary" msgid="7703582115861844158">"<xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g> aplicações autorizadas a sobreporem-se a outras aplicações"</string>
-    <string name="filter_overlay_apps" msgid="6336897660213304743">"Aplicações com autorização"</string>
+    <string name="filter_overlay_apps" msgid="6336897660213304743">"Apps com autorização"</string>
     <string name="app_permission_summary_allowed" msgid="6458476982015518778">"Permitida"</string>
     <string name="app_permission_summary_not_allowed" msgid="1171642541675462584">"Não permitida"</string>
     <string name="keywords_install_other_apps" msgid="5383559540695847668">"instalar aplicações fontes desconhecidas"</string>
@@ -4153,7 +4153,7 @@
     <string name="web_action_enable_summary" msgid="1729016644691793085">"Abrir links nas aplicações, mesmo que não estejam instaladas"</string>
     <string name="web_action_section_title" msgid="5563229447734734662">"Apps instantâneas"</string>
     <string name="instant_apps_settings" msgid="879003203555847537">"Preferências das Apps instantâneas"</string>
-    <string name="domain_url_section_title" msgid="206403507921518321">"Aplicações instaladas"</string>
+    <string name="domain_url_section_title" msgid="206403507921518321">"Apps instaladas"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="2630083316417707308">"O seu armazenamento está agora a ser gerido pelo gestor de armazenamento"</string>
     <string name="account_for_section_header" msgid="5975241715840642563">"Contas de <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="configure_section_header" msgid="6988981883075615136">"Configurar"</string>
@@ -4179,7 +4179,7 @@
     <string name="enterprise_privacy_bug_reports" msgid="283443567328836380">"Relatório de erro mais recente"</string>
     <string name="enterprise_privacy_security_logs" msgid="8936969480449604726">"Registo de segurança mais recente"</string>
     <string name="enterprise_privacy_none" msgid="5990646476868794882">"Nenhuma"</string>
-    <string name="enterprise_privacy_enterprise_installed_packages" msgid="6575025134782391212">"Aplicações instaladas"</string>
+    <string name="enterprise_privacy_enterprise_installed_packages" msgid="6575025134782391212">"Apps instaladas"</string>
     <string name="enterprise_privacy_apps_count_estimation_info" msgid="5020730108878608500">"O número de aplicações é uma estimativa. Pode não incluir as aplicações instaladas fora da Play Store."</string>
     <plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="5161417161943060602">
       <item quantity="other">No mínimo, <xliff:g id="COUNT_1">%d</xliff:g> aplicações</item>
@@ -4188,7 +4188,7 @@
     <string name="enterprise_privacy_location_access" msgid="110406267468274216">"Autoriz. de Localização"</string>
     <string name="enterprise_privacy_microphone_access" msgid="4586428105675460207">"Autorizações do microfone"</string>
     <string name="enterprise_privacy_camera_access" msgid="2366392786153103482">"Autorizações da câmara"</string>
-    <string name="enterprise_privacy_enterprise_set_default_apps" msgid="6142937923758931242">"Aplicações predefinidas"</string>
+    <string name="enterprise_privacy_enterprise_set_default_apps" msgid="6142937923758931242">"Apps predefinidas"</string>
     <plurals name="enterprise_privacy_number_packages" formatted="false" msgid="1480745164313890415">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> aplicações</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> aplicação</item>
@@ -4269,7 +4269,7 @@
     <string name="storage_manager_indicator_on" msgid="5295306384982062320">"Ativado"</string>
     <string name="install_type_instant" msgid="6248487669862821874">"App instantânea"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="7867793739491286374">"Pretende desativar o gestor de armazenamento?"</string>
-    <string name="storage_movies_tv" msgid="7282484273991655296">"Aplicações de filmes e TV"</string>
+    <string name="storage_movies_tv" msgid="7282484273991655296">"Apps de filmes e TV"</string>
     <string name="carrier_provisioning" msgid="3309125279191534469">"Informações de fornecimento do operador"</string>
     <string name="trigger_carrier_provisioning" msgid="6284005970057901477">"Acionar fornecimento do operador"</string>
     <string name="zen_suggestion_title" msgid="2134699720214231950">"Atualizar o modo Não incomodar"</string>
diff --git a/tests/CarDeveloperOptions/res/values-pt/strings.xml b/tests/CarDeveloperOptions/res/values-pt/strings.xml
index 1f678e4..fabc947 100644
--- a/tests/CarDeveloperOptions/res/values-pt/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-pt/strings.xml
@@ -1585,8 +1585,8 @@
     <string name="reset_esim_error_msg" msgid="4716366079119742235">"Os chips transferidos por download não podem ser limpos devido a um erro.\n\nReinicie o dispositivo e tente novamente."</string>
     <string name="master_clear_title" msgid="1560712943955904673">"Limpar todos os dados (redefinir para a configuração original)"</string>
     <string name="master_clear_short_title" msgid="919098101581335101">"Limpar todos os dados"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3432373610755760899">"Essa ação limpará todos os dados do "<b>"armazenamento interno"</b>" do seu tablet, incluindo:\n\n"<li>"sua Conta do Google;"</li>\n<li>"configurações e dados do sistema e dos apps;"</li>\n<li>"apps transferidos."</li></string>
-    <string name="master_clear_desc" product="default" msgid="8765543541962866697">"Essa ação limpará todos os dados do "<b>"armazenamento interno"</b>" do seu smartphone, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos apps"</li>\n<li>"Apps transferidos"</li></string>
+    <string name="master_clear_desc" product="tablet" msgid="3432373610755760899">"Essa ação apagará todos os dados do "<b>"armazenamento interno"</b>" do seu tablet, incluindo:\n\n"<li>"sua Conta do Google;"</li>\n<li>"configurações e dados do sistema e dos apps;"</li>\n<li>"apps transferidos."</li></string>
+    <string name="master_clear_desc" product="default" msgid="8765543541962866697">"Essa ação apagará todos os dados do "<b>"armazenamento interno"</b>" do seu smartphone, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos apps"</li>\n<li>"Apps transferidos"</li></string>
     <string name="master_clear_accounts" product="default" msgid="3432884235445405376">\n\n"No momento você está conectado às seguintes contas:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5993259656117566767">\n\n"Há outros usuários presentes neste dispositivo.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="3947303501615091903"><li>"Músicas"</li>\n<li>"Fotos"</li>\n<li>"Outros dados do usuário"</li></string>
@@ -1643,7 +1643,7 @@
     <string name="network_scorer_change_active_dialog_text" msgid="4264089809189760730">"Usar <xliff:g id="NEW_APP">%1$s</xliff:g> em vez de <xliff:g id="CURRENT_APP">%2$s</xliff:g> para gerenciar suas conexões de rede?"</string>
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="6394483538843474495">"Usar <xliff:g id="NEW_APP">%s</xliff:g> para gerenciar suas conexões de rede?"</string>
     <string name="mobile_unknown_sim_operator" msgid="872589370085135817">"Operadora do chip desconhecida"</string>
-    <string name="mobile_no_provisioning_url" msgid="3216517414902166131">"<xliff:g id="OPERATOR">%1$s</xliff:g> não tem um website de aprovisionamento conhecido"</string>
+    <string name="mobile_no_provisioning_url" msgid="3216517414902166131">"<xliff:g id="OPERATOR">%1$s</xliff:g> não tem um website de provisionamento conhecido"</string>
     <string name="mobile_insert_sim_card" msgid="7594550403454243732">"Insira o chip e reinicie"</string>
     <string name="mobile_connect_to_internet" msgid="6031886097365170913">"Conecte-se à Internet"</string>
     <string name="location_title" msgid="8664674161765477168">"Meu Local"</string>
@@ -1755,7 +1755,7 @@
     <string name="lockpattern_recording_inprogress" msgid="4060818382176523671">"Levante o dedo ao terminar"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="6374760294545431845">"Conecte pelo menos <xliff:g id="NUMBER">%d</xliff:g> pontos. Tente novamente."</string>
     <string name="lockpattern_pattern_entered_header" msgid="2108106638322637851">"Padrão registrado"</string>
-    <string name="lockpattern_need_to_confirm" msgid="4079482507985867389">"Desenhe o padrão novamente para confirmar"</string>
+    <string name="lockpattern_need_to_confirm" msgid="4079482507985867389">"Desenhe o padrão de novo para confirmar"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="5603156929428721407">"Seu novo padrão de desbloqueio"</string>
     <string name="lockpattern_confirm_button_text" msgid="7059311304112902598">"Confirmar"</string>
     <string name="lockpattern_restart_button_text" msgid="4322968353922529868">"Desenhar novamente"</string>
@@ -3753,7 +3753,7 @@
     <string name="usb_summary_photo_transfers" msgid="4743028167400644354">"PTP (fotos)"</string>
     <string name="usb_summary_MIDI" msgid="5540604166270861247">"MIDI"</string>
     <string name="usb_summary_file_transfers_power" msgid="1684501026426766867">"Transferência de arquivo e fornecimento de energia"</string>
-    <string name="usb_summary_tether_power" msgid="5684170912136320002">"Tethering USB e fornecimento de energia"</string>
+    <string name="usb_summary_tether_power" msgid="5684170912136320002">"Tethering por USB e fornecimento de energia"</string>
     <string name="usb_summary_photo_transfers_power" msgid="4424106272137720464">"PTP e fornecimento de energia"</string>
     <string name="usb_summary_MIDI_power" msgid="7685597621357005180">"MIDI e fornecimento de energia"</string>
     <string name="background_check_pref" msgid="664081406854758392">"Verificação em segundo plano"</string>
@@ -4052,7 +4052,7 @@
     <string name="display_cutout_emulation_keywords" msgid="6795671536772871439">"corte de tela, entalhe"</string>
     <string name="overlay_option_device_default" msgid="165508753381657697">"Padrão do dispositivo"</string>
     <string name="overlay_toast_failed_to_apply" msgid="5692251825129250040">"Falha ao aplicar sobreposição"</string>
-    <string name="special_access" msgid="1453926335914696206">"Acesso especial a apps"</string>
+    <string name="special_access" msgid="1453926335914696206">"Acesso especial para apps"</string>
     <plurals name="special_access_summary" formatted="false" msgid="5182092345063909346">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> app pode usar dados ilimitados</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps podem usar dados ilimitados</item>
@@ -4143,7 +4143,7 @@
     <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="948946491233738823">"Ver notificações rapidamente"</string>
     <string name="gesture_setting_on" msgid="7573680730101327866">"Ativado"</string>
     <string name="gesture_setting_off" msgid="2540159841716890511">"Desativado"</string>
-    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="7233244080078311793">"O bootloader já está desbloqueado"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="7233244080078311793">"O carregador de inicialização já está desbloqueado"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="262986780389836168">"Conecte-se à Internet primeiro"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="3331374502670483142">"Conecte-se à Internet ou entre em contato com sua operadora"</string>
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="5223278198179877704">"Indisponível em dispositivos bloqueados pela operadora"</string>
@@ -4270,8 +4270,8 @@
     <string name="install_type_instant" msgid="6248487669862821874">"App instantâneo"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="7867793739491286374">"Desativar o gerenciador de armazenamento?"</string>
     <string name="storage_movies_tv" msgid="7282484273991655296">"Apps de filmes e TV"</string>
-    <string name="carrier_provisioning" msgid="3309125279191534469">"Informações de aprovisionamento da operadora"</string>
-    <string name="trigger_carrier_provisioning" msgid="6284005970057901477">"Acionar aprovisionamento da operadora"</string>
+    <string name="carrier_provisioning" msgid="3309125279191534469">"Informações de provisionamento da operadora"</string>
+    <string name="trigger_carrier_provisioning" msgid="6284005970057901477">"Acionar provisionamento da operadora"</string>
     <string name="zen_suggestion_title" msgid="2134699720214231950">"Atualizar o modo Não perturbe"</string>
     <string name="zen_suggestion_summary" msgid="4041062903237952737">"Pausar notificações para manter o foco"</string>
     <string name="disabled_low_ram_device" msgid="4958060232123741721">"Este recurso não está disponível neste dispositivo"</string>
diff --git a/tests/CarDeveloperOptions/res/values-ro/strings.xml b/tests/CarDeveloperOptions/res/values-ro/strings.xml
index c91c306..2eee467 100644
--- a/tests/CarDeveloperOptions/res/values-ro/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ro/strings.xml
@@ -4485,8 +4485,8 @@
     <string name="mobile_network_list_add_more" msgid="65420172175416318">"Adăugați mai multe"</string>
     <string name="mobile_network_active_sim" msgid="7660119090716084589">"Activ/SIM"</string>
     <string name="mobile_network_inactive_sim" msgid="8296195866147486039">"Inactiv/SIM"</string>
-    <string name="mobile_network_active_esim" msgid="2919290915755581140">"Activ/SIM-ul descărcat"</string>
-    <string name="mobile_network_inactive_esim" msgid="6525747163540293028">"Inactiv/SIM descărcat"</string>
+    <string name="mobile_network_active_esim" msgid="2919290915755581140">"Activ / SIM descărcat"</string>
+    <string name="mobile_network_inactive_esim" msgid="6525747163540293028">"Inactiv / SIM descărcat"</string>
     <string name="mobile_network_sim_name" msgid="8228870017368926761">"Numele cardului SIM"</string>
     <string name="mobile_network_sim_name_rename" msgid="4810736493612513152">"Redenumiți"</string>
     <string name="mobile_network_use_sim_on" msgid="1944823242539751387">"Folosiți cardul SIM"</string>
diff --git a/tests/CarDeveloperOptions/res/values-ru/strings.xml b/tests/CarDeveloperOptions/res/values-ru/strings.xml
index 50e4d34..93d7afb 100644
--- a/tests/CarDeveloperOptions/res/values-ru/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ru/strings.xml
@@ -2563,7 +2563,7 @@
     <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_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>
@@ -4601,7 +4601,7 @@
     <string name="mobile_network_mode_error" msgid="6818434186286086554">"Недопустимый режим сети (<xliff:g id="NETWORKMODEID">%1$d</xliff:g>). Не используется."</string>
     <string name="mobile_network_apn_title" msgid="5628635067747404382">"Точки доступа"</string>
     <string name="manual_mode_disallowed_summary" msgid="799800630000340665">"Недоступны при подключении к <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
-    <string name="emergency_info_contextual_card_summary" msgid="5541444321969803486">"Медицинская информация, контакты для чрезвычайных ситуаций"</string>
+    <string name="emergency_info_contextual_card_summary" msgid="5541444321969803486">"Медицинская информация, контакты для экстренных случаев"</string>
     <string name="see_more" msgid="7463940160389802632">"Ещё"</string>
     <string name="see_less" msgid="3718892257002813387">"Скрыть"</string>
     <string name="network_connection_request_dialog_title" msgid="3150489262902506588">"Устройство для работы с приложением \"<xliff:g id="APPNAME">%1$s</xliff:g>\""</string>
diff --git a/tests/CarDeveloperOptions/res/values-sk/strings.xml b/tests/CarDeveloperOptions/res/values-sk/strings.xml
index 0491408..18a2f33 100644
--- a/tests/CarDeveloperOptions/res/values-sk/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-sk/strings.xml
@@ -180,7 +180,7 @@
     <string name="connected_device_available_call_title" msgid="6774859446815858428">"Dostupné telefonické zariadenia"</string>
     <string name="connected_device_connected_title" msgid="6255107326608785482">"Aktuálne pripojené"</string>
     <string name="connected_device_saved_title" msgid="8270136893488475163">"Uložené zariadenia"</string>
-    <string name="connected_device_add_device_summary" msgid="7960491471270158891">"Zapne sa Bluetooth s cieľom párovania"</string>
+    <string name="connected_device_add_device_summary" msgid="7960491471270158891">"Bluetooth sa zapne, aby prebehlo párovanie"</string>
     <string name="connected_device_connections_title" msgid="9205000271382018428">"Nastavenia pripojenia"</string>
     <string name="connected_device_previously_connected_title" msgid="225918223397410428">"V minulosti pripojené zariadenia"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="2018789662358162716">"Predtým pripojené zariadenia"</string>
@@ -344,7 +344,7 @@
     <string name="zone_info_offset_and_name" msgid="6043432339008569441">"<xliff:g id="TIME_TYPE">%2$s</xliff:g> (<xliff:g id="OFFSET">%1$s</xliff:g>)"</string>
     <string name="zone_info_footer" msgid="1959594483423380962">"Používa <xliff:g id="OFFSET_AND_NAME">%1$s</xliff:g>. Čas <xliff:g id="DST_TIME_TYPE">%2$s</xliff:g> sa začína <xliff:g id="TRANSITION_DATE">%3$s</xliff:g>."</string>
     <string name="zone_info_footer_no_dst" msgid="7853616006981555000">"Používa <xliff:g id="OFFSET_AND_NAME">%1$s</xliff:g>. Nepoužíva letný čas."</string>
-    <string name="zone_time_type_dst" msgid="7812605402646684853">"Obdobie letného času"</string>
+    <string name="zone_time_type_dst" msgid="7812605402646684853">"Letný čas"</string>
     <string name="zone_time_type_standard" msgid="4093967611947328688">"Štandardný čas"</string>
     <string name="zone_menu_by_region" msgid="8211384017117296924">"Vybrať podľa oblasti"</string>
     <string name="zone_menu_by_offset" msgid="6538342360925785227">"Vybrať podľa čas. posunu UTC"</string>
@@ -1102,7 +1102,7 @@
     <string name="wifi_hotspot_name_summary_connecting" msgid="5176787959408511889">"Zapína sa hotspot <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="8387768642326756749">"Iné zariadenia sa môžu pripojiť k hotspotu <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="4289338152595154889">"Heslo hotspotu"</string>
-    <string name="wifi_hotspot_ap_band_title" msgid="3485744480410441949">"Pásmo prístup. bodu"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="3485744480410441949">"Pásmo prístupového bodu"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="3876006922622827363">"Použite hotspot na vytvorenie siete Wi‑Fi pre ostatné zariadenia. Hotspot poskytuje internet pomocou mobilného dátového pripojenia. Môžu vám byť účtované ďalšie poplatky za mobilné dáta."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="3339582350894639261">"Aplikácie tiež môžu vytvoriť hostpot na zdieľanie obsahu so zariadeniami v okolí."</string>
     <string name="wifi_hotspot_auto_off_title" msgid="7416022590415189590">"Hotspot automaticky vypínať"</string>
@@ -1437,8 +1437,8 @@
     <string name="dlg_confirm_unmount_text" product="default" msgid="4099391737780732622">"Ak odpojíte SD kartu, niektoré používané aplikácie môžu byť zastavené a nebudú k dispozícii, kým SD kartu znova nepripojíte."</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">"Úložisko USB sa nepodarilo odpojiť. Skúste to znova neskôr."</string>
-    <string name="dlg_error_unmount_text" product="default" msgid="8243603872321575219">"SD kartu sa nepodarilo odpojiť. Skúste to znova neskôr."</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="4710773826053117136">"Úložisko USB sa nepodarilo odpojiť. Skúste to neskôr."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="8243603872321575219">"SD kartu sa nepodarilo odpojiť. Skúste to neskôr."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="2460118115494815052">"Ukladací priestor USB bude odpojený."</string>
     <string name="unmount_inform_text" product="default" msgid="6467461731634304997">"SD karta bude odpojená."</string>
     <string name="sd_ejecting_title" msgid="595074246815112145">"Odpájanie"</string>
@@ -1606,7 +1606,7 @@
     <string name="restore_default_apn" msgid="7195266404077471007">"Prebieha obnovovanie predvolených nastavení názvu prístupového bodu (APN)."</string>
     <string name="menu_restore" msgid="3799288817317293115">"Resetovať na predvolené"</string>
     <string name="restore_default_apn_completed" msgid="5671734152740058937">"Predvolené nastavenia prístupových bodov boli obnovené"</string>
-    <string name="reset_dashboard_title" msgid="7084966342252178530">"Možnosti resetovania"</string>
+    <string name="reset_dashboard_title" msgid="7084966342252178530">"Možnosti resetu"</string>
     <string name="reset_dashboard_summary" msgid="8778383341461126642">"Sieť, aplikácie a zariadenie sa dajú resetovať"</string>
     <string name="reset_network_title" msgid="8944059136930806211">"Resetovať Wi‑Fi, dáta a Bluetooth"</string>
     <string name="reset_network_desc" msgid="4982633363916261109">"Touto akciou obnovíte nastavenia všetkých sietí vrátane\n\n"<li>"Wi‑Fi"</li>\n<li>"mobilnej siete"</li>\n<li>"siete Bluetooth"</li></string>
@@ -1618,10 +1618,10 @@
     <string name="reset_network_final_button_text" msgid="345255333127794393">"Resetovať nastavenia"</string>
     <string name="reset_network_confirm_title" msgid="2432145031070536008">"Resetovať?"</string>
     <string name="network_reset_not_available" msgid="6146655531868016281">"Tento používateľ nemôže resetovať nastavenia siete"</string>
-    <string name="reset_network_complete_toast" msgid="128225929536005495">"Sieťové nastavenia boli obnovené"</string>
+    <string name="reset_network_complete_toast" msgid="128225929536005495">"Nastavenia sietí boli resetované"</string>
     <string name="reset_esim_error_title" msgid="4728931209471875632">"SIM karty sa nedajú vymazať"</string>
     <string name="reset_esim_error_msg" msgid="4716366079119742235">"Stiahnuté SIM karty sa nedajú vymazať z dôvodu chyby.\n\nReštartujte zariadenie a skúste to znova."</string>
-    <string name="master_clear_title" msgid="1560712943955904673">"Vymazať dáta (obnova výr. nastavení)"</string>
+    <string name="master_clear_title" msgid="1560712943955904673">"Vymazať dáta (obn. výr. nast.)"</string>
     <string name="master_clear_short_title" msgid="919098101581335101">"Vymazať dáta (obn. výr. nast.)"</string>
     <string name="master_clear_desc" product="tablet" msgid="3432373610755760899">"Týmto vymažete všetky dáta z "<b>"interného úložiska"</b>" tabletu, ako napríklad:\n\n"<li>"Účet Google"</li>\n<li>"Dáta aj nastavenia systému a aplikácií"</li>\n<li>"Stiahnuté aplikácie"</li></string>
     <string name="master_clear_desc" product="default" msgid="8765543541962866697">"Táto operácia vymaže všetky dáta v "<b>"internom úložisku"</b>" telefónu:\n\n"<li>"Účet Google"</li>\n<li>"Dáta aj nastavenia systému a aplikácií"</li>\n<li>"Stiahnuté aplikácie"</li></string>
@@ -1636,13 +1636,13 @@
     <string name="erase_external_storage" product="default" msgid="194249742376770215">"Vymazať SD kartu"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="8020275102431496261">"Vymazať všetky dáta v internom úložisku USB, napríklad hudbu a fotky"</string>
     <string name="erase_external_storage_description" product="default" msgid="5029355708082861798">"Vymazať všetky dáta na SD karte, napríklad hudbu a fotky"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="8000547818499182920">"Vymazať všetky údaje"</string>
-    <string name="master_clear_button_text" product="default" msgid="8000547818499182920">"Vymazať všetky údaje"</string>
+    <string name="master_clear_button_text" product="tablet" msgid="8000547818499182920">"Vymazať všetky dáta"</string>
+    <string name="master_clear_button_text" product="default" msgid="8000547818499182920">"Vymazať všetky dáta"</string>
     <string name="master_clear_final_desc" msgid="5189365498015339294">"Všetky vaše osobné údaje a stiahnuté aplikácie budú odstránené. Túto akciu nie je možné vrátiť späť."</string>
     <string name="master_clear_final_desc_esim" msgid="3058919823436953662">"Všetky vaše osobné údaje vrátane stiahnutých aplikácií a SIM kariet budú odstránené. Túto akciu nie je možné vrátiť späť."</string>
     <string name="master_clear_final_button_text" msgid="866772743886027768">"Vymazať všetko"</string>
     <string name="master_clear_failed" msgid="7588397453984229892">"Pokus o obnovenie sa neuskutočnil, pretože služba System Clear nie je k dispozícii."</string>
-    <string name="master_clear_confirm_title" msgid="698328669893512402">"Vymazať všetky údaje?"</string>
+    <string name="master_clear_confirm_title" msgid="698328669893512402">"Vymazať všetky dáta?"</string>
     <string name="master_clear_not_available" msgid="4676613348163652454">"Obnovenie výrobných nastavení nie je dostupné pre tohto používateľa"</string>
     <string name="master_clear_progress_title" msgid="378953167274114857">"Prebieha vymazávanie"</string>
     <string name="master_clear_progress_text" msgid="5418958116008976218">"Čakajte..."</string>
@@ -1886,7 +1886,7 @@
     <string name="default_emergency_app" msgid="286530070173495823">"Aplikácia pre tiesňové volania"</string>
     <string name="reset_app_preferences" msgid="1426500030595212077">"Resetovať nastavenia aplikácií"</string>
     <string name="reset_app_preferences_title" msgid="792909865493673598">"Chcete resetovať nastavenia aplikácií?"</string>
-    <string name="reset_app_preferences_desc" msgid="7935273005301096031">"Touto akciou resetujete predvoľby položiek:\n\n "<li>"deaktivované aplikácie,"</li>\n" "<li>"deaktivované upozornenia aplikácií,"</li>\n" "<li>"predvolené aplikácie pre rôzne akcie,"</li>\n" "<li>"obmedzenia dátových prenosov na pozadí pre aplikácie,"</li>\n" "<li>"akékoľvek obmedzenia povolení."</li>\n\n" Neprídete o žiadne dáta v aplikáciách."</string>
+    <string name="reset_app_preferences_desc" msgid="7935273005301096031">"Touto akciou resetujete nasledujúce nastavenia:\n\n "<li>"deaktivované aplikácie,"</li>\n" "<li>"deaktivované upozornenia aplikácií,"</li>\n" "<li>"predvolené aplikácie pre rôzne akcie,"</li>\n" "<li>"obmedzenia dátových prenosov na pozadí pre aplikácie,"</li>\n" "<li>"všetky obmedzenia povolení."</li>\n\n" Neprídete o žiadne dáta aplikácií."</string>
     <string name="reset_app_preferences_button" msgid="2041894727477934656">"Obnoviť aplikácie"</string>
     <string name="manage_space_text" msgid="6166469422303124302">"Správa pamäte"</string>
     <string name="filter" msgid="2426943916212457962">"Filtrovať"</string>
@@ -2871,7 +2871,7 @@
     <string name="vpn_lockdown_summary" msgid="6770030025737770861">"Vyberte profil VPN, ku ktorému chcete mať vždy pripojenie. Sieťová premávka bude povolená len v prípade pripojenia k tejto sieti VPN."</string>
     <string name="vpn_lockdown_none" msgid="3789288793603394679">"Žiadna"</string>
     <string name="vpn_lockdown_config_error" msgid="8761770968704589885">"Vždy zapnutá sieť VPN vyžaduje adresu IP pre server aj DNS."</string>
-    <string name="vpn_no_network" msgid="8313250136194588023">"Nie je k dispozícii žiadne sieťové pripojenie. Skúste to znova neskôr."</string>
+    <string name="vpn_no_network" msgid="8313250136194588023">"Nie je k dispozícii žiadne sieťové pripojenie. Skúste to neskôr."</string>
     <string name="vpn_disconnected" msgid="4597953053220332539">"Odpojiť od siete VPN"</string>
     <string name="vpn_disconnected_summary" msgid="3784118965271376808">"Žiadne"</string>
     <string name="vpn_missing_cert" msgid="2713254242731992902">"Chýba certifikát. Skúste upraviť profil."</string>
@@ -2951,7 +2951,7 @@
     <string name="user_add_profile_item_title" msgid="4932743891449790664">"Obmedzený profil"</string>
     <string name="user_add_user_title" msgid="2320897397066676472">"Pridať nového používateľa?"</string>
     <string name="user_add_user_message_long" msgid="686637203224195465">"Vytvorením ďalších používateľov môžete toto zariadenie zdieľať s inými ľuďmi. Každý používateľ má svoje prostredie, ktoré si môže prispôsobiť vlastnými aplikáciami, tapetou atď. Používatelia tiež môžu upraviť nastavenia zariadenia (napr. Wi-Fi), ktoré ovplyvnia všetkých používateľov.\n\nKeď pridáte nového používateľa, musí si nastaviť vlastný priestor.\n\nAkýkoľvek používateľ môže aktualizovať aplikácie všetkých používateľov. Nastavenia dostupnosti a služby sa nemusia preniesť novému používateľovi."</string>
-    <string name="user_add_user_message_short" msgid="1802594476285458254">"Keď pridáte nového používateľa, musí si nastaviť vlastný priestor.\n\nAkýkoľvek používateľ môže aktualizovať aplikácie všetkých ostatných používateľov."</string>
+    <string name="user_add_user_message_short" msgid="1802594476285458254">"Keď pridáte nového používateľa, musí si sám nastaviť vlastný priestor.\n\nKaždý používateľ môže aktualizovať aplikácie pre všetkých ostatných používateľov."</string>
     <string name="user_setup_dialog_title" msgid="6748950002206392396">"Chcete teraz nastaviť používateľa?"</string>
     <string name="user_setup_dialog_message" msgid="2988559933258353919">"Uistite sa, že je daná osoba k dispozícii a môže si na zariadení nastaviť svoj priestor."</string>
     <string name="user_setup_profile_dialog_message" msgid="7611900802824048526">"Nastaviť profil?"</string>
@@ -2966,7 +2966,7 @@
     <string name="user_new_user_name" msgid="3880395219777884838">"Nový používateľ"</string>
     <string name="user_new_profile_name" msgid="3074939718101489937">"Nový profil"</string>
     <string name="user_confirm_remove_self_title" msgid="6739480453680217543">"Chcete odstrániť svoj profil?"</string>
-    <string name="user_confirm_remove_title" msgid="1034498514019462084">"Chcete odstrániť používateľa?"</string>
+    <string name="user_confirm_remove_title" msgid="1034498514019462084">"Odobrať tohto používateľa?"</string>
     <string name="user_profile_confirm_remove_title" msgid="6138684743385947063">"Odstrániť tento profil?"</string>
     <string name="work_profile_confirm_remove_title" msgid="3168910958076735800">"Odstrániť pracovný profil?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="2889456786320157545">"Prídete o svoj priestor a dáta v tomto tablete. Táto akcia sa nedá vrátiť späť."</string>
@@ -4533,7 +4533,7 @@
     <string name="load_networks_progress" msgid="8155227447618984212">"Hľadá sa…"</string>
     <string name="register_on_network" msgid="423929472895070205">"Prebieha registrácia v sieti <xliff:g id="NETWORK">%s</xliff:g>…"</string>
     <string name="not_allowed" msgid="3047048893776257915">"Vaša SIM karta nepovoľuje pripojenie k tejto sieti."</string>
-    <string name="connect_later" msgid="4742215038190504328">"V tejto chvíli sa nedá pripojiť k sieti. Skúste to znova neskôr."</string>
+    <string name="connect_later" msgid="4742215038190504328">"V tejto chvíli sa nedá pripojiť k sieti. Skúste to neskôr."</string>
     <string name="registration_done" msgid="8635020229073784432">"Prihlásenie k sieti prebehlo úspešne."</string>
     <string name="select_automatically" msgid="3421552364854534865">"Vybrať sieť automaticky"</string>
     <string name="carrier_settings_title" msgid="7989949967020825268">"Nastavenia operátora"</string>
@@ -4567,7 +4567,7 @@
     <string name="mobile_network_inactive_esim" msgid="6525747163540293028">"Neaktívne / stiahnutá SIM karta"</string>
     <string name="mobile_network_sim_name" msgid="8228870017368926761">"Názov SIM karty"</string>
     <string name="mobile_network_sim_name_rename" msgid="4810736493612513152">"Premenovať"</string>
-    <string name="mobile_network_use_sim_on" msgid="1944823242539751387">"Použiť SIM"</string>
+    <string name="mobile_network_use_sim_on" msgid="1944823242539751387">"Používať SIM kartu"</string>
     <string name="mobile_network_use_sim_off" msgid="2077820358051946635">"Vypnuté"</string>
     <string name="mobile_network_esim_swap_confirm_title" msgid="6077154427380613615">"Chcete prepnúť na operátora <xliff:g id="CARRIER">%1$s</xliff:g>?"</string>
     <string name="mobile_network_esim_swap_confirm_body" msgid="1192274915146275063">"V jednej chvíli môže byť aktívna iba jedna stiahnutá SIM karta.\n\nPrepnutím na operátora <xliff:g id="CARRIER1">%1$s</xliff:g> nezrušíte službu operátora <xliff:g id="CARRIER2">%2$s</xliff:g>."</string>
diff --git a/tests/CarDeveloperOptions/res/values-sl/strings.xml b/tests/CarDeveloperOptions/res/values-sl/strings.xml
index 59d5c2e..eb67177 100644
--- a/tests/CarDeveloperOptions/res/values-sl/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-sl/strings.xml
@@ -1093,7 +1093,7 @@
     <string name="wifi_p2p_cancel_connect_message" msgid="3752679335020392154">"Ali želite preklicati povabilo za povezavo z napravo <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="3206660449067701089">"Želite pozabiti to skupino?"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="12062341344410520">"Dostopna točka Wi-Fi"</string>
-    <string name="wifi_hotspot_off_subtext" msgid="6177054857136221058">"Internetna povezava ali vsebina ni v skupni rabi z drugimi napravami"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="6177054857136221058">"Internetna povezava ali vsebina ni deljena z drugimi napravami"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="71421730039785897">"Skupna raba internetne povezave tega tabličnega računalnika prek dostopne točke"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="8914285514605049879">"Skupna raba internetne povezave tega telefona prek dostopne točke"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="7415381343846704553">"Aplikacija daje vsebino v skupno rabo. Če želite omogočiti skupno rabo internetne povezave, dostopno točko izklopite in znova vklopite."</string>
@@ -1608,7 +1608,7 @@
     <string name="restore_default_apn_completed" msgid="5671734152740058937">"Ponastavitev privzetih nastavitev APN-jev končana"</string>
     <string name="reset_dashboard_title" msgid="7084966342252178530">"Možnosti ponastavitve"</string>
     <string name="reset_dashboard_summary" msgid="8778383341461126642">"Ponastavite lahko omrežje, aplikacije ali napravo"</string>
-    <string name="reset_network_title" msgid="8944059136930806211">"Ponastavi Wi-Fi, mob. podatke in Bluetooth"</string>
+    <string name="reset_network_title" msgid="8944059136930806211">"Ponastavi Wi-Fi, mobilne podatke in Bluetooth"</string>
     <string name="reset_network_desc" msgid="4982633363916261109">"S tem boste ponastavili vse omrežne nastavitve, vključno s temi:\n\n"<li>"Wi‑Fi"</li>\n<li>"Prenos podatkov v mobilnih omrežjih"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_esim_title" msgid="7630781767040831893">"Brisanje prenesenih kartic SIM"</string>
     <string name="reset_esim_desc" msgid="433226911566802">"Če želite prenesti nadomestne kartice SIM, se obrnite na operaterja. S tem ne boste prekinili nobenega naročniškega paketa za mobilno telefonijo."</string>
@@ -2501,7 +2501,7 @@
     <string name="battery_detail_since_full_charge" msgid="3814176986148084378">"Razčlenitev od zadnje napolnjenosti akumulatorja"</string>
     <string name="battery_last_full_charge" msgid="5624033030647170717">"Zadnja polna napolnjenost"</string>
     <string name="battery_full_charge_last" msgid="4614554109170251301">"Polno napolnjena naprava deluje približno"</string>
-    <string name="battery_footer_summary" msgid="4828444679643906943">"Podatki o uporabi akumulatorja so približni in se lahko spremenijo glede na uporabo naprave"</string>
+    <string name="battery_footer_summary" msgid="4828444679643906943">"Podatki o porabi baterije so približni in se lahko spremenijo glede na uporabo naprave."</string>
     <string name="battery_detail_foreground" msgid="6616408559186553085">"Med aktivno uporabo"</string>
     <string name="battery_detail_background" msgid="7938146832943604280">"Med izvajanjem v ozadju"</string>
     <string name="battery_detail_power_usage" msgid="3606930232257489212">"Poraba akumulatorja"</string>
diff --git a/tests/CarDeveloperOptions/res/values-sq/strings.xml b/tests/CarDeveloperOptions/res/values-sq/strings.xml
index ac2c3bc..e39b125 100644
--- a/tests/CarDeveloperOptions/res/values-sq/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-sq/strings.xml
@@ -264,7 +264,7 @@
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="7959964366461613091">"Hapësira ruajtëse e USB-së e lidhur është vetëm për lexim."</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="8854112253788893415">"Karta SD e lidhur vetëm për lexim."</string>
     <string name="skip_label" msgid="8067961347551157478">"Kapërce"</string>
-    <string name="next_label" msgid="4710056309804362410">"Përpara"</string>
+    <string name="next_label" msgid="4710056309804362410">"Para"</string>
     <string name="language_picker_title" msgid="7807759931261107686">"Gjuhët"</string>
     <string name="locale_remove_menu" msgid="3395565699934985486">"Hiqe"</string>
     <string name="add_a_language" msgid="4103889327406274800">"Shto gjuhë"</string>
@@ -445,7 +445,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="9168637333731599827">"Anulo"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="271662150372486535">"Vazhdo"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="756928427429893070">"Kapërce"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="4125977169169671144">"Përpara"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="4125977169169671144">"Para"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="763018850721691594">"Të kapërcehet gjurma e gishtit?"</string>
     <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="8849928362049018680">"Konfigurimi i gjurmëve të gishtave zgjat vetëm një ose dy minuta. Nëse e kapërcen këtë, mund të shtosh gjurmën tënde të gishtit më vonë te cilësimet."</string>
     <string name="lock_screen_intro_skip_title" msgid="5307431665496346914">"Të kapërcehet kyçja e ekranit?"</string>
@@ -491,7 +491,7 @@
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="498951203761192366">"U arrit kufiri kohor për regjistrimin e gjurmës së gishtit. Provo përsëri."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="7896295829530444810">"Regjistrimi i gjurmës së gishtit nuk funksionoi. Provo përsëri ose përdor një gisht tjetër."</string>
     <string name="fingerprint_enroll_button_add" msgid="6335782936874996629">"Shto një tjetër"</string>
-    <string name="fingerprint_enroll_button_next" msgid="6419214079104413695">"Përpara"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6419214079104413695">"Para"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="5831834311961551423">"Përveç shkyçjes së telefonit, gjurmën e gishtit mund ta përdorësh edhe për të autorizuar blerjet dhe qasjen në aplikacione. "<annotation id="url">"Mëso më shumë"</annotation></string>
     <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7954742554236652690">" Opsioni i kyçjes së ekranit është çaktivizuar. Kontakto me administratorin e organizatës tënde për të mësuar më shumë. "<annotation id="admin_details">"Më shumë detaje"</annotation>\n\n"Mund të vazhdosh të përdorësh gjurmën e gishtit për të autorizuar blerjet dhe për qasje në aplikacion. "<annotation id="url">"Mëso më shumë"</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1670703069782212223">"Ngrije gishtin dhe më pas preke përsëri sensorin"</string>
@@ -709,7 +709,7 @@
     <string name="lockpassword_clear_label" msgid="3201458533657963554">"Pastro"</string>
     <string name="lockpassword_credential_changed" msgid="5183961439209866170">"Kyçja e ekranit është ndryshuar tashmë. Provo përsëri me kyçjen e re të ekranit."</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="450401426127674369">"Anulo"</string>
-    <string name="lockpattern_tutorial_continue_label" msgid="8474690922559443018">"Përpara"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="8474690922559443018">"Para"</string>
     <string name="lock_setup" msgid="8710689848703935088">"Konfigurimi përfundoi."</string>
     <string name="manage_device_admin" msgid="322047441168191695">"Apl. e admin. të pajisjes"</string>
     <string name="number_of_device_admins_none" msgid="8519193548630223132">"Asnjë aplikacion aktiv"</string>
@@ -760,8 +760,8 @@
     <string name="bluetooth_device_context_connect" msgid="1812090541371432890">"Lidh"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8085015949275771802">"Shkëput"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="1503322591778810032">"Ҫifto dhe lidh"</string>
-    <string name="bluetooth_device_context_unpair" msgid="250588431708253041">"Hiq nga çiftimi"</string>
-    <string name="bluetooth_device_context_disconnect_unpair" msgid="4519151805677280077">"Shkëput dhe hiq nga çiftimi"</string>
+    <string name="bluetooth_device_context_unpair" msgid="250588431708253041">"Anulo çiftimin"</string>
+    <string name="bluetooth_device_context_disconnect_unpair" msgid="4519151805677280077">"Shkëput dhe anulo çiftimin"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="423463405499392444">"Opsionet..."</string>
     <string name="bluetooth_menu_advanced" msgid="7566858513372603652">"Të përparuara"</string>
     <string name="bluetooth_advanced_titlebar" msgid="6459469494039004784">"Cilësimet e përparuara të Bluetooth-it"</string>
@@ -2926,7 +2926,7 @@
     <string name="nfc_payment_pay_with" msgid="8412558374792061266">"Në terminalin \"Prek dhe paguaj\", paguaj me:"</string>
     <string name="nfc_how_it_works_title" msgid="6531433737926327904">"Pagesa në terminal"</string>
     <string name="nfc_how_it_works_content" msgid="9174575836302449343">"Konfiguro një aplikacion pagese. Më pas thjesht mbaje pjesën e pasme të telefonit te një terminal me simbolin e pagesave pa kontakt."</string>
-    <string name="nfc_how_it_works_got_it" msgid="2432535672153247411">"E kuptova!"</string>
+    <string name="nfc_how_it_works_got_it" msgid="2432535672153247411">"E kuptova"</string>
     <string name="nfc_more_title" msgid="2825856411836382264">"Më shumë..."</string>
     <string name="nfc_payment_set_default_label" msgid="3997927342761454042">"Të caktohet si preferencë?"</string>
     <string name="nfc_payment_set_default" msgid="1186837502664412132">"Të përdoret gjithmonë <xliff:g id="APP">%1$s</xliff:g> për \"Prek dhe paguaj\"?"</string>
@@ -2979,7 +2979,7 @@
     <string name="restriction_location_enable_title" msgid="358506740636434856">"Vendndodhja"</string>
     <string name="restriction_location_enable_summary" msgid="4159500201124004463">"Lejo aplikacionet të përdorin informacionin e vendndodhjes tënde"</string>
     <string name="wizard_back" msgid="223654213898117594">"Prapa"</string>
-    <string name="wizard_next" msgid="5239664512608113542">"Përpara"</string>
+    <string name="wizard_next" msgid="5239664512608113542">"Para"</string>
     <string name="wizard_finish" msgid="3742102879981212094">"Përfundo"</string>
     <string name="user_image_take_photo" msgid="2000247510236178111">"Bëj një fotografi"</string>
     <string name="user_image_choose_photo" msgid="4920315415203051898">"Zgjidh një imazh"</string>
@@ -3149,7 +3149,7 @@
     <string name="other_sound_settings" msgid="5250376066099818676">"Tinguj të tjerë"</string>
     <string name="dial_pad_tones_title" msgid="8877212139988655769">"Tonet e bllokut të tasteve"</string>
     <string name="screen_locking_sounds_title" msgid="4407110895465866809">"Tingujt e kyçjes së ekranit"</string>
-    <string name="charging_sounds_title" msgid="5070437987230894287">"Tingujt dhe dridhja e ngarkimit"</string>
+    <string name="charging_sounds_title" msgid="5070437987230894287">"Tingujt dhe dridhja e karikimit"</string>
     <string name="docking_sounds_title" msgid="2573137471605541366">"Tingujt e stacionimit"</string>
     <string name="touch_sounds_title" msgid="165237488496165652">"Tingujt e prekjes"</string>
     <string name="vibrate_on_touch_title" msgid="6360155469279157684">"Dridhje për prekjen"</string>
@@ -3449,7 +3449,7 @@
     <string name="zen_mode_app_set_behavior" msgid="8597398780262575571">"Këto cilësime nuk mund të ndryshohen në këtë moment. Një aplikacion (<xliff:g id="APP_NAME">%1$s</xliff:g>) ka aktivizuar automatikisht modalitetin \"Mos shqetëso\" me sjelljen e personalizuar."</string>
     <string name="zen_mode_unknown_app_set_behavior" msgid="5666462954329932302">"Këto cilësime nuk mund të ndryshohen në këtë moment. Një aplikacion ka aktivizuar automatikisht modalitetin \"Mos shqetëso\" me sjelljen e personalizuar."</string>
     <string name="zen_mode_qs_set_behavior" msgid="788646569296973998">"Këto cilësime nuk mund të ndryshohen në këtë moment. Modaliteti \"Mos shqetëso\" është aktivizuar manualisht me sjelljen e personalizuar."</string>
-    <string name="zen_schedule_rule_type_name" msgid="4516851728113801329">"Koha"</string>
+    <string name="zen_schedule_rule_type_name" msgid="4516851728113801329">"Ora"</string>
     <string name="zen_schedule_rule_enabled_toast" msgid="1742354493045049048">"Rregulli automatik u vendos. Ai do të aktivizojë gjendjen \"Mos shqetëso\" gjatë kohës së vendosur."</string>
     <string name="zen_event_rule_type_name" msgid="7467729997336583342">"Ngjarje"</string>
     <string name="zen_event_rule_enabled_toast" msgid="7087368268966855976">"Rregulli automatik u vendos. Ai do të aktivizojë gjendjen \"Mos shqetëso\" gjatë kohës së vendosur."</string>
@@ -3728,7 +3728,7 @@
     <string name="decline_remote_bugreport_action" msgid="706319275774199033">"Refuzo"</string>
     <string name="usb_use_charging_only" msgid="2344625733377110164">"Nuk ka transferim të të dhënave"</string>
     <string name="usb_use_charging_only_desc" msgid="3283518562582478950">"Vetëm karikoje këtë pajisje"</string>
-    <string name="usb_use_power_only" msgid="6595783381323810697">"Ngarko pajisjen e lidhur"</string>
+    <string name="usb_use_power_only" msgid="6595783381323810697">"Kariko pajisjen e lidhur"</string>
     <string name="usb_use_file_transfers" msgid="6153021302176151884">"Transferimi i skedarëve"</string>
     <string name="usb_use_file_transfers_desc" msgid="6953866660041189580">"Transfero skedarët te një pajisje tjetër"</string>
     <string name="usb_use_photo_transfers" msgid="5974236250197451257">"PTP"</string>
@@ -4417,7 +4417,7 @@
     <string name="mobile_network_esim_swap_confirm_body" msgid="1192274915146275063">"Vetëm një kartë SIM e shkarkuar mund të jetë aktive në të njëjtën kohë.\n\nKalimi te <xliff:g id="CARRIER1">%1$s</xliff:g> nuk do ta anulojë shërbimin e <xliff:g id="CARRIER2">%2$s</xliff:g>."</string>
     <string name="mobile_network_esim_swap_confirm_ok" msgid="4253442720111626242">"Kalo te <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="mobile_network_erase_sim" msgid="7813251003613841044">"Spastro kartën SIM"</string>
-    <string name="mobile_network_erase_sim_dialog_title" msgid="3796268164204467499">"Dëshiron ta pastrosh këtë kartë SIM të shkarkuar?"</string>
+    <string name="mobile_network_erase_sim_dialog_title" msgid="3796268164204467499">"Të spastrohet kjo kartë SIM e shkarkuar?"</string>
     <string name="mobile_network_erase_sim_dialog_body" msgid="1923189407958581450">"Spastrimi i kësaj karte SIM e heq shërbimin e <xliff:g id="CARRIER_0">%1$s</xliff:g> nga kjo pajisje.\n\nShërbimi për <xliff:g id="CARRIER_1">%2$s</xliff:g> nuk do të anulohet."</string>
     <string name="mobile_network_erase_sim_dialog_ok" msgid="7133484721717815447">"Spastro"</string>
     <string name="mobile_network_erase_sim_dialog_progress" msgid="4881754030959536493">"Karta SIM po spastrohet…"</string>
diff --git a/tests/CarDeveloperOptions/res/values-sr/arrays.xml b/tests/CarDeveloperOptions/res/values-sr/arrays.xml
index 9ba8c58..e63a632 100644
--- a/tests/CarDeveloperOptions/res/values-sr/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-sr/arrays.xml
@@ -230,7 +230,7 @@
     <item msgid="2260380357119423209">"мењање евиденције позива"</item>
     <item msgid="6550710385014530934">"читање календара"</item>
     <item msgid="3575906174264853951">"мењање календара"</item>
-    <item msgid="4319843242568057174">"Wi-Fi скенирање"</item>
+    <item msgid="4319843242568057174">"WiFi скенирање"</item>
     <item msgid="2981791890467303819">"обавештење"</item>
     <item msgid="6617825156152476692">"скенирање телефона"</item>
     <item msgid="8865260890611559753">"позивање телефона"</item>
diff --git a/tests/CarDeveloperOptions/res/values-sr/strings.xml b/tests/CarDeveloperOptions/res/values-sr/strings.xml
index cf41c11..04246e3 100644
--- a/tests/CarDeveloperOptions/res/values-sr/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-sr/strings.xml
@@ -36,7 +36,7 @@
     <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">"Позивање преко Wifi везе је додељено"</string>
+    <string name="wfc_provisioned_switch_string" msgid="5446697646596639516">"Позивање преко WiFi везе је додељено"</string>
     <string name="eab_provisioned_switch_string" msgid="3921103790584572430">"EAB/Додељено присуство"</string>
     <string name="cbrs_data_switch_string" msgid="9120919504831536183">"Cbrs подаци"</string>
     <string name="dsds_switch_string" msgid="2606482598327613264">"Омогући DSDS"</string>
@@ -54,7 +54,7 @@
     <string name="radio_info_ims_reg_status_not_registered" msgid="1286050699734226077">"Није регистровано"</string>
     <string name="radio_info_ims_feature_status_available" msgid="2040629393134756058">"Доступно"</string>
     <string name="radio_info_ims_feature_status_unavailable" msgid="3348223769202693596">"Недоступно"</string>
-    <string name="radio_info_ims_reg_status" msgid="4771711884059371514">"Регистрација услуге за размену тренутних порука: <xliff:g id="STATUS">%1$s</xliff:g>\nГлас преко LTE-а: <xliff:g id="AVAILABILITY_0">%2$s</xliff:g>\nГлас преко WiFi-ја: <xliff:g id="AVAILABILITY_1">%3$s</xliff:g>\nВидео позив: <xliff:g id="AVAILABILITY_2">%4$s</xliff:g>\nUT интерфејс: <xliff:g id="AVAILABILITY_3">%5$s</xliff:g>"</string>
+    <string name="radio_info_ims_reg_status" msgid="4771711884059371514">"Регистрација услуге за размену тренутних порука: <xliff:g id="STATUS">%1$s</xliff:g>\nГлас преко LTE-а: <xliff:g id="AVAILABILITY_0">%2$s</xliff:g>\nГлас преко WiFi-а: <xliff:g id="AVAILABILITY_1">%3$s</xliff:g>\nВидео позив: <xliff:g id="AVAILABILITY_2">%4$s</xliff:g>\nUT интерфејс: <xliff:g id="AVAILABILITY_3">%5$s</xliff:g>"</string>
     <string name="radioInfo_service_in" msgid="1297020186765943857">"Ради"</string>
     <string name="radioInfo_service_out" msgid="8460363463722476510">"Не ради"</string>
     <string name="radioInfo_service_emergency" msgid="7674989004735662599">"Само хитни позиви"</string>
@@ -304,7 +304,7 @@
     <string name="settings_shortcut" msgid="4503714880251502167">"Пречица подешавања"</string>
     <string name="airplane_mode" msgid="4508870277398231073">"Режим рада у авиону"</string>
     <string name="wireless_networks_settings_title" msgid="4298430520189173949">"Бежична веза и мреже"</string>
-    <string name="radio_controls_summary" msgid="4596981962167684814">"Управљање Wi-Fi мрежом, Bluetooth-ом, режимом рада у авиону, мобилним мрежама и VPN-ом"</string>
+    <string name="radio_controls_summary" msgid="4596981962167684814">"Управљање WiFi мрежом, Bluetooth-ом, режимом рада у авиону, мобилним мрежама и VPN-ом"</string>
     <string name="cellular_data_title" msgid="7909624119432695022">"Мобилни подаци"</string>
     <string name="calls_title" msgid="875693497825736550">"Дозволи позиве"</string>
     <string name="sms_messages_title" msgid="934188835214592753">"SMS поруке"</string>
@@ -833,8 +833,8 @@
     <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> Mb/s"</string>
     <string name="rx_link_speed" msgid="3735337600274627581">"<xliff:g id="RECEIVE_LINK_SPEED">%1$d</xliff:g> Mb/s"</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="wifi_ask_enable" msgid="925862998663619616">"<xliff:g id="REQUESTER">%s</xliff:g> жели да укључи WiFi"</string>
+    <string name="wifi_ask_disable" msgid="2146839060110412974">"<xliff:g id="REQUESTER">%s</xliff:g> жели да искључи WiFi"</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>
@@ -851,15 +851,15 @@
     <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>
-    <string name="wifi_quick_toggle_summary" msgid="2879870570547594266">"Укључивање Wi-Fi-ја"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2879870570547594266">"Укључивање WiFi-а"</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_master_switch_title" msgid="3917916944694253946">"Користи WiFi"</string>
+    <string name="wifi_settings_category" msgid="9094716747565527901">"WiFi подешавања"</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_stopping" msgid="413711069039939520">"Искључивање Wi-Fi-ja..."</string>
+    <string name="wifi_select_network" msgid="2541598480767312831">"Изабери WiFi"</string>
+    <string name="wifi_starting" msgid="1299466156783469023">"Укључивање WiFi-а..."</string>
+    <string name="wifi_stopping" msgid="413711069039939520">"Искључивање WiFi-ja..."</string>
     <string name="wifi_error" msgid="5605801874484465557">"Грешка"</string>
     <string name="wifi_sap_no_channel_error" msgid="6881796988574851628">"Опсег од 5 GHz није доступан у овој земљи"</string>
     <string name="wifi_in_airplane_mode" msgid="4729571191578262246">"У Режиму рада у авиону"</string>
@@ -871,7 +871,7 @@
     <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>
-    <string name="wifi_poor_network_detection_summary" msgid="5539951465985614590">"Не користи Wi-Fi мрежу ако нема добру интернет везу"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="5539951465985614590">"Не користи WiFi мрежу ако нема добру интернет везу"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="1976503191780928104">"Користи само оне мреже које имају добру интернет везу"</string>
     <string name="use_open_wifi_automatically_title" msgid="3084513215481454350">"Повезуј се са отвореним мрежама"</string>
     <string name="use_open_wifi_automatically_summary" msgid="8338020172673161754">"Аутоматски се повезуј са јавним мрежама високог квалитета"</string>
@@ -879,15 +879,15 @@
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="1123080670578756834">"Да бисте користили функцију, изаберите компатибилног добављача оцене мреже"</string>
     <string name="wifi_install_credentials" msgid="5650088113710858289">"Инсталирај сертификате"</string>
     <string name="wifi_scan_notify_text" msgid="7614101215028336927">"Да би побољшале прецизност локације, апликације и услуге могу и даље да траже Wi‑Fi мреже у било ком тренутку, чак и када је 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_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_text_scanning_off" msgid="723796963816095410">"Да бисте побољшали прецизност локације, укључите WiFi скенирање у <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_sleep_policy_title" msgid="2120785188625932076">"Не искључуј WiFi током спавања"</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_limit_optimizations_summary" msgid="1192849485764156570">"Огран. бат. коју користи Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations" msgid="8826033336622472222">"WiFi оптимизација"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2375789014394339008">"Смањи коришћење батерије када је WiFi укључен"</string>
+    <string name="wifi_limit_optimizations_summary" msgid="1192849485764156570">"Огран. бат. коју користи WiFi"</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>
@@ -895,7 +895,7 @@
     <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_access_points" msgid="1647976498906871869">"Wi-Fi мреже"</string>
+    <string name="wifi_access_points" msgid="1647976498906871869">"WiFi мреже"</string>
     <string name="wifi_menu_more_options" msgid="8318269834264035524">"Још опција"</string>
     <string name="wifi_menu_p2p" msgid="4945665601551289791">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="9082691677803181629">"Скенирај"</string>
@@ -905,14 +905,14 @@
     <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_on" msgid="881478805041020600">"Тражење Wi-Fi мрежа..."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="272877164691346240">"Да бисте видели доступне мреже, укључите WiFi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="881478805041020600">"Тражење WiFi мрежа..."</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_title" msgid="3593457187659922490">"Желите ли да укључите WiFi скенирање?"</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_info" msgid="5913535073390607386">"WiFi скенирање омогућава апликацијама и услугама да траже 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>
     <string name="wifi_show_advanced" msgid="8199779277168030597">"Напредне опције"</string>
@@ -978,7 +978,7 @@
     <string name="wifi_dpp_connecting" msgid="4229290407210299897">"Повезује се…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="847987212473038179">"Делите хотспот"</string>
     <string name="wifi_dpp_lockscreen_title" msgid="3910665850075275963">"Потврдите да сте то ви"</string>
-    <string name="wifi_dpp_wifi_password" msgid="8007558344032612455">"Лозинка за Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
+    <string name="wifi_dpp_wifi_password" msgid="8007558344032612455">"Лозинка за WiFi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="6172326289042241924">"Лозинка хотспота: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_add_device" msgid="1347056725253936358">"Додај уређај"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="115993715600532357">"Повежите се на ову мрежу помоћу QR кода"</string>
@@ -997,7 +997,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> жели да укључи скенирање мреже чак и када је WiFi искључен.\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>
@@ -1013,7 +1013,7 @@
     <string name="lost_internet_access_cancel" msgid="6577871064062518744">"Остани на Wi‑Fi-ју"</string>
     <string name="lost_internet_access_persist" msgid="6368659013482055611">"Не приказуј поново"</string>
     <string name="wifi_connect" msgid="5653612760223533650">"Повежи"</string>
-    <string name="wifi_turned_on_message" msgid="3377779146238242894">"Wi-Fi је укључен"</string>
+    <string name="wifi_turned_on_message" msgid="3377779146238242894">"WiFi је укључен"</string>
     <!-- no translation found for wifi_connected_to_message (2875589636437599620) -->
     <skip />
     <string name="wifi_connecting" msgid="384192498836395892">"Повезује се…"</string>
@@ -1034,7 +1034,7 @@
       <item quantity="few">%d мреже</item>
       <item quantity="other">%d мрежа</item>
     </plurals>
-    <string name="wifi_advanced_titlebar" msgid="4899310977865228904">"Напредна Wi-Fi подешавања"</string>
+    <string name="wifi_advanced_titlebar" msgid="4899310977865228904">"Напредна WiFi подешавања"</string>
     <string name="wifi_advanced_ssid_title" msgid="4229741334913894856">"SSID"</string>
     <string name="wifi_advanced_mac_address_title" msgid="1162782083754021737">"MAC адреса"</string>
     <string name="wifi_advanced_ip_address_title" msgid="2708185994512829071">"IP адреса"</string>
@@ -1074,7 +1074,7 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="2465200999145769427">"Желите ли да откажете позивницу?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="3752679335020392154">"Желите ли да откажете позивницу за повезивање са уређајем <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="3206660449067701089">"Желите ли да заборавите ову групу?"</string>
-    <string name="wifi_hotspot_checkbox_text" msgid="12062341344410520">"Wi-Fi хотспот"</string>
+    <string name="wifi_hotspot_checkbox_text" msgid="12062341344410520">"WiFi хотспот"</string>
     <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>
@@ -1093,11 +1093,11 @@
     <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>
-    <string name="wifi_tether_configure_ap_text" msgid="4081852770996455902">"Подеси Wi-Fi хотспот"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="4081852770996455902">"Подеси WiFi хотспот"</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">"AndroidHotspot"</string>
-    <string name="wifi_calling_settings_title" msgid="626821542308601806">"Позивање преко Wi-Fi-ја"</string>
+    <string name="wifi_calling_settings_title" msgid="626821542308601806">"Позивање преко WiFi-а"</string>
     <string name="wifi_calling_suggestion_title" msgid="1402265373543523970">"Продужите позиве помоћу Wi‑Fi-ја"</string>
     <string name="wifi_calling_suggestion_summary" msgid="198402175473169630">"Укљ. позивање преко Wi‑Fi-ја да проширите покривеност"</string>
     <string name="wifi_calling_mode_title" msgid="3350624859819920176">"Подешавање позивања"</string>
@@ -1112,30 +1112,30 @@
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_v2">
-    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="9149346657812979257">"WiFi"</item>
     <item msgid="4421333712484542489">"Мобилни подаци"</item>
-    <item msgid="6007360612667098926">"Само Wi-Fi"</item>
+    <item msgid="6007360612667098926">"Само WiFi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
-    <item msgid="6452246499629557266">"Wi-Fi"</item>
+    <item msgid="6452246499629557266">"WiFi"</item>
     <item msgid="2271962426654621656">"Мобилни подаци"</item>
   </string-array>
     <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-ја. Ако се 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_mode_wifi_only_summary" msgid="6928556021002500522">"Позивање преко WiFi-а. Ако се Wi‑Fi веза изгуби, позив ће се завршити."</string>
+    <string name="wifi_calling_off_explanation" msgid="1653424723742898015">"Када је позивање преко WiFi-а укључено, телефон може да преусмерава позиве преко WiFi мрежа или мреже мобилног оператера у зависности од тога које сте подешавање изабрали и који сигнал је јачи. Пре него што укључите ову функцију, информишите се код мобилног оператера о накнадама и другим детаљима.<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="emergency_address_summary" msgid="478668478569851714">"Користи се као ваша локација када упутите хитни позив помоћу WiFi-а"</string>
     <string name="private_dns_help_message" msgid="7633526525131196650"><annotation id="url">"Сазнајте више"</annotation>" о функцијама Приватног DNS-а"</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_not_supported" msgid="216781767605669775">"Позивање преко Wi-Fi-ја није подржано за %1$s"</string>
+    <string name="wifi_calling_settings_activation_instructions" msgid="2863642668648110908">"Активирајте Позивање преко WiFi-а"</string>
+    <string name="wifi_calling_turn_on" msgid="1212277809455062043">"Укључите позивање преко WiFi-а"</string>
+    <string name="wifi_calling_not_supported" msgid="216781767605669775">"Позивање преко WiFi-а није подржано за %1$s"</string>
     <string name="carrier" msgid="3413463182542176886">"Мобилни оператер"</string>
     <string name="display_settings_title" msgid="1243571562133261601">"Приказ"</string>
     <string name="sound_settings" msgid="3306063041029638807">"Звук"</string>
@@ -1376,7 +1376,7 @@
     <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">"Wi-Fi MAC адреса"</string>
+    <string name="status_wifi_mac_address" msgid="3868452167971295995">"WiFi MAC адреса"</string>
     <string name="status_bt_address" msgid="460568179311735657">"Bluetooth адреса"</string>
     <string name="status_serial_number" msgid="8257722124627415159">"Серијски број"</string>
     <string name="status_up_time" msgid="77128395333934087">"Време рада"</string>
@@ -1392,7 +1392,7 @@
     <string name="memory_media_usage" msgid="2744652206722240527">"Медији"</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_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>
@@ -1589,7 +1589,7 @@
     <string name="restore_default_apn_completed" msgid="5671734152740058937">"Поновно постављање подразумеваних подешавања назива приступне тачке је завршено."</string>
     <string name="reset_dashboard_title" msgid="7084966342252178530">"Опције за ресетовање"</string>
     <string name="reset_dashboard_summary" msgid="8778383341461126642">"Мрежа, апликацијe или уређај могу да се ресетују"</string>
-    <string name="reset_network_title" msgid="8944059136930806211">"Ресетуј Wi-Fi, мобилну мрежу и Bluetooth"</string>
+    <string name="reset_network_title" msgid="8944059136930806211">"Ресетуј WiFi, мобилну мрежу и Bluetooth"</string>
     <string name="reset_network_desc" msgid="4982633363916261109">"Овим ресетујете сва подешавања мреже, укључујући:\n\n"<li>"Wi‑Fi"</li>\n<li>"Мобилне податке"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_esim_title" msgid="7630781767040831893">"Обриши преузете SIM картице"</string>
     <string name="reset_esim_desc" msgid="433226911566802">"Да бисте преузели заменске SIM картице, контактирајте мобилног оператера. Тиме се неће отказати ниједан тарифни пакет."</string>
@@ -1644,7 +1644,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>
@@ -1686,9 +1686,9 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="196241746742607453">"Bluetooth скенирање"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="3796673798637848690">"Дозволите апликацијама и услугама да траже уређаје у близини у сваком тренутку, чак и када је Bluetooth искључен. Ово може да се користи, на пример, за побољшање функција и услуга заснованих на локацији."</string>
     <string name="managed_profile_location_services" msgid="224925483299159541">"Услуге локације за посао"</string>
-    <string name="location_network_based" msgid="1535812159327454835">"Локац. на основу Wi-Fi и моб. мреже"</string>
+    <string name="location_network_based" msgid="1535812159327454835">"Локац. на основу WiFi и моб. мреже"</string>
     <string name="location_neighborhood_level" msgid="8459352741296587916">"Нека апл. користе Google-ову услугу лоцирања за брже одређивање локације. Анонимни подаци о локацији прикупљаће се и слати Google-у."</string>
-    <string name="location_neighborhood_level_wifi" msgid="6120133551482003840">"Локација се одређује помоћу Wi-Fi-ја"</string>
+    <string name="location_neighborhood_level_wifi" msgid="6120133551482003840">"Локација се одређује помоћу WiFi-а"</string>
     <string name="location_gps" msgid="688049341158297763">"GPS сателити"</string>
     <string name="location_street_level" product="tablet" msgid="4459804798444296650">"Нека апликације користе GPS на таблету како би тачно одредиле вашу локацију"</string>
     <string name="location_street_level" product="default" msgid="7407688345675450051">"Нека апликације користе GPS на телефону како би тачно одредиле вашу локацију"</string>
@@ -1746,10 +1746,10 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="8823110536502072216">"Потврда идентитета лицем захтева лозинку"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="5563793748503883666">"Потврда идентитета лицем захтева шаблон"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="7238352632535405068">"Потврда идентитета лицем захтева PIN"</string>
-    <string name="lockpassword_confirm_your_pattern_generic" msgid="6146545393074070916">"Употребите шаблон за уређај да бисте наставили"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="6146545393074070916">"Користите шаблон за уређај да бисте наставили"</string>
     <string name="lockpassword_confirm_your_pin_generic" msgid="8732268389177735264">"Унесите PIN уређаја да бисте наставили"</string>
     <string name="lockpassword_confirm_your_password_generic" msgid="6304552647060899594">"Унесите лозинку уређаја да бисте наставили"</string>
-    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="3074250084050465513">"Употребите шаблон за пословни профил да бисте наставили"</string>
+    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="3074250084050465513">"Користите шаблон за пословни профил да бисте наставили"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="6037908971086439523">"Унесите PIN за пословни профил да бисте наставили"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="2646162490703489685">"Унесите лозинку за пословни профил да бисте наставили"</string>
     <string name="lockpassword_strong_auth_required_device_pattern" msgid="1014214190135045781">"Ради веће безбедности користите шаблон за уређај"</string>
@@ -1863,7 +1863,7 @@
     <string name="show_running_services" msgid="1895994322704667543">"Прикажи покренуте услуге"</string>
     <string name="show_background_processes" msgid="88012264528093617">"Прикажи кеширане процесе"</string>
     <string name="default_emergency_app" msgid="286530070173495823">"Апликација за хитне случајеве"</string>
-    <string name="reset_app_preferences" msgid="1426500030595212077">"Ресетуј подешавања апликације"</string>
+    <string name="reset_app_preferences" msgid="1426500030595212077">"Ресетуј подешавања апликација"</string>
     <string name="reset_app_preferences_title" msgid="792909865493673598">"Желите да ресетујете подешавања апликације?"</string>
     <string name="reset_app_preferences_desc" msgid="7935273005301096031">"Овим ћете вратити на почетне вредности сва подешавања за:\n\n "<li>"Онемогућене апликације"</li>\n" "<li>"Обавештења о онемогућеним апликацијама"</li>\n" "<li>"Подразумеване апликације за радње"</li>\n" "<li>"Ограничења за позадинске податке за апликације"</li>\n" "<li>"Било каква ограничења за дозволе"</li>\n\n" Нећете изгубити податке апликација."</string>
     <string name="reset_app_preferences_button" msgid="2041894727477934656">"Ресетуј апликације"</string>
@@ -2288,8 +2288,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">"Време од укључивања WiFi мреже"</string>
+    <string name="bluetooth_on_time" msgid="6400569492287292639">"Време од укључивања WiFi мреже"</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>
@@ -2411,7 +2411,7 @@
     <string name="usage_type_cpu_foreground" msgid="5496661858574622156">"Процесор у предњем плану"</string>
     <string name="usage_type_wake_lock" msgid="6729977238748413476">"Задржи ван стања спавања"</string>
     <string name="usage_type_gps" msgid="5914062195732419196">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="4192567991891907030">"Wi-Fi је активан"</string>
+    <string name="usage_type_wifi_running" msgid="4192567991891907030">"WiFi је активан"</string>
     <string name="usage_type_phone" product="tablet" msgid="4279605085824633501">"Таблет"</string>
     <string name="usage_type_phone" product="default" msgid="3901842461077646153">"Телефон"</string>
     <string name="usage_type_data_send" msgid="6339880867171142725">"Послати мобилни пакети"</string>
@@ -2432,7 +2432,7 @@
     <string name="battery_action_app_details" msgid="1077011181969550402">"Информације о апликацији"</string>
     <string name="battery_action_app_settings" msgid="587998773852488539">"Подешавања апликација"</string>
     <string name="battery_action_display" msgid="4887913003634317465">"Подешавања екрана"</string>
-    <string name="battery_action_wifi" msgid="7123520587925323824">"Wi-Fi подешавања"</string>
+    <string name="battery_action_wifi" msgid="7123520587925323824">"WiFi подешавања"</string>
     <string name="battery_action_bluetooth" msgid="718594420017519807">"Подешавања за Bluetooth"</string>
     <string name="battery_desc_voice" msgid="4731966028374974986">"Батерија коју користе гласовни позиви"</string>
     <string name="battery_desc_standby" product="tablet" msgid="2941777996429933419">"Искоришћена батерија када је таблет неактиван"</string>
@@ -2443,8 +2443,8 @@
     <string name="battery_desc_camera" msgid="517966830222999462">"Проценат батерије који троши камера"</string>
     <string name="battery_desc_display" msgid="6701005808894183097">"Батерија коју користи екран и позадинско светло"</string>
     <string name="battery_sugg_display" msgid="6366790848514389990">"Смањите осветљеност екрана и/или време до гашења"</string>
-    <string name="battery_desc_wifi" msgid="3497535902126253386">"Батерија коју користи Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="3796329601134263039">"Искључите Wi-Fi када га не користите или када није доступан"</string>
+    <string name="battery_desc_wifi" msgid="3497535902126253386">"Батерија коју користи WiFi"</string>
+    <string name="battery_sugg_wifi" msgid="3796329601134263039">"Искључите WiFi када га не користите или када није доступан"</string>
     <string name="battery_desc_bluetooth" msgid="3468061900485447679">"Батерија коју користи Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="6353294067057749310">"Искључите Bluetooth када га не користите"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="2421931037149315202">"Покушајте да се повежете са другим Bluetooth уређајем"</string>
@@ -2575,7 +2575,7 @@
     <string name="credential_storage_type_software" msgid="1335905150062717150">"Само софтверски"</string>
     <string name="credentials_settings_not_available" msgid="5490259681690183274">"Акредитиви нису доступни за овог корисника"</string>
     <string name="credential_for_vpn_and_apps" msgid="2462642486949593841">"Инсталирано за VPN и апликације"</string>
-    <string name="credential_for_wifi" msgid="2903295786961726388">"Инсталирано за Wi-Fi"</string>
+    <string name="credential_for_wifi" msgid="2903295786961726388">"Инсталирано за WiFi"</string>
     <string name="credentials_reset_hint" msgid="3484350477764088169">"Желите ли да уклоните сав садржај?"</string>
     <string name="credentials_erased" msgid="7287088033523869085">"Складиште акредитива је избрисано."</string>
     <string name="credentials_not_erased" msgid="9137227570738627637">"Није могуће oбрисати складиште акредитива."</string>
@@ -2588,7 +2588,7 @@
     <string name="backup_section_title" msgid="8177209731777904656">"Резервна копија и ресетовање"</string>
     <string name="personal_data_section_title" msgid="9161854418510071558">"Лични подаци"</string>
     <string name="backup_data_title" msgid="4461508563849583624">"Прављење резервних копија података"</string>
-    <string name="backup_data_summary" msgid="555459891017933746">"Прави резервне копије података о апликацијама, Wi-Fi лозинки и других подешавања на Google серверима"</string>
+    <string name="backup_data_summary" msgid="555459891017933746">"Прави резервне копије података о апликацијама, WiFi лозинки и других подешавања на Google серверима"</string>
     <string name="backup_configure_account_title" msgid="1534734650559070294">"Резервна копија налога"</string>
     <string name="backup_data_management_title" msgid="6299288795610243508">"Управљајте налогом за резервне копије"</string>
     <string name="include_app_data_title" msgid="6117211611131913293">"Уврштавање података апликација"</string>
@@ -2597,9 +2597,9 @@
     <string name="backup_inactive_title" msgid="5513496915638307750">"Услуга прављења резервних копија није активна"</string>
     <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_data_summary" msgid="406274198094268556">"Аутоматски правите резервне копије података уређаја (попут Wi-Fi лозинки и историје позива) и података апликација (попут подешавања и датотека сачуваних у апликацијама) даљински.\n\nКада укључите аутоматско прављење резервних копија, подаци уређаја и апликација се повремено чувају даљински. Подаци апликација могу да буду било који подаци које је апликација сачувала (на основу подешавања програмера), укључујући потенцијално осетљиве податке као што су контакти, поруке и слике."</string>
+    <string name="backup_erase_dialog_message" msgid="8767843355330070902">"Желите ли да зауставите прављење резервних копија WiFi лозинки, обележивача, осталих подешавања и података о апликацијама, као и да избришете све копије на Google серверима?"</string>
+    <string name="fullbackup_erase_dialog_message" msgid="2588536036471144070">"Желите ли да зауставите прављење резервних копија података уређаја (попут WiFi лозинки и историје позива) и података апликација (попут подешавања и датотека сачуваних у апликацијама) и избришете све копије на удаљеним серверима?"</string>
+    <string name="fullbackup_data_summary" msgid="406274198094268556">"Аутоматски правите резервне копије података уређаја (попут WiFi лозинки и историје позива) и података апликација (попут подешавања и датотека сачуваних у апликацијама) даљински.\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>
@@ -2665,9 +2665,9 @@
     <string name="remove_account_label" msgid="5885425720323823387">"Уклони налог"</string>
     <string name="header_add_an_account" msgid="8482614556580804956">"Додајте налог"</string>
     <string name="really_remove_account_title" msgid="4166512362915154319">"Желите ли да уклоните налог?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Уклањањем овог налога избрисаћете све поруке, контакте и друге податке са таблета!"</string>
-    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Уклањањем овог налога избрисаћете све поруке, контакте и друге податке са телефона!"</string>
-    <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Ако уклоните овај налог, избрисаћете све поруке, контакте и друге податке са уређаја!"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Ако уклоните овај налог, избрисаћете све поруке, контакте и друге податке са таблета."</string>
+    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Ако уклоните овај налог, избрисаћете све поруке, контакте и друге податке са телефона."</string>
+    <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Ако уклоните овај налог, избрисаћете све поруке, контакте и друге податке са уређаја."</string>
     <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>
@@ -2718,7 +2718,7 @@
     <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>
-    <string name="data_usage_disable_wifi_limit" msgid="8214267551888018353">"Ограничи Wi-Fi податке"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="8214267551888018353">"Ограничи WiFi податке"</string>
     <string name="data_usage_tab_wifi" msgid="7224124683039634055">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="5053077378022543867">"Етернет"</string>
     <string name="data_usage_tab_mobile" msgid="540101181815160147">"Мобилни"</string>
@@ -2753,9 +2753,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="2000713577999830647">"Таблет ће искључити мобилне податке чим достигне ограничење које сте подесили.\n\nПошто потрошњу података мери таблет, а мобилни оператер може другачије да рачуна потрошњу, размислите о томе да подесите ниже ограничење."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="943546278705619205">"Телефон ће искључити мобилне податке чим достигне ограничење које сте подесили.\n\nПошто потрошњу података мери телефон, а мобилни оператер може другачије да рачуна потрошњу, размислите о томе да подесите ниже ограничење."</string>
     <string name="data_usage_restrict_background_title" msgid="3568746530413220844">"Желите ли да ограничите позадинске податке?"</string>
-    <string name="data_usage_restrict_background" msgid="995811034744808575">"Ако ограничите мобилне позадинске податке, неке апликације и услуге неће функционисати ако нисте повезани са Wi-Fi-јем."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="6032810839234864814">"Ако ограничите мобилне позадинске податке, неке апликације и услуге неће функционисати ако нисте повезани са Wi-Fi-јем.\n\nОво подешавање утиче на све кориснике на овом таблету."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="6846901756455789858">"Ако ограничите мобилне позадинске податке, неке апликације и услуге неће функционисати ако нисте повезани са Wi-Fi-јем.\n\nОво подешавање утиче на све кориснике на овом телефону."</string>
+    <string name="data_usage_restrict_background" msgid="995811034744808575">"Ако ограничите мобилне позадинске податке, неке апликације и услуге неће функционисати ако нисте повезани са WiFi-ем."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="6032810839234864814">"Ако ограничите мобилне позадинске податке, неке апликације и услуге неће функционисати ако нисте повезани са WiFi-ем.\n\nОво подешавање утиче на све кориснике на овом таблету."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="6846901756455789858">"Ако ограничите мобилне позадинске податке, неке апликације и услуге неће функционисати ако нисте повезани са WiFi-ем.\n\nОво подешавање утиче на све кориснике на овом телефону."</string>
     <string name="data_usage_sweep_warning" msgid="4646401408698778092"><font size="12">"упоз."</font>\n<font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
     <string name="data_usage_sweep_limit" msgid="6101105504557548269"><font size="12">"огран."</font>\n<font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="4152786786140875769">"Уклоњене апликације"</string>
@@ -2768,7 +2768,7 @@
     <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">"Да бисте изабрали мреже са ограничењем, укључите WiFi."</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>
@@ -3102,7 +3102,7 @@
     <string name="keywords_flashlight" msgid="7733996050628473024">"Батеријска лампа, светло, лампа"</string>
     <string name="keywords_change_wifi_state" msgid="7697524907886303535">"wifi, wi-fi, укључи/искључи, контрола"</string>
     <string name="keywords_more_mobile_networks" msgid="5605342743169059942">"мобилна мрежа, мобилни подаци, мобилни оператер, бежично, подаци, 4g, 3g, 2g, lte"</string>
-    <string name="keywords_wifi_calling" msgid="3554052148729818521">"WiFi, Wi-Fi, позив, позивање"</string>
+    <string name="keywords_wifi_calling" msgid="3554052148729818521">"WiFi, WiFi, позив, позивање"</string>
     <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>
@@ -3998,12 +3998,12 @@
     <string name="usage" msgid="9172908720164431622">"Потрошња"</string>
     <string name="cellular_data_usage" msgid="1236562234207782386">"Потрошња мобил. података"</string>
     <string name="app_cellular_data_usage" msgid="8499761516172121957">"Коришћење података апликације"</string>
-    <string name="wifi_data_usage" msgid="275569900562265895">"Потрошња Wi-Fi података"</string>
+    <string name="wifi_data_usage" msgid="275569900562265895">"Потрошња WiFi података"</string>
     <string name="ethernet_data_usage" msgid="747614925362556718">"Потрошња података на етернету"</string>
-    <string name="wifi" msgid="1586738489862966138">"Wi-Fi"</string>
+    <string name="wifi" msgid="1586738489862966138">"WiFi"</string>
     <string name="ethernet" msgid="2365753635113154667">"Етернет"</string>
     <string name="cell_data_template" msgid="5473177306229738078">"<xliff:g id="AMOUNT">^1</xliff:g> мобилних података"</string>
-    <string name="wifi_data_template" msgid="3146090439147042068">"<xliff:g id="AMOUNT">^1</xliff:g> Wi-Fi података"</string>
+    <string name="wifi_data_template" msgid="3146090439147042068">"<xliff:g id="AMOUNT">^1</xliff:g> WiFi података"</string>
     <string name="ethernet_data_template" msgid="6414118030827090119">"<xliff:g id="AMOUNT">^1</xliff:g> података на етернету"</string>
     <string name="billing_cycle" msgid="5740717948341713190">"Упозорење за податке и ограничење"</string>
     <string name="app_usage_cycle" msgid="213483325132959663">"Циклус потрошње података апл."</string>
@@ -4384,9 +4384,9 @@
     <string name="unknown_unavailability_setting_summary" msgid="5785931810977403534">"Подешавање је недоступно"</string>
     <string name="my_device_info_account_preference_title" msgid="7965847995028952373">"Налог"</string>
     <string name="my_device_info_device_name_preference_title" msgid="7384446683248009296">"Назив уређаја"</string>
-    <string name="change_wifi_state_title" msgid="5140754955787584174">"Контрола Wi-Fi везе"</string>
-    <string name="change_wifi_state_app_detail_switch" msgid="6489090744937816260">"Омогућите да апликација контролише Wi-Fi"</string>
-    <string name="change_wifi_state_app_detail_summary" msgid="614854822469259860">"Омогућите да ова апликација укључи или искључи Wi-Fi, тражи и повезује се на Wi-Fi мреже, додаје и уклања мреже или покреће само локални хотспот"</string>
+    <string name="change_wifi_state_title" msgid="5140754955787584174">"Контрола WiFi везе"</string>
+    <string name="change_wifi_state_app_detail_switch" msgid="6489090744937816260">"Омогућите да апликација контролише WiFi"</string>
+    <string name="change_wifi_state_app_detail_summary" msgid="614854822469259860">"Омогућите да ова апликација укључи или искључи WiFi, тражи и повезује се на WiFi мреже, додаје и уклања мреже или покреће само локални хотспот"</string>
     <string name="media_output_title" msgid="8710632337456601848">"Пуштај медијски садржај на"</string>
     <string name="media_output_default_summary" msgid="3159237976830415584">"Овај уређај"</string>
     <string name="media_output_summary" product="default" msgid="6294261435613551178">"Телефон"</string>
@@ -4410,7 +4410,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="3509459199090688328">"Укључено (звук је искључен)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="5152618221093037451">"Искључено"</string>
     <string name="pref_title_network_details" msgid="3971074015034595956">"Детаљи о мрежи"</string>
-    <string name="about_phone_device_name_warning" msgid="9088572775969880106">"Име уређаја виде апликације на телефону. Могу да га виде и други људи кад се повежете са Bluetooth уређајима или подесите Wi-Fi хотспот."</string>
+    <string name="about_phone_device_name_warning" msgid="9088572775969880106">"Име уређаја виде апликације на телефону. Могу да га виде и други људи кад се повежете са Bluetooth уређајима или подесите WiFi хотспот."</string>
     <string name="devices_title" msgid="4768432575951993648">"Уређаји"</string>
     <string name="homepage_all_settings" msgid="3201220879559136116">"Сва подешавања"</string>
     <string name="homepage_personal_settings" msgid="7472638597249114564">"Предлози"</string>
@@ -4602,5 +4602,5 @@
     <string name="automatic_system_heap_dump_summary" msgid="4962129546638974661">"Аутоматски снима динамички део меморије за Android систем када користи превише меморије"</string>
     <string name="wifi_disconnect_button_text" msgid="787688024070426706">"Прекини везу"</string>
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="26884532087670844">"Хитни позиви"</string>
-    <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="8726152486964822599">"Мобилни оператер не подржава хитне позиве помоћу функције Позивање преко Wi-Fi-ја.\nУређај аутоматски прелази на мобилну мрежу да би упутио хитан позив.\nХитни позиви су могући само у областима покривеним мобилном мрежом."</string>
+    <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="8726152486964822599">"Мобилни оператер не подржава хитне позиве помоћу функције Позивање преко WiFi-а.\nУређај аутоматски прелази на мобилну мрежу да би упутио хитан позив.\nХитни позиви су могући само у областима покривеним мобилном мрежом."</string>
 </resources>
diff --git a/tests/CarDeveloperOptions/res/values-sv/strings.xml b/tests/CarDeveloperOptions/res/values-sv/strings.xml
index e17d281..eda0db1 100644
--- a/tests/CarDeveloperOptions/res/values-sv/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-sv/strings.xml
@@ -386,7 +386,7 @@
     <string name="lockscreen_settings_what_to_show_category" msgid="3133378945821488654">"Vad som ska visas"</string>
     <string name="security_settings_summary" msgid="5210109100643223686">"Ställ in Min plats, skärmupplåsning, lås för SIM-kort och lås för uppgiftslagring"</string>
     <string name="cdma_security_settings_summary" msgid="1783066617800041869">"Ställ in Min plats, skärmupplåsning, lås för uppgiftslagring"</string>
-    <string name="security_passwords_title" msgid="6853942836045862315">"Sekretess"</string>
+    <string name="security_passwords_title" msgid="6853942836045862315">"Integritet"</string>
     <string name="disabled_by_administrator_summary" msgid="6099821045360491127">"Inaktiverad av administratören"</string>
     <string name="security_status_title" msgid="1261960357751754428">"Säkerhetsstatus"</string>
     <string name="security_dashboard_summary_face" msgid="2536136110153593745">"Skärmlås, ansiktslås"</string>
@@ -441,7 +441,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7915504118657864429">"Använda ditt fingeravtryck"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="5586198131986682472">"Tryck bara på fingeravtryckssensorn när du vill låsa upp mobilen, auktorisera köp eller logga in i appar. Tänk efter innan du lägger till någons fingeravtryck, eftersom alla som du lägger till kan utföra alla dessa åtgärder.\n\nObs! Fingeravtryck kan vara mindre säkra än ett säkert grafiskt lösenord eller en pinkod."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1640839304679275468">"Använd ditt fingeravtryck för att låsa upp telefonen eller godkänna köp.\n\nObs! Du kan inte använda fingeravtrycket för att låsa upp den här enheten. Kontakta organisationens administratör om du vill veta mer."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6734490666593320711">"Använd fingeravtrycket för att låsa upp mobilen eller godkänna köp.\n\nObs! Fingeravtrycket kan vara mindre säkert än ett starkt grafiskt lösenord eller en bra pinkod."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6734490666593320711">"Du kan använda fingeravtrycket för att låsa upp mobilen och godkänna köp.\n\nObs! Fingeravtrycket kan vara mindre säkert än ett starkt grafiskt lösenord eller en bra pinkod."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="9168637333731599827">"Avbryt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="271662150372486535">"Fortsätt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="756928427429893070">"Hoppa över"</string>
@@ -932,7 +932,7 @@
     <string name="wifi_ap_5G" msgid="4584892544393675403">"5,0 GHz"</string>
     <string name="wifi_ap_band_select_one" msgid="4409754936554360355">"Välj minst ett band för Wi‑Fi-surfzon:"</string>
     <string name="wifi_ip_settings" msgid="4636102290236116946">"IP-inställningar"</string>
-    <string name="wifi_privacy_settings" msgid="4462092795794247809">"Sekretess"</string>
+    <string name="wifi_privacy_settings" msgid="4462092795794247809">"Integritet"</string>
     <string name="wifi_privacy_settings_ephemeral_summary" msgid="2411375348287064283">"Slumpgenererad MAC-adress"</string>
     <string name="wifi_dpp_add_device_to_network" msgid="8871041525483253430">"Lägg till en enhet"</string>
     <string name="wifi_dpp_center_qr_code" msgid="3826108361797476758">"Lägg till enheten i <xliff:g id="SSID">%1$s</xliff:g> genom att centrera QR-koden i fönstret nedan"</string>
@@ -1681,7 +1681,7 @@
     <string name="location_access_summary" msgid="6919495149026354355">"Ge appar som har bett om tillstånd möjlighet att använda din platsinformation"</string>
     <string name="location_sources_heading" msgid="8526658357120282741">"Platskällor"</string>
     <string name="about_settings" product="tablet" msgid="4869626690708456341">"Om surfplattan"</string>
-    <string name="about_settings" product="default" msgid="6019547763377294261">"Om mobilen"</string>
+    <string name="about_settings" product="default" msgid="6019547763377294261">"Om telefonen"</string>
     <string name="about_settings" product="device" msgid="1770438316234693655">"Om enheten"</string>
     <string name="about_settings" product="emulator" msgid="4497482494770487014">"Om emulerad enhet"</string>
     <string name="about_settings_summary" msgid="4506081667462281647">"Visa juridisk information, status, programversion"</string>
@@ -1710,7 +1710,7 @@
     <string name="lockpassword_choose_your_password_message" msgid="2838273977481046536">"Ange ett lösenord som skydd"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="4921343500484160894">"Lösenord krävs för fingeravtryck"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="314870151462139417">"Grafiskt lösenord krävs för fingeravtryck"</string>
-    <string name="lockpassword_choose_your_pin_message" msgid="8942598950627277885">"Ange en pinkod som skydd"</string>
+    <string name="lockpassword_choose_your_pin_message" msgid="8942598950627277885">"Välj en pinkod"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1102927520952116303">"Pinkod krävs för fingeravtryck"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="1503075455752279687">"Ange ett grafiskt lösenord som skydd"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="9055242184126838887">"Ange ditt lösenord igen"</string>
@@ -1813,7 +1813,7 @@
     </plurals>
     <string name="clear_uri_btn_text" msgid="3528618179883855727">"Ta bort åtkomst"</string>
     <string name="controls_label" msgid="5609285071259457221">"Kontroller"</string>
-    <string name="force_stop" msgid="9213858124674772386">"Tvingad avslutning"</string>
+    <string name="force_stop" msgid="9213858124674772386">"Tvinga att avsluta"</string>
     <string name="total_size_label" msgid="3929917501176594692">"Totalt"</string>
     <string name="application_size_label" msgid="175357855490253032">"Appstorlek"</string>
     <string name="external_code_size_label" msgid="3434421216268309411">"Data på USB-lagringsenhet"</string>
@@ -2037,7 +2037,7 @@
     <string name="accessibility_settings" msgid="9140621093888234485">"Tillgänglighet"</string>
     <string name="accessibility_settings_title" msgid="1687226556576913576">"Tillgänglighetsinställningar"</string>
     <string name="accessibility_settings_summary" msgid="5742379519336396561">"Skärmläsare, skärm och interaktionsinställningar"</string>
-    <string name="vision_settings_title" msgid="7315352351051423944">"Syninställningar"</string>
+    <string name="vision_settings_title" msgid="7315352351051423944">"Inställningar för synskadade"</string>
     <string name="vision_settings_description" msgid="3476589459009287332">"Du kan anpassa enheten efter dina behov. Tillgänglighetsfunktionerna kan ändras senare under Inställningar."</string>
     <string name="vision_settings_suggestion_title" msgid="7268661419110951128">"Ändra teckenstorlek"</string>
     <string name="screen_reader_category_title" msgid="6300714148519645544">"Skärmläsningsprogram"</string>
@@ -2158,7 +2158,7 @@
     <string name="captioning_window_color" msgid="8696903405657599896">"Textningsfönstrets färg"</string>
     <string name="captioning_window_opacity" msgid="4315586548781763353">"Textningsfönstrets genomskinlighet"</string>
     <string name="captioning_foreground_color" msgid="7412509133818882005">"Textfärg"</string>
-    <string name="captioning_foreground_opacity" msgid="7635639017810117478">"Textgenomskinlighet"</string>
+    <string name="captioning_foreground_opacity" msgid="7635639017810117478">"Textopacitet"</string>
     <string name="captioning_edge_color" msgid="4330622137047993780">"Kantfärg"</string>
     <string name="captioning_edge_type" msgid="4414946407430588162">"Typ av kant"</string>
     <string name="captioning_typeface" msgid="7893208796949341767">"Teckensnittsfamilj"</string>
@@ -2392,7 +2392,7 @@
     <string name="usage_type_total_battery_capacity" msgid="1954889791720119945">"Total batterikapacitet"</string>
     <string name="usage_type_computed_power" msgid="2594890316149868151">"Beräknad strömförbrukning"</string>
     <string name="usage_type_actual_power" msgid="8067253427718526111">"Faktisk strömförbrukning"</string>
-    <string name="battery_action_stop" msgid="1866624019460630143">"Tvingad avslutning"</string>
+    <string name="battery_action_stop" msgid="1866624019460630143">"Tvinga att avsluta"</string>
     <string name="battery_action_app_details" msgid="1077011181969550402">"Info om appen"</string>
     <string name="battery_action_app_settings" msgid="587998773852488539">"Appinställningar"</string>
     <string name="battery_action_display" msgid="4887913003634317465">"Skärminställningar"</string>
@@ -3760,10 +3760,10 @@
     <string name="background_check_title" msgid="4136736684290307970">"Fullständig bakgrundsåtkomst"</string>
     <string name="assist_access_context_title" msgid="2274614501747710439">"Använda text från skärmen"</string>
     <string name="assist_access_context_summary" msgid="5867997494395842785">"Tillåt att assistentappen får åtkomst till innehåll på skärmen som text"</string>
-    <string name="assist_access_screenshot_title" msgid="1991014038776117688">"Använda skärmdump"</string>
+    <string name="assist_access_screenshot_title" msgid="1991014038776117688">"Använda skärmbild"</string>
     <string name="assist_access_screenshot_summary" msgid="3010943864000489424">"Tillåt att assistentappen får åtkomst till en bild på skärmen"</string>
     <string name="assist_flash_title" msgid="8852484250748551092">"Lys upp skärmen"</string>
-    <string name="assist_flash_summary" msgid="6697095786317559129">"Lys upp skärmens kanter när assistentappen har tillgång till text på skärmen eller på en skärmdump"</string>
+    <string name="assist_flash_summary" msgid="6697095786317559129">"Lys upp skärmens kanter när assistentappen har tillgång till text på skärmen eller på en skärmbild"</string>
     <string name="assist_footer" msgid="7030121180457472165">"Med assistentappar kan du få hjälp som baseras på den information som visas på den aktuella skärmen. Vissa appar har stöd för både översikts- och röstinmatningstjänster som hjälper dig."</string>
     <string name="average_memory_use" msgid="5333366040118953945">"Genomsnittlig minnesanvändning"</string>
     <string name="maximum_memory_use" msgid="6509872438499846077">"Maximal minnesanvändning"</string>
@@ -3876,7 +3876,7 @@
     <string name="disabled_by_policy_title_outgoing_calls" msgid="3805836913095496278">"Utgående samtal har inaktiverats"</string>
     <string name="disabled_by_policy_title_sms" msgid="1453236584236681105">"SMS har inaktiverats"</string>
     <string name="disabled_by_policy_title_camera" msgid="3741138901926111197">"Kameran har inaktiverats"</string>
-    <string name="disabled_by_policy_title_screen_capture" msgid="1856835333536274665">"Skärmdump har inaktiverats"</string>
+    <string name="disabled_by_policy_title_screen_capture" msgid="1856835333536274665">"Skärmbild har inaktiverats"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4254714213391802322">"Det gick inte att öppna appen"</string>
     <string name="default_admin_support_msg" msgid="5789424433689798637">"Kontakta IT-administratören om du har frågor"</string>
     <string name="admin_support_more_info" msgid="8737842638087863477">"Mer information"</string>
@@ -4083,7 +4083,7 @@
     <string name="sensors_off_quick_settings_title" msgid="3655699045300438902">"Sensorer är inaktiverade"</string>
     <string name="managed_profile_settings_title" msgid="4340409321523532402">"Inställningar för jobbprofilen"</string>
     <string name="managed_profile_contact_search_title" msgid="7337225196804457095">"Kontaktsökning"</string>
-    <string name="managed_profile_contact_search_summary" msgid="7278267480246726951">"Tillåt att organisationen söker bland kontakter för att identifiera ringande och kontakter"</string>
+    <string name="managed_profile_contact_search_summary" msgid="7278267480246726951">"Tillåt att organisationen söker bland kontakter för att identifiera uppringare och kontakter"</string>
     <string name="cross_profile_calendar_title" msgid="2351605904015067145">"Kalender för flera profiler"</string>
     <string name="cross_profile_calendar_summary" msgid="3196258680438896098">"Visa jobbhändelser i den personliga kalendern"</string>
     <string name="cross_profile_calendar_restricted_summary" msgid="6892589892357409107">"Organisationen tillåter inte åtkomst till jobbkalendern via personliga appar"</string>
@@ -4470,7 +4470,7 @@
     <string name="force_desktop_mode_summary" msgid="8865007610266954719">"Tvinga fram experimentellt skrivbordsläge på sekundära skärmar"</string>
     <string name="hwui_force_dark_title" msgid="3744825212652331461">"Åsidosätter tvingat mörkt läge"</string>
     <string name="hwui_force_dark_summary" msgid="2051891908674765817">"Åsidosätter funktionen som tvingar mörkt läge att alltid vara aktiverat"</string>
-    <string name="privacy_dashboard_title" msgid="8764930992456607513">"Sekretess"</string>
+    <string name="privacy_dashboard_title" msgid="8764930992456607513">"Integritet"</string>
     <string name="privacy_dashboard_summary" msgid="7916431309860824945">"Behörigheter, kontoaktivitet, personuppgifter"</string>
     <string name="contextual_card_dismiss_remove" msgid="1750420285615827309">"Ta bort"</string>
     <string name="contextual_card_dismiss_keep" msgid="3204450672928193661">"Behåll"</string>
diff --git a/tests/CarDeveloperOptions/res/values-sw/strings.xml b/tests/CarDeveloperOptions/res/values-sw/strings.xml
index 6a8d648..e0cdec0 100644
--- a/tests/CarDeveloperOptions/res/values-sw/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-sw/strings.xml
@@ -2631,7 +2631,7 @@
     <string name="really_remove_account_title" msgid="4166512362915154319">"Je, ungependa kuondoa akaunti?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Kuondoa akaunti hii kutafuta mazungumzo yako yote, anwani na data zingine kwenye kompyuta kibao!"</string>
     <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Kuondoa akaunti hii kutafuta mazungumzo yako yote, anwani na data nyingine kwenye simu!"</string>
-    <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Kuondoa akaunti hii kutasabibisha kufutwa kwa ujumbe, anwani na data nyingine kwenye kifaa!"</string>
+    <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Kuondoa akaunti hii kutasababisha kufutwa kwa ujumbe, anwani na data nyingine kwenye kifaa!"</string>
     <string name="remove_account_failed" msgid="491458185327106966">"Mabadiliko haya hayaruhusiwi na msimamizi wako"</string>
     <string name="cant_sync_dialog_title" msgid="5483419398223189881">"Huwezi kusawazisha mwenyewe"</string>
     <string name="cant_sync_dialog_message" msgid="3467126947262857534">"Kwa sasa usawazishaji wa kipengee hiki umezimwa. Kubadilisha mpangilio huu, washa kwa muda data ya usuli na usawazishaji kiotomatiki."</string>
@@ -2886,7 +2886,7 @@
     <string name="user_new_user_name" msgid="3880395219777884838">"Mtumiaji mpya"</string>
     <string name="user_new_profile_name" msgid="3074939718101489937">"Wasifu mpya"</string>
     <string name="user_confirm_remove_self_title" msgid="6739480453680217543">"Ungependa kujifuta?"</string>
-    <string name="user_confirm_remove_title" msgid="1034498514019462084">"Ungependa kumtafuta mtumiaji huyu?"</string>
+    <string name="user_confirm_remove_title" msgid="1034498514019462084">"Ungependa kumfuta mtumiaji huyu?"</string>
     <string name="user_profile_confirm_remove_title" msgid="6138684743385947063">"Ungependa kuondoa wasifu?"</string>
     <string name="work_profile_confirm_remove_title" msgid="3168910958076735800">"Ungependa kuondoa wasifu wa kazini?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="2889456786320157545">"Utapoteza nafasi na data yako kwenye kompyuta hii ndogo. Huwezi kutendua kitendo hiki."</string>
@@ -3284,8 +3284,8 @@
     <string name="work_use_personal_sounds_title" msgid="531727195073003599">"Tumia sauti za wasifu wako binafsi"</string>
     <string name="work_use_personal_sounds_summary" msgid="2886871383995187441">"Sauti za wasifu wa binafsi na wa kazini ni sawa"</string>
     <string name="work_ringtone_title" msgid="5499360583947410224">"Mlio wa simu ya kazini"</string>
-    <string name="work_notification_ringtone_title" msgid="8059159087214025757">"Sauti chaguomsingi ya arifa ya kazini"</string>
-    <string name="work_alarm_ringtone_title" msgid="5328487181385375130">"Sauti chaguomsingi ya kengele ya kazini"</string>
+    <string name="work_notification_ringtone_title" msgid="8059159087214025757">"Sauti chaguomsingi ya arifa za kazini"</string>
+    <string name="work_alarm_ringtone_title" msgid="5328487181385375130">"Sauti chaguomsingi ya kengele za kazini"</string>
     <string name="work_sound_same_as_personal" msgid="7728560881697159758">"Sawa na wasifu binafsi"</string>
     <string name="work_sync_dialog_title" msgid="4799120971202956837">"Ungependa kubadilisha sauti?"</string>
     <string name="work_sync_dialog_yes" msgid="2110726233746476066">"Badilisha"</string>
@@ -4456,8 +4456,8 @@
     <string name="network_connection_connect_successful" msgid="888912275986965748">"Imeunganisha"</string>
     <string name="network_connection_request_dialog_showall" msgid="396928496030183071">"Onyesha yote"</string>
     <plurals name="show_bluetooth_devices" formatted="false" msgid="7451733907387872891">
-      <item quantity="other">Imeunganisha vifaa <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g></item>
-      <item quantity="one">Imeunganisha kifaa <xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g></item>
+      <item quantity="other">Vifaa <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> vimeunganishwa</item>
+      <item quantity="one">Kifaa <xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> kimeunganishwa</item>
     </plurals>
     <string name="no_bluetooth_devices" msgid="4338224958734305244">"Hakuna vifaa vya  Bluetooth"</string>
     <string name="bluetooth_left_name" msgid="4393660998014637355">"Kushoto"</string>
diff --git a/tests/CarDeveloperOptions/res/values-ta/strings.xml b/tests/CarDeveloperOptions/res/values-ta/strings.xml
index ce10d08..4c55066 100644
--- a/tests/CarDeveloperOptions/res/values-ta/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ta/strings.xml
@@ -53,7 +53,7 @@
     <string name="radio_info_ims_reg_status_not_registered" msgid="1286050699734226077">"பதிவுசெய்யப்படவில்லை"</string>
     <string name="radio_info_ims_feature_status_available" msgid="2040629393134756058">"இருக்கிறது"</string>
     <string name="radio_info_ims_feature_status_unavailable" msgid="3348223769202693596">"இல்லை"</string>
-    <string name="radio_info_ims_reg_status" msgid="4771711884059371514">"IMS பதிவு: <xliff:g id="STATUS">%1$s</xliff:g>\nவாய்ஸ் ஓவர் LTE: <xliff:g id="AVAILABILITY_0">%2$s</xliff:g>\nவாய்ஸ் ஓவர் WiFi: <xliff:g id="AVAILABILITY_1">%3$s</xliff:g>\nவீடியோ அழைப்பு: <xliff:g id="AVAILABILITY_2">%4$s</xliff:g>\nUT இடைமுகம்: <xliff:g id="AVAILABILITY_3">%5$s</xliff:g>"</string>
+    <string name="radio_info_ims_reg_status" msgid="4771711884059371514">"IMS பதிவு: <xliff:g id="STATUS">%1$s</xliff:g>\nவாய்ஸ் ஓவர் LTE: <xliff:g id="AVAILABILITY_0">%2$s</xliff:g>\nவாய்ஸ் ஓவர் வைஃபை: <xliff:g id="AVAILABILITY_1">%3$s</xliff:g>\nவீடியோ அழைப்பு: <xliff:g id="AVAILABILITY_2">%4$s</xliff:g>\nUT இடைமுகம்: <xliff:g id="AVAILABILITY_3">%5$s</xliff:g>"</string>
     <string name="radioInfo_service_in" msgid="1297020186765943857">"சேவையில் உள்ளது"</string>
     <string name="radioInfo_service_out" msgid="8460363463722476510">"சேவையில் இல்லை"</string>
     <string name="radioInfo_service_emergency" msgid="7674989004735662599">"அவசர அழைப்புகள் மட்டும்"</string>
@@ -322,8 +322,8 @@
     <string name="date_and_time_settings_title" msgid="7827088656940910631">"தேதி &amp; நேரம்"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1573030770187844365">"தேதி மற்றும் நேரத்தை அமை"</string>
     <string name="date_and_time_settings_summary" msgid="4617979434474713417">"தேதி, நேரம், நேரமண்டலம் &amp; வடிவமைப்புகளை அமை"</string>
-    <string name="date_time_auto" msgid="2679132152303750218">"மொபைல் நெட்வொர்க் நேரம்"</string>
-    <string name="zone_auto_title" msgid="5500880975376882488">"மொபைல் நெட்வொர்க் வழங்கும் நேர மண்டலத்தைப் பயன்படுத்து"</string>
+    <string name="date_time_auto" msgid="2679132152303750218">"மொபைல் நெட்வொர்க் வழங்கும் நேரத்தைப் பயன்படுத்தும்"</string>
+    <string name="zone_auto_title" msgid="5500880975376882488">"மொபைல் நெட்வொர்க் வழங்கும் நேர மண்டலத்தைப் பயன்படுத்தும்"</string>
     <string name="date_time_24hour_auto" msgid="7499659679134962547">"இயல்பாகத் தேர்ந்தெடுத்துள்ள மொழியைப் பயன்படுத்தவும்"</string>
     <string name="date_time_24hour_title" msgid="6209923858891621283">"24 மணிநேர வடிவம்"</string>
     <string name="date_time_24hour" msgid="1265706705061608742">"24-மணிநேர வடிவமைப்பில்"</string>
@@ -384,8 +384,8 @@
     <string name="decryption_settings_summary" product="tablet" msgid="7524119945312453569">"சாதனம் என்கிரிப்ட் செய்யப்படவில்லை"</string>
     <string name="lockscreen_settings_title" msgid="1221505938891948413">"பூட்டுத் திரைக் காட்சி"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="3133378945821488654">"எதைக் காட்ட வேண்டும்"</string>
-    <string name="security_settings_summary" msgid="5210109100643223686">"எனது இருப்பிடம், திரை திற, சிம் கார்டு பூட்டு, நற்சான்று சேமிப்பிட பூட்டு ஆகியவற்றை அமைக்கவும்"</string>
-    <string name="cdma_security_settings_summary" msgid="1783066617800041869">"எனது இருப்பிடம், திரையைத் திற, நற்சான்று சேமிப்பிடப் பூட்டு ஆகியவற்றை அமைக்கவும்"</string>
+    <string name="security_settings_summary" msgid="5210109100643223686">"எனது இருப்பிடம், திரை திற, சிம் கார்டு பூட்டு, அனுமதிச் சான்று சேமிப்பக பூட்டு ஆகியவற்றை அமைக்கவும்"</string>
+    <string name="cdma_security_settings_summary" msgid="1783066617800041869">"எனது இருப்பிடம், திரையைத் திற, அனுமதிச் சான்று சேமிப்பகப் பூட்டு ஆகியவற்றை அமைக்கவும்"</string>
     <string name="security_passwords_title" msgid="6853942836045862315">"தனியுரிமை"</string>
     <string name="disabled_by_administrator_summary" msgid="6099821045360491127">"நிர்வாகி முடக்கியுள்ளார்"</string>
     <string name="security_status_title" msgid="1261960357751754428">"பாதுகாப்பு நிலை"</string>
@@ -585,7 +585,7 @@
     <string name="face_unlock_set_unlock_password" msgid="8962344604388383659">"முக அங்கீகாரம் + கடவுச்சொல்"</string>
     <string name="face_unlock_skip_face" msgid="7173197040501143880">"முக அங்கீகாரத்தைத் தவிர்த்து, தொடரவும்"</string>
     <string name="face_unlock_title" msgid="1298031162909236127">"முகத்தைப் பயன்படுத்தி மொபைலைத் திறக்கலாம். இந்த வசதியை உபயோகிக்கும்போது, பாதுகாப்பிற்காகத் திரைப் பூட்டையும் அமைத்திருப்பது அவசியம்."</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="1713159782896140817">"நிர்வாகி, என்கிரிப்ஷன் பாலிசி/நற்சான்று சேமிப்பகம் காரணமாக முடக்கப்பட்டது"</string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="1713159782896140817">"நிர்வாகி, என்கிரிப்ஷன் பாலிசி/அனுமதிச் சான்று சேமிப்பகம் காரணமாக முடக்கப்பட்டது"</string>
     <string name="unlock_set_unlock_mode_off" msgid="2950701212659081973">"ஏதுமில்லை"</string>
     <string name="unlock_set_unlock_mode_none" msgid="3441605629077912292">"ஸ்வைப்"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="8564909572968419459">"பேட்டர்ன்"</string>
@@ -749,7 +749,7 @@
     <string name="bluetooth_preference_device_settings" msgid="4247085616427015908">"சாதன அமைப்பு"</string>
     <string name="bluetooth_preference_paired_dialog_title" msgid="3567187438908143693">"இணைந்த சாதனம்"</string>
     <string name="bluetooth_preference_paired_dialog_internet_option" msgid="3693599743477470469">"இணைய இணைப்பு"</string>
-    <string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="4627309436489645755">"விசைப்பலகை"</string>
+    <string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="4627309436489645755">"கீபோர்டு"</string>
     <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="5290994459307558039">"தொடர்புகளும் அழைப்பு வரலாறும்"</string>
     <string name="bluetooth_pairing_dialog_title" msgid="7900515495932064945">"இந்தச் சாதனத்துடன் இணைக்கவா?"</string>
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7395493311980018460">"ஃபோன் புத்தகத்தைப் பகிரவா?"</string>
@@ -864,7 +864,7 @@
     <string name="wifi_scan_notify_text" msgid="7614101215028336927">"இருப்பிடத் துல்லியத்தை மேம்படுத்த, வைஃபை ஆஃப் செய்யப்பட்டிருந்தாலும்கூட, எந்தநேரத்திலும் ஆப்ஸும் சேவைகளும் வைஃபை நெட்வொர்க்குகளைத் தேடலாம். உதாரணத்திற்கு, இருப்பிடம் சார்ந்த அம்சங்கள் மற்றும் சேவைகளை மேம்படுத்துவதற்கும் இதைப் பயன்படுத்தலாம். <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>தேடுதல் அமைப்புகளில்<xliff:g id="LINK_END_1">LINK_END</xliff:g> இதை மாற்றிக்கொள்ளலாம்."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="723796963816095410">"இருப்பிடத்தின் துல்லியத்தன்மையை மேம்படுத்த, <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ஸ்கேனிங் அமைப்புகளில்<xliff:g id="LINK_END_1">LINK_END</xliff:g> வைஃபை ஸ்கேனிங்கை இயக்கவும்."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="1235445971400237444">"மீண்டும் காட்டாதே"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="2120785188625932076">"உறக்கநிலையில் Wi-Fi இயக்கு"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="2120785188625932076">"உறக்கநிலையில் வைஃபை இயக்கு"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="856670183023402715">"உறக்கத்தின் போது வைஃபையை இயக்குதல்"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="9029652631829560733">"அமைப்பை மாற்றுவதில் சிக்கல் ஏற்பட்டது"</string>
     <string name="wifi_suspend_efficiency_title" msgid="5292408676086580527">"மேம்பட்ட செயல்திறன்"</string>
@@ -1112,7 +1112,7 @@
     <string name="wifi_calling_off_explanation" msgid="1653424723742898015">"’வைஃபை அழைப்பு’ இயக்கத்தில் இருக்கும்போது உங்கள் விருப்பத்தேர்வையும் சிக்னல் வலிமையையும் பொறுத்து வைஃபை நெட்வொர்க்குகளுக்கோ மொபைல் நெட்வொர்க்கிற்கோ உங்கள் மொபைல் அழைப்புகளைத் திசைதிருப்பும். இந்த அம்சத்தை இயக்குவதற்கு முன், கட்டணங்களையும் பிற விவரங்களையும் குறித்து உங்கள் மொபைல் நிறுவனத்திடமிருந்து தெரிந்துகொள்ளவும்.<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="emergency_address_summary" msgid="478668478569851714">"வைஃபை மூலம் அவசர அழைப்பை மேற்கொள்ளும்போது, உங்களின் அப்போதைய இருப்பிடமே உங்கள் முகவரியாகக் கருதப்படும்"</string>
     <string name="private_dns_help_message" msgid="7633526525131196650">"தனிப்பட்ட DNS அம்சங்கள் பற்றி "<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">"வைஃபை அழைப்பைச் செயல்படுத்தவும்"</string>
@@ -1168,7 +1168,7 @@
     <string name="accessibility_category_personal" msgid="1423427301759058762">"தனிப்பட்ட சுயவிவரக் கணக்குகள்"</string>
     <string name="accessibility_work_account_title" msgid="3195468574776888011">"பணி கணக்கு - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_personal_account_title" msgid="7251761883688839354">"தனிப்பட்ட கணக்கு - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
-    <string name="search_settings" msgid="5809250790214921377">"தேடு"</string>
+    <string name="search_settings" msgid="5809250790214921377">"Search"</string>
     <string name="display_settings" msgid="1045535829232307190">"திரை அமைப்பு"</string>
     <string name="accelerometer_title" msgid="2427487734964971453">"திரையைத் தானாகச் சுழற்று"</string>
     <string name="color_mode_title" msgid="8164858320869449142">"வண்ணங்கள்"</string>
@@ -1450,7 +1450,7 @@
     <string name="storage_internal_forget_confirm_title" msgid="331032276130605241">"<xliff:g id="NAME">^1</xliff:g>ஐ அகற்றவா?"</string>
     <string name="storage_internal_forget_confirm" msgid="3052483375203727176">"<xliff:g id="NAME">^1</xliff:g> இல் சேமிக்கப்பட்ட அனைத்து ஆப்ஸ், படங்கள் மற்றும் தரவு ஆகியவற்றை நிரந்தரமாக இழப்பீர்கள்."</string>
     <string name="storage_detail_apps" msgid="8154648512504196820">"ஆப்ஸ்"</string>
-    <string name="storage_detail_images" msgid="6996202225684468964">"படங்கள்"</string>
+    <string name="storage_detail_images" msgid="6996202225684468964">"Images"</string>
     <string name="storage_detail_videos" msgid="6030983354721080849">"வீடியோக்கள்"</string>
     <string name="storage_detail_audio" msgid="6011098436589663944">"ஆடியோ"</string>
     <string name="storage_detail_cached" msgid="5761648455067920683">"தற்காலிகத் தரவு"</string>
@@ -1890,7 +1890,7 @@
     <string name="app_disable_dlg_positive" msgid="5508828271100168073">"ஆப்ஸை முடக்கு"</string>
     <string name="app_disable_dlg_text" msgid="9221864774943530281">"இந்த ஆப்ஸை முடக்கினால் Androidம் பிற ஆப்ஸும் எதிர்பார்த்தவாறு செயல்படாமல் போகக்கூடும். கவனத்திற்கு: சாதனத்தை வாங்கும்போதே ஆப்ஸ் நிறுவப்பட்டுள்ளதால் இதை நீக்க இயலாது. இதை முடக்குவதன் மூலம் ஆஃப் செய்யப்பட்ட நிலையில் ஆப்ஸ் சாதனத்திலேயே இருக்கும்"</string>
     <string name="app_disable_notifications_dlg_title" msgid="699530661413553928">"அறிவிப்புகளை முடக்கவா?"</string>
-    <string name="app_install_details_group_title" msgid="2909597319422976921">"ஸ்டோர்"</string>
+    <string name="app_install_details_group_title" msgid="2909597319422976921">"Store"</string>
     <string name="app_install_details_title" msgid="6954953384372934881">"ஆப்ஸின் விவரங்கள்"</string>
     <string name="app_install_details_summary" msgid="6612222941121363940">"ஆப்ஸ் <xliff:g id="APP_STORE">%1$s</xliff:g> இலிருந்து நிறுவப்பட்டது"</string>
     <string name="instant_app_details_summary" msgid="6384264315914966114">"<xliff:g id="APP_STORE">%1$s</xliff:g> பற்றிய கூடுதல் தகவல்"</string>
@@ -1948,7 +1948,7 @@
     <string name="language_empty_list_user_restricted" msgid="3837176532474949716">"சாதனத்தின் மொழியை உங்களால் மாற்ற முடியாது."</string>
     <string name="language_keyboard_settings_title" msgid="2672573191605298938">"மொழிகள் &amp; உள்ளீடு"</string>
     <string name="input_assistance" msgid="6442646949054057707">"வசதிகள்"</string>
-    <string name="keyboard_settings_category" msgid="5857591390023852850">"விசைப்பலகை &amp; உள்ளீட்டு முறைகள்"</string>
+    <string name="keyboard_settings_category" msgid="5857591390023852850">"கீபோர்டு &amp; உள்ளீட்டு முறைகள்"</string>
     <string name="phone_language" msgid="8471728119195198790">"மொழிகள்"</string>
     <string name="phone_language_summary" msgid="4537422545235866497"></string>
     <string name="auto_replace" msgid="4908063993127848521">"தானாக மாற்றியமை"</string>
@@ -1956,7 +1956,7 @@
     <string name="auto_caps" msgid="5566082723106296847">"தன்னியக்க பேரெழுத்தாக்கல்"</string>
     <string name="auto_caps_summary" msgid="8505254799874525084">"வாக்கியங்களில் முதல் எழுத்தைப் பேரெழுத்தாக அமை"</string>
     <string name="auto_punctuate" msgid="8386007107100525931">"தன்னியக்க நிறுத்தற்குறியிடுதல்"</string>
-    <string name="hardkeyboard_category" msgid="5937171470391551627">"கைமுறை விசைப்பலகை அமைப்பு"</string>
+    <string name="hardkeyboard_category" msgid="5937171470391551627">"கைமுறை கீபோர்டு அமைப்பு"</string>
     <string name="auto_punctuate_summary" msgid="245694025030386370">"\".\" ஐச் செருக Space விசையை இருமுறை அழுத்தவும்"</string>
     <string name="show_password" msgid="620964020348073739">"கடவுச்சொற்களைக் காட்டு"</string>
     <string name="show_password_summary" msgid="1403805089582258620">"உள்ளிடும் போதே எழுத்துகளைச் சற்று நேரம் காட்டும்"</string>
@@ -1965,26 +1965,26 @@
     <string name="spellchecker_language" msgid="5168501692418112444">"மொழி"</string>
     <string name="keyboard_and_input_methods_category" msgid="5870292843201629800">"கீபோர்டுகள்"</string>
     <string name="virtual_keyboard_category" msgid="4313267486239328613">"விர்ச்சுவல் கீபோர்டு"</string>
-    <string name="available_virtual_keyboard_category" msgid="2211375533762470875">"கிடைக்கும் விர்ச்சுவல் கீபோர்ட்"</string>
+    <string name="available_virtual_keyboard_category" msgid="2211375533762470875">"கிடைக்கும் விர்ச்சுவல் கீபோர்டு"</string>
     <string name="add_virtual_keyboard" msgid="490638727157806209">"கீபோர்டுகளை நிர்வகி"</string>
     <string name="keyboard_assistance_category" msgid="2276351807419818125">"கீபோர்டு உதவி"</string>
     <string name="physical_keyboard_title" msgid="3508591962962814313">"கைமுறை கீபோர்டு"</string>
     <string name="show_ime" msgid="7322620473198763563">"விர்ச்சுவல் கீபோர்டைக் காட்டு"</string>
     <string name="show_ime_summary" msgid="3246628154011464373">"கைமுறை கீபோர்டு இயக்கத்தில் இருக்கும் போது இதைத் திரையில் வைத்திரு"</string>
-    <string name="keyboard_shortcuts_helper" msgid="6574386807271399788">"கீபோர்ட் ஷார்ட்கட்களுக்கான உதவி"</string>
+    <string name="keyboard_shortcuts_helper" msgid="6574386807271399788">"கீபோர்டு ஷார்ட்கட்களுக்கான உதவி"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="8024313306403779742">"கிடைக்கும் ஷார்ட்கட்களைக் காட்டு"</string>
     <string name="language_and_input_for_work_category_title" msgid="2053255944038892588">"பணிக் கணக்கிற்கான கீபோர்டுகள் &amp; கருவிகள்"</string>
-    <string name="virtual_keyboards_for_work_title" msgid="3968291646938204523">"பணிக்கான விர்ச்சுவல் கீபோர்ட்"</string>
+    <string name="virtual_keyboards_for_work_title" msgid="3968291646938204523">"பணிக்கான விர்ச்சுவல் கீபோர்டு"</string>
     <string name="default_keyboard_layout" msgid="9171704064451242230">"இயல்பு"</string>
     <string name="pointer_speed" msgid="800691982011350432">"குறிப்பான் வேகம்"</string>
     <string name="game_controller_settings_category" msgid="9066526500617769463">"கேம் கன்ட்ரோலர்"</string>
     <string name="vibrate_input_devices" msgid="3584406079534121467">"அதிர்வைத் திசை திருப்புதல்"</string>
     <string name="vibrate_input_devices_summary" msgid="7503148018220540038">"இணைக்கப்பட்டவுடன், கேம் கண்ட்ரோலருக்கு அதிர்வை அனுப்பு"</string>
-    <string name="keyboard_layout_dialog_title" msgid="4762706917037085797">"விசைப்பலகைத் தளவமைப்பைத் தேர்வுசெய்யவும்"</string>
-    <string name="keyboard_layout_dialog_setup_button" msgid="771293535107618283">"விசைப்பலகைத் தளவமைப்புகளை அமை"</string>
+    <string name="keyboard_layout_dialog_title" msgid="4762706917037085797">"கீபோர்டைத் தளவமைப்பைத் தேர்வுசெய்யவும்"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="771293535107618283">"கீபோர்டைத் தளவமைப்புகளை அமை"</string>
     <string name="keyboard_layout_dialog_switch_hint" msgid="138516114253502182">"மாறுவதற்கு Control-Spacebar ஐ அழுத்தவும்"</string>
     <string name="keyboard_layout_default_label" msgid="8368579311667189793">"இயல்புநிலை"</string>
-    <string name="keyboard_layout_picker_title" msgid="6958831599253031987">"விசைப்பலகைத் தளவமைப்புகள்"</string>
+    <string name="keyboard_layout_picker_title" msgid="6958831599253031987">"கீபோர்டைத் தளவமைப்புகள்"</string>
     <string name="user_dict_settings_title" msgid="1415462066249818756">"தனிப்பட்ட அகராதி"</string>
     <string name="user_dict_settings_for_work_title" msgid="3995828731001225748">"பணியாற்றுவதற்கான தனிப்பட்ட அகராதி"</string>
     <string name="user_dict_settings_summary" msgid="3131259534814181196"></string>
@@ -2010,7 +2010,7 @@
     <string name="testing_phone_info" product="default" msgid="1954062952628179016">"மொபைலில் தகவல்"</string>
     <string name="input_methods_settings_title" msgid="880477541100103388">"உரை உள்ளீடு"</string>
     <string name="input_method" msgid="2426639635860376775">"உள்ளீட்டு முறை"</string>
-    <string name="current_input_method" msgid="4831870685505762355">"நடப்பு விசைப்பலகை"</string>
+    <string name="current_input_method" msgid="4831870685505762355">"நடப்பு கீபோர்டு"</string>
     <string name="input_method_selector" msgid="2053594139601607047">"உள்ளீட்டு முறை தேர்ந்தெடுப்பான்"</string>
     <string name="input_method_selector_show_automatically_title" msgid="6641287899537973903">"தானியங்கு"</string>
     <string name="input_method_selector_always_show_title" msgid="214003059953067317">"எப்போதும் காட்டு"</string>
@@ -2020,9 +2020,9 @@
     <string name="input_method_settings_button" msgid="6151412131733672062">"அமைப்பு"</string>
     <string name="input_methods_settings_label_format" msgid="5927400388781960176">"<xliff:g id="IME_NAME">%1$s</xliff:g> அமைப்பு"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="75557930915149416">"செயலில் உள்ள உள்ளீட்டு முறைகளைத் தேர்வுசெய்க"</string>
-    <string name="onscreen_keyboard_settings_summary" msgid="148763210673670769">"ஸ்கிரீன் கீபோர்ட் அமைப்பு"</string>
-    <string name="builtin_keyboard_settings_title" msgid="3683883402326039724">"கைமுறை விசைப்பலகை"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="6498739864479285932">"கைமுறை விசைப்பலகை அமைப்பு"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="148763210673670769">"ஸ்கிரீன் கீபோர்டு அமைப்பு"</string>
+    <string name="builtin_keyboard_settings_title" msgid="3683883402326039724">"கைமுறை கீபோர்டு"</string>
+    <string name="builtin_keyboard_settings_summary" msgid="6498739864479285932">"கைமுறை கீபோர்டு அமைப்பு"</string>
     <string name="gadget_picker_title" msgid="9146981887780645322">"கேஜெட்டைத் தேர்வுசெய்க"</string>
     <string name="widget_picker_title" msgid="5424689728810684439">"விட்ஜெட்டைத் தேர்வுசெய்யவும்"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="8168110035319637326">"விட்ஜெட்டை உருவாக்கி, அணுகலை அனுமதிக்கவா?"</string>
@@ -2058,8 +2058,8 @@
     <string name="accessibility_preference_magnification_summary" msgid="753307741814376312">"திரையில் பெரிதாக்குவதை இயக்கும்"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="5698545174944494486">"அளவை மாற்ற, 3 முறை தட்டவும்"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="5418767043532322397">"திரையைப் பெரிதாக்க, பட்டனைத் தட்டவும்"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="3363006902079431772"><b>"பெரிதாக்க"</b>", திரையில் 3 முறை வேகமாகத் தட்டவும்.\n"<ul><li>"ஸ்க்ரோல் செய்ய, இரண்டு அல்லது அதற்கு மேற்பட்ட விரல்களால் இழுக்கவும்"</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>
@@ -2211,7 +2211,7 @@
     <string name="print_feature_state_off" msgid="208580346723223688">"ஆஃப்"</string>
     <string name="print_menu_item_add_service" msgid="6803000110578493782">"சேவையைச் சேர்"</string>
     <string name="print_menu_item_add_printer" msgid="8529196211179574921">"பிரிண்டரைச் சேர்"</string>
-    <string name="print_menu_item_search" msgid="1165316329772287360">"தேடு"</string>
+    <string name="print_menu_item_search" msgid="1165316329772287360">"Search"</string>
     <string name="print_searching_for_printers" msgid="6538687129687642542">"பிரிண்டர்களைத் தேடுகிறது"</string>
     <string name="print_service_disabled" msgid="6376344992705893436">"சேவை முடக்கப்பட்டுள்ளது"</string>
     <string name="print_print_jobs" msgid="7357841034181762157">"அச்சுப் பணிகள்"</string>
@@ -2502,7 +2502,7 @@
     <string name="voice_input_output_settings" msgid="2180337183089517667">"குரல் உள்ளீடு &amp; வெளியீடு"</string>
     <string name="voice_input_output_settings_title" msgid="7080213653518526025">"குரல் உள்ளீடு &amp; வெளியீட்டின் அமைப்பு"</string>
     <string name="voice_search_settings_title" msgid="4999026024622014272">"குரல் தேடல்"</string>
-    <string name="keyboard_settings_title" msgid="2056233617644581410">"Android விசைப்பலகை"</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>
     <string name="voice_service_preference_section_title" msgid="2984112696100778038">"குரல் உள்ளீட்டுச் சேவைகள்"</string>
@@ -2522,7 +2522,7 @@
     <string name="tts_reset" msgid="8864073594540705579">"மீட்டமை"</string>
     <string name="tts_play" msgid="9023430029380675514">"இயக்கு"</string>
     <string name="vpn_settings_title" msgid="7008219502396889192">"VPN"</string>
-    <string name="credentials_title" msgid="7119207354982673965">"அனுமதிச் சான்று சேமிப்பிடம்"</string>
+    <string name="credentials_title" msgid="7119207354982673965">"அனுமதிச் சான்று சேமிப்பகம்"</string>
     <string name="credentials_install" product="nosdcard" msgid="8509362500537206883">"சேமிப்பிடத்திலிருந்து நிறுவு"</string>
     <string name="credentials_install" product="default" msgid="8997183776710118353">"SD கார்டிலிருந்து நிறுவு"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="3426661965567059596">"சேமிப்பிடத்திலிருந்து சான்றிதழ்களை நிறுவு"</string>
@@ -2541,8 +2541,8 @@
     <string name="credential_for_vpn_and_apps" msgid="2462642486949593841">"VPN மற்றும் பயன்பாடுகளுக்காக நிறுவியது"</string>
     <string name="credential_for_wifi" msgid="2903295786961726388">"வைஃபைக்காக நிறுவியது"</string>
     <string name="credentials_reset_hint" msgid="3484350477764088169">"எல்லா உள்ளடக்கத்தையும் அகற்றவா?"</string>
-    <string name="credentials_erased" msgid="7287088033523869085">"நற்சான்றிதழ் சேமிப்பிடம் அழிக்கப்பட்டது."</string>
-    <string name="credentials_not_erased" msgid="9137227570738627637">"நற்சான்று சேமிப்பிடத்தை அழிக்க முடியாது."</string>
+    <string name="credentials_erased" msgid="7287088033523869085">"அனுமதிச் சான்று சேமிப்பகம் அழிக்கப்பட்டது."</string>
+    <string name="credentials_not_erased" msgid="9137227570738627637">"அனுமதிச் சான்று சேமிப்பகத்தை அழிக்க முடியாது."</string>
     <string name="usage_access_title" msgid="7981321142726540574">"உபயோக அணுகலுடைய ஆப்ஸ்"</string>
     <string name="emergency_tone_title" msgid="130211364025984428">"அவசரகால டயலிங் சிக்னல்"</string>
     <string name="emergency_tone_summary" msgid="8035940153401622240">"அவசர அழைப்பு இயக்கப்பட்டிருக்கும்போது நடத்தையை அமை"</string>
@@ -2624,7 +2624,7 @@
     <string name="sync_plug" msgid="6703804441408427257"><font fgcolor="#ffffffff">"Google ஒத்திசைவுக்கு வரவேற்கிறோம்!"</font>" \nநீங்கள் எங்கிருந்தாலும் உங்கள் தொடர்புகள், அப்பாயிண்ட்மெண்ட்டுகள் மற்றும் பலவற்றுக்கான அணுகலை அனுமதிப்பதற்காக Google தரவை ஒத்திசைக்கிறது."</string>
     <string name="header_application_sync_settings" msgid="4581847153669774489">"ஆப்ஸ் ஒத்திசைவு அமைப்பு"</string>
     <string name="header_data_and_synchronization" msgid="400831816068697286">"தரவு &amp; ஒத்திசைத்தல்"</string>
-    <string name="preference_change_password_title" msgid="7243527448378789274">"கடவுச்சொல்லை மாற்று"</string>
+    <string name="preference_change_password_title" msgid="7243527448378789274">"கடவுச்சொல்லை மாற்றுதல்"</string>
     <string name="header_account_settings" msgid="8586173964125512219">"கணக்கு அமைப்பு"</string>
     <string name="remove_account_label" msgid="5885425720323823387">"கணக்கை அகற்று"</string>
     <string name="header_add_an_account" msgid="8482614556580804956">"கணக்கைச் சேர்"</string>
@@ -3051,7 +3051,7 @@
     <string name="keywords_wifi" msgid="8477688080895466846">"வைஃபை, வை-ஃபை, நெட்வொர்க் இணைப்பு, இணையம், வயர்லெஸ், டேட்டா, வை ஃபை"</string>
     <string name="keywords_wifi_notify_open_networks" msgid="1031260564121854773">"வைஃபை அறிவிப்பு, கடவுச்சொல் கேட்காத வைஃபை அறிவிப்பு"</string>
     <string name="keywords_auto_brightness" msgid="5007188989783072428">"தானியங்கு ஒளிர்வு"</string>
-    <string name="keywords_vibrate_on_touch" msgid="3615173661462446877">"அதிர்வை நிறுத்து, தட்டு, கீபோர்ட்"</string>
+    <string name="keywords_vibrate_on_touch" msgid="3615173661462446877">"அதிர்வை நிறுத்து, தட்டு, கீபோர்டு"</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>
@@ -3068,7 +3068,7 @@
     <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>
+    <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>
@@ -3792,7 +3792,7 @@
     <string name="zen_access_revoke_warning_dialog_title" msgid="6850994585577513299">"<xliff:g id="APP">%1$s</xliff:g>க்கான தொந்தரவு செய்ய வேண்டாம் அணுகலை ரத்துசெய்யவா?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="3487422193181311403">"இந்த ஆப்ஸ் உருவாக்கிய தொந்தரவு செய்ய வேண்டாம் விதிகள் அனைத்தும் அகற்றப்படும்."</string>
     <string name="ignore_optimizations_on" msgid="4373971641328943551">"மேம்படுத்த வேண்டாம்"</string>
-    <string name="ignore_optimizations_off" msgid="4372289432580282870">"மேம்படுத்து"</string>
+    <string name="ignore_optimizations_off" msgid="4372289432580282870">"Optimize"</string>
     <string name="ignore_optimizations_on_desc" msgid="2904484569799521559">"பேட்டரியை மிக விரைவாகத் தீர்த்துவிடக்கூடும். பின்னணியில் பேட்டரியைப் பயன்படுத்துவதிலிருந்து, ஆப்ஸ் இனி தடுக்கப்படாது."</string>
     <string name="ignore_optimizations_off_desc" msgid="5598702251817814289">"பேட்டரி அதிக நேரம் நீடிப்பதற்காகப் பரிந்துரைக்கப்படுகிறது"</string>
     <string name="ignore_optimizations_title" msgid="7924345545276166305">"பேட்டரி மேம்படுத்தல்களைத் தவிர்க்க, <xliff:g id="APP">%s</xliff:g>ஐ அனுமதிக்கவா?"</string>
@@ -4160,10 +4160,10 @@
     <string name="auto_sync_account_title" msgid="2394463123733529506">"டேட்டாவைத் தானாக ஒத்திசை"</string>
     <string name="auto_sync_personal_account_title" msgid="6844465157916100655">"தனிப்பட்ட டேட்டாவைத் தானாக ஒத்திசை"</string>
     <string name="auto_sync_work_account_title" msgid="2403222633447522376">"பணி டேட்டாவைத் தானாக ஒத்திசை"</string>
-    <string name="auto_sync_account_summary" msgid="6316230976974033772">"ஆப்ஸ் தானாகவே டேட்டாவைப் புதுப்பிக்க அனுமதி"</string>
+    <string name="auto_sync_account_summary" msgid="6316230976974033772">"ஆப்ஸ் தானாகவே டேட்டாவைப் புதுப்பிக்க அனுமதிக்கும்"</string>
     <string name="account_sync_title" msgid="1570164819114297154">"கணக்கு ஒத்திசைவு"</string>
     <string name="account_sync_summary_some_on" msgid="1934556869158274053">"<xliff:g id="ID_2">%2$d</xliff:g> இல் <xliff:g id="ID_1">%1$d</xliff:g>க்கு ஒத்திசைவு இயக்கத்தில் உள்ளது"</string>
-    <string name="account_sync_summary_all_on" msgid="3634161204232431700">"எல்லாவற்றுக்கும் ஒத்திசைவை இயக்கு"</string>
+    <string name="account_sync_summary_all_on" msgid="3634161204232431700">"எல்லாவற்றுக்கும் ஒத்திசைவை இயக்கும்"</string>
     <string name="account_sync_summary_all_off" msgid="1971584632343645602">"எல்லாவற்றுக்கும் ஒத்திசைவை முடக்கு"</string>
     <string name="enterprise_privacy_settings" msgid="2777101678653072889">"நிர்வகிக்கப்படும் சாதனத் தகவல்"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5557859169062703683">"உங்கள் நிறுவனம் நிர்வகிக்கும் மாற்றங்களும் அமைப்புகளும்"</string>
@@ -4193,7 +4193,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ஆப்ஸ்கள்</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ஆப்ஸ்</item>
     </plurals>
-    <string name="enterprise_privacy_input_method" msgid="5885916325874284011">"இயல்பு விசைப்பலகை"</string>
+    <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>
diff --git a/tests/CarDeveloperOptions/res/values-te/arrays.xml b/tests/CarDeveloperOptions/res/values-te/arrays.xml
index 1ae209a..6c2fea7 100644
--- a/tests/CarDeveloperOptions/res/values-te/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-te/arrays.xml
@@ -114,7 +114,7 @@
     <item msgid="5985477119043628504">"ఎప్పటికీ గడువు ముగియదు"</item>
   </string-array>
   <string-array name="bluetooth_max_connected_audio_devices">
-    <item msgid="3800257971619063588">"సిస్టమ్ డిఫాల్ట్‌ని ఉపయోగించు: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="3800257971619063588">"సిస్టమ్ ఆటోమేటిక్ విలువను ఉపయోగించు: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
     <item msgid="8572230405241423895">"1"</item>
     <item msgid="5318020123964299318">"2"</item>
     <item msgid="6429260054182662738">"3"</item>
diff --git a/tests/CarDeveloperOptions/res/values-te/strings.xml b/tests/CarDeveloperOptions/res/values-te/strings.xml
index 6e54dda..4f601df 100644
--- a/tests/CarDeveloperOptions/res/values-te/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-te/strings.xml
@@ -767,7 +767,7 @@
     <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="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="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>
     <string name="bluetooth_device_mac_address" msgid="5328203122581150405">"పరికరం యొక్క బ్లూటూత్ చిరునామా: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
@@ -802,7 +802,7 @@
     <string name="wifi_display_enable_menu_item" msgid="4578340247147692250">"వైర్‌లెస్ ప్రదర్శనను ప్రారంభించు"</string>
     <string name="wifi_display_no_devices_found" msgid="186501729518830451">"సమీపంలోని పరికరాలు కనుగొనబడలేదు."</string>
     <string name="wifi_display_status_connecting" msgid="3799827425457383349">"కనెక్ట్ చేస్తున్నవి"</string>
-    <string name="wifi_display_status_connected" msgid="85692409327461403">"కనెక్ట్ చేయబడినవి"</string>
+    <string name="wifi_display_status_connected" msgid="85692409327461403">"కనెక్ట్ అయింది"</string>
     <string name="wifi_display_status_in_use" msgid="7646114501132773174">"ఉపయోగంలో ఉన్నవి"</string>
     <string name="wifi_display_status_not_available" msgid="5600448733204688205">"అందుబాటులో లేదు"</string>
     <string name="wifi_display_details" msgid="6379855523460749126">"ప్రదర్శన సెట్టింగ్‌లు"</string>
@@ -1168,7 +1168,7 @@
     <string name="accessibility_category_personal" msgid="1423427301759058762">"వ్యక్తిగత ప్రొఫైల్ ఖాతాలు"</string>
     <string name="accessibility_work_account_title" msgid="3195468574776888011">"కార్యాలయ ఖాతా - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_personal_account_title" msgid="7251761883688839354">"వ్యక్తిగత ఖాతా - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
-    <string name="search_settings" msgid="5809250790214921377">"వెతుకు"</string>
+    <string name="search_settings" msgid="5809250790214921377">"Search"</string>
     <string name="display_settings" msgid="1045535829232307190">"డిస్‌ప్లే"</string>
     <string name="accelerometer_title" msgid="2427487734964971453">"స్క్రీన్ ఆటో-రొటేట్‌"</string>
     <string name="color_mode_title" msgid="8164858320869449142">"రంగులు"</string>
@@ -1223,7 +1223,7 @@
     <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_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>
@@ -1369,7 +1369,7 @@
     <string name="memory_available_read_only" msgid="9125440204248584531">"అందుబాటులో ఉంది (చదవడానికి-మాత్రమే)"</string>
     <string name="memory_size" msgid="6637939229251056764">"మొత్తం స్థలం"</string>
     <string name="memory_calculating_size" msgid="8407591625479256510">"గణిస్తోంది..."</string>
-    <string name="memory_apps_usage" msgid="1886814780760368266">"అనువర్తనాలు &amp; అనువర్తన డేటా"</string>
+    <string name="memory_apps_usage" msgid="1886814780760368266">"యాప్‌లు &amp; అనువర్తన డేటా"</string>
     <string name="memory_media_usage" msgid="2744652206722240527">"మీడియా"</string>
     <string name="memory_downloads_usage" msgid="7039979723012065168">"డౌన్‌లోడ్‌లు"</string>
     <string name="memory_dcim_usage" msgid="599009211606524732">"చిత్రాలు, వీడియోలు"</string>
@@ -1395,8 +1395,8 @@
     <string name="mtp_ptp_mode_summary" msgid="6074099855478444183">"MTP లేదా PTP ఫంక్షన్ సక్రియంగా ఉంది"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3843209947310774105">"USB నిల్వను అన్‌మౌంట్ చేయాలా?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="4400426555375434431">"SD కార్డు‌ను అన్‌మౌంట్ చేయాలా?"</string>
-    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="1423648405874813948">"మీరు USB నిల్వను అన్‌మౌంట్ చేస్తే, మీరు ఉపయోగిస్తున్న కొన్ని అనువర్తనాలు USB నిల్వను రీమౌంట్ చేసే వరకు పని చేయకుండా ఆగిపోతాయి మరియు అందుబాటులో ఉండకపోవచ్చు."</string>
-    <string name="dlg_confirm_unmount_text" product="default" msgid="4099391737780732622">"మీరు SD కార్డు‌ను అన్‌మౌంట్ చేస్తే, మీరు ఉపయోగిస్తున్న కొన్ని అనువర్తనాలు SD కార్డు‌ను రీమౌంట్ చేసేవరకు ఆగిపోతాయి మరియు అందుబాటులో ఉండకపోవచ్చు."</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="1423648405874813948">"మీరు USB నిల్వను అన్‌మౌంట్ చేస్తే, మీరు ఉపయోగిస్తున్న కొన్ని యాప్‌లు USB నిల్వను రీమౌంట్ చేసే వరకు పని చేయకుండా ఆగిపోతాయి మరియు అందుబాటులో ఉండకపోవచ్చు."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="4099391737780732622">"మీరు SD కార్డు‌ను అన్‌మౌంట్ చేస్తే, మీరు ఉపయోగిస్తున్న కొన్ని యాప్‌లు SD కార్డు‌ను రీమౌంట్ చేసేవరకు ఆగిపోతాయి మరియు అందుబాటులో ఉండకపోవచ్చు."</string>
     <string name="dlg_error_unmount_title" product="nosdcard" msgid="3132640848329117857"></string>
     <string name="dlg_error_unmount_title" product="default" msgid="3132640848329117857"></string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="4710773826053117136">"USB నిల్వను అన్‌మౌంట్ చేయడం సాధ్యపడలేదు. తర్వాత మళ్లీ ప్రయత్నించండి."</string>
@@ -1406,7 +1406,7 @@
     <string name="sd_ejecting_title" msgid="595074246815112145">"అన్‌మౌంట్ చేస్తోంది"</string>
     <string name="sd_ejecting_summary" msgid="5708943172014003213">"అన్‌మౌంట్ ప్రోగ్రెస్‌లో ఉంది"</string>
     <string name="storage_low_title" msgid="6957178208426099592">"నిల్వ స్థలం అయిపోతోంది"</string>
-    <string name="storage_low_summary" msgid="4475275204869514141">"సమకాలీకరించడం వంటి కొన్ని సిస్టమ్ కార్యాచరణలు సరిగ్గా పని చేయకపోవచ్చు. అనువర్తనాలు లేదా మీడియా కంటెంట్ వంటి అంశాలను తొలగించడం లేదా అన్‌పిన్ చేయడం ద్వారా స్థలాన్ని ఖాళీ చేయడానికి ప్రయత్నించండి."</string>
+    <string name="storage_low_summary" msgid="4475275204869514141">"సమకాలీకరించడం వంటి కొన్ని సిస్టమ్ కార్యాచరణలు సరిగ్గా పని చేయకపోవచ్చు. యాప్‌లు లేదా మీడియా కంటెంట్ వంటి అంశాలను తొలగించడం లేదా అన్‌పిన్ చేయడం ద్వారా స్థలాన్ని ఖాళీ చేయడానికి ప్రయత్నించండి."</string>
     <string name="storage_menu_rename" msgid="3731682449294417745">"పేరు మార్చు"</string>
     <string name="storage_menu_mount" msgid="6395893560780365473">"మౌంట్ చేయి"</string>
     <string name="storage_menu_unmount" msgid="5041360076873514189">"తొలగించు"</string>
@@ -1426,7 +1426,7 @@
     <string name="usb_ptp_title" msgid="6629335976394685361">"కెమెరా (PTP)"</string>
     <string name="usb_ptp_summary" msgid="460425275251168189">"కెమెరా సాఫ్ట్‌వేర్‌ను ఉపయోగించి ఫోటోలను బదిలీ చేయడానికి మరియు MTPకి మద్దతివ్వని కంప్యూటర్‌ల్లో ఏవైనా ఫైల్‌లను బదిలీ చేయడానికి మిమ్మల్ని అనుమతిస్తుంది"</string>
     <string name="usb_midi_title" msgid="8626512517313340943">"MIDI"</string>
-    <string name="usb_midi_summary" msgid="3607444815743771712">"MIDI ప్రారంభిత అనువర్తనాలు USB ద్వారా మీ కంప్యూటర్‌లోని MIDI సాఫ్ట్‌వేర్‌తో పని చేసేలా అనుమతిస్తుంది."</string>
+    <string name="usb_midi_summary" msgid="3607444815743771712">"MIDI ప్రారంభిత యాప్‌లు USB ద్వారా మీ కంప్యూటర్‌లోని MIDI సాఫ్ట్‌వేర్‌తో పని చేసేలా అనుమతిస్తుంది."</string>
     <string name="storage_other_users" msgid="1055693465220962928">"ఇతర వినియోగదారులు"</string>
     <string name="storage_internal_title" msgid="7969898703086593200">"పరికర నిల్వ"</string>
     <string name="storage_external_title" msgid="3308178326521953306">"పోర్టబుల్ నిల్వ"</string>
@@ -1444,13 +1444,13 @@
     <string name="storage_dialog_unmounted" msgid="515810851912430933">"ఈ <xliff:g id="NAME_0">^1</xliff:g> సురక్షితంగా తొలగించబడింది, కానీ ఇప్పటికీ అందుబాటులో ఉంది. \n\nఈ <xliff:g id="NAME_1">^1</xliff:g>ని ఉపయోగించడానికి, మీరు ముందుగా దీన్ని మౌంట్ చేయాలి."</string>
     <string name="storage_dialog_unmountable" msgid="7082856306456936054">"ఈ <xliff:g id="NAME_0">^1</xliff:g> పాడైంది. \n\nఈ <xliff:g id="NAME_1">^1</xliff:g>ని ఉపయోగించడానికి, మీరు ముందుగా దీన్ని సెటప్ చేయాలి."</string>
     <string name="storage_dialog_unsupported" msgid="8274023677580782553">"ఈ పరికరంలో ఈ <xliff:g id="NAME_0">^1</xliff:g>కి మద్దతు లేదు. \n\nఈ పరికరంలో ఈ <xliff:g id="NAME_1">^1</xliff:g>ని ఉపయోగించడానికి, మీరు ముందుగా దీన్ని సెటప్ చేయాలి."</string>
-    <string name="storage_internal_format_details" msgid="2780806013122012384">"ఫార్మాట్ చేసిన తర్వాత, మీరు ఈ <xliff:g id="NAME_0">^1</xliff:g>ని ఇతర పరికరాల్లో ఉపయోగించవచ్చు. \n\nఈ <xliff:g id="NAME_1">^1</xliff:g>లోని మొత్తం డేటా తొలగించబడుతుంది. ముందుగా బ్యాకప్ చేయడాన్ని పరిశీలించండి. \n\n"<b>"ఫోటోలు &amp; ఇతర మీడియాను బ్యాకప్ చేయండి"</b>" \nమీ మీడియా ఫైల్‌లను ఈ పరికరంలోని ప్రత్యామ్నాయ నిల్వకు తరలించండి లేదా USB కేబుల్‌ను ఉపయోగించి వాటిని కంప్యూటర్‌కి బదిలీ చేయండి. \n\n"<b>"అనువర్తనాలను బ్యాకప్ చేయండి"</b>" \nఈ <xliff:g id="NAME_6">^1</xliff:g>లోని అన్ని అనువర్తనాలు అన్ఇన్‌స్టాల్ చేయబడతాయి మరియు వాటి డేటా తొలగించబడుతుంది. ఈ అనువర్తనాలను అలాగే ఉంచడానికి, వీటిని ఈ పరికరంలోని ప్రత్యామ్నాయ నిల్వకు తరలించండి."</string>
-    <string name="storage_internal_unmount_details" msgid="4667435317528624039"><b>"మీరు ఈ <xliff:g id="NAME_0">^1</xliff:g>ను తొలగించినప్పుడు, దీనిలో నిల్వ చేసిన అనువర్తనాలు పని చేయకుండా ఆగిపోతాయి మరియు దీనిలో నిల్వ చేసిన మీడియా ఫైల్‌లు దీన్ని తిరిగి చొప్పించే వరకు అందుబాటులో లేకుండాపోతాయి."</b>" \n\nఈ <xliff:g id="NAME_1">^1</xliff:g> ఈ పరికరంలో మాత్రమే పని చేసేలా ఫార్మాట్ చేయబడింది. ఇది ఇంక వేటిలోనూ పని చేయదు."</string>
-    <string name="storage_internal_forget_details" msgid="5655856574682184453">"ఈ <xliff:g id="NAME">^1</xliff:g> కలిగి ఉన్న అనువర్తనాలు, ఫోటోలు లేదా డేటాను ఉపయోగించడానికి, దాన్ని మళ్లీ చొప్పించండి. \n\nపరికరం అందుబాటులో లేకపోతే ప్రత్యామ్నాయంగా మీరు ఈ నిల్వను విస్మరించేలా ఎంచుకోవచ్చు. \n\nమీరు విస్మరించాలని ఎంచుకుంటే, పరికరంలో ఉన్న మొత్తం డేటాను శాశ్వతంగా కోల్పోతారు. \n\nమీరు తర్వాత అనువర్తనాలను మళ్లీ ఇన్‌స్టాల్ చేయవచ్చు, కానీ ఈ పరికరంలో నిల్వ చేసిన వాటి డేటాను కోల్పోతారు."</string>
+    <string name="storage_internal_format_details" msgid="2780806013122012384">"ఫార్మాట్ చేసిన తర్వాత, మీరు ఈ <xliff:g id="NAME_0">^1</xliff:g>ని ఇతర పరికరాల్లో ఉపయోగించవచ్చు. \n\nఈ <xliff:g id="NAME_1">^1</xliff:g>లోని మొత్తం డేటా తొలగించబడుతుంది. ముందుగా బ్యాకప్ చేయడాన్ని పరిశీలించండి. \n\n"<b>"ఫోటోలు &amp; ఇతర మీడియాను బ్యాకప్ చేయండి"</b>" \nమీ మీడియా ఫైల్‌లను ఈ పరికరంలోని ప్రత్యామ్నాయ నిల్వకు తరలించండి లేదా USB కేబుల్‌ను ఉపయోగించి వాటిని కంప్యూటర్‌కి బదిలీ చేయండి. \n\n"<b>"అనువర్తనాలను బ్యాకప్ చేయండి"</b>" \nఈ <xliff:g id="NAME_6">^1</xliff:g>లోని అన్ని యాప్‌లు అన్ఇన్‌స్టాల్ చేయబడతాయి మరియు వాటి డేటా తొలగించబడుతుంది. ఈ అనువర్తనాలను అలాగే ఉంచడానికి, వీటిని ఈ పరికరంలోని ప్రత్యామ్నాయ నిల్వకు తరలించండి."</string>
+    <string name="storage_internal_unmount_details" msgid="4667435317528624039"><b>"మీరు ఈ <xliff:g id="NAME_0">^1</xliff:g>ను తొలగించినప్పుడు, దీనిలో నిల్వ చేసిన యాప్‌లు పని చేయకుండా ఆగిపోతాయి మరియు దీనిలో నిల్వ చేసిన మీడియా ఫైల్‌లు దీన్ని తిరిగి చొప్పించే వరకు అందుబాటులో లేకుండాపోతాయి."</b>" \n\nఈ <xliff:g id="NAME_1">^1</xliff:g> ఈ పరికరంలో మాత్రమే పని చేసేలా ఫార్మాట్ చేయబడింది. ఇది ఇంక వేటిలోనూ పని చేయదు."</string>
+    <string name="storage_internal_forget_details" msgid="5655856574682184453">"ఈ <xliff:g id="NAME">^1</xliff:g> కలిగి ఉన్న యాప్‌లు, ఫోటోలు లేదా డేటాను ఉపయోగించడానికి, దాన్ని మళ్లీ చొప్పించండి. \n\nపరికరం అందుబాటులో లేకపోతే ప్రత్యామ్నాయంగా మీరు ఈ నిల్వను విస్మరించేలా ఎంచుకోవచ్చు. \n\nమీరు విస్మరించాలని ఎంచుకుంటే, పరికరంలో ఉన్న మొత్తం డేటాను శాశ్వతంగా కోల్పోతారు. \n\nమీరు తర్వాత అనువర్తనాలను మళ్లీ ఇన్‌స్టాల్ చేయవచ్చు, కానీ ఈ పరికరంలో నిల్వ చేసిన వాటి డేటాను కోల్పోతారు."</string>
     <string name="storage_internal_forget_confirm_title" msgid="331032276130605241">"<xliff:g id="NAME">^1</xliff:g>ని విస్మరించాలా?"</string>
-    <string name="storage_internal_forget_confirm" msgid="3052483375203727176">"ఈ <xliff:g id="NAME">^1</xliff:g>లో నిల్వ చేయబడిన అన్ని అనువర్తనాలు, ఫోటోలు మరియు డేటాను శాశ్వతంగా కోల్పోతారు."</string>
+    <string name="storage_internal_forget_confirm" msgid="3052483375203727176">"ఈ <xliff:g id="NAME">^1</xliff:g>లో నిల్వ చేయబడిన అన్ని యాప్‌లు, ఫోటోలు మరియు డేటాను శాశ్వతంగా కోల్పోతారు."</string>
     <string name="storage_detail_apps" msgid="8154648512504196820">"యాప్‌లు"</string>
-    <string name="storage_detail_images" msgid="6996202225684468964">"చిత్రాలు"</string>
+    <string name="storage_detail_images" msgid="6996202225684468964">"ఇమేజ్‌లు"</string>
     <string name="storage_detail_videos" msgid="6030983354721080849">"వీడియోలు"</string>
     <string name="storage_detail_audio" msgid="6011098436589663944">"ఆడియో"</string>
     <string name="storage_detail_cached" msgid="5761648455067920683">"కాష్ చేసిన డేటా"</string>
@@ -1459,12 +1459,12 @@
     <string name="storage_detail_explore" msgid="8206900269596580264">"<xliff:g id="NAME">^1</xliff:g>ని అన్వేషించండి"</string>
     <string name="storage_detail_dialog_other" msgid="5073511663616043370">"ఇతరంలో యాప్‌ల ద్వారా సేవ్ చేయబడిన షేర్ చేసిన ఫైల్‌లు, ఇంటర్నెట్ లేదా బ్లూటూత్ నుండి డౌన్‌లోడ్ చేసిన ఫైల్‌లు, Android ఫైల్‌లు మొదలైనవి ఉంటాయి. \n\nఈ <xliff:g id="NAME">^1</xliff:g> మొత్తం కంటెంట్‌లను చూడటానికి, విశ్లేషించును నొక్కండి."</string>
     <string name="storage_detail_dialog_system" msgid="1472572861360014226">"సిస్టమ్‌లో Android వెర్షన్ <xliff:g id="VERSION">%s</xliff:g>ని అమలు చేయడానికి అవసరమైన ఫైల్‌లు ఉంటాయి"</string>
-    <string name="storage_detail_dialog_user" msgid="1663117417635010371">"<xliff:g id="USER_0">^1</xliff:g> <xliff:g id="SIZE">^2</xliff:g> నిల్వను ఉపయోగించి ఫోటోలు, సంగీతం, అనువర్తనాలు లేదా ఇతర డేటాని సేవ్ చేసి ఉండవచ్చు. \n\nవివరాలు వీక్షించాలంటే, <xliff:g id="USER_1">^1</xliff:g>కు మారండి."</string>
+    <string name="storage_detail_dialog_user" msgid="1663117417635010371">"<xliff:g id="USER_0">^1</xliff:g> <xliff:g id="SIZE">^2</xliff:g> నిల్వను ఉపయోగించి ఫోటోలు, సంగీతం, యాప్‌లు లేదా ఇతర డేటాని సేవ్ చేసి ఉండవచ్చు. \n\nవివరాలు వీక్షించాలంటే, <xliff:g id="USER_1">^1</xliff:g>కు మారండి."</string>
     <string name="storage_wizard_init_title" msgid="3407283236421089014">"మీ <xliff:g id="NAME">^1</xliff:g> సెటప్ చేయండి"</string>
     <string name="storage_wizard_init_external_title" msgid="6853250619674645478">"పోర్టబుల్ నిల్వగా ఉపయోగించు"</string>
     <string name="storage_wizard_init_external_summary" msgid="6993815290050489327">"ఫోటోలను మరియు ఇతర మీడియాను పరికరాల మధ్య తరలించడానికి."</string>
     <string name="storage_wizard_init_internal_title" msgid="8750856962785644870">"అంతర్గత నిల్వగా ఉపయోగించు"</string>
-    <string name="storage_wizard_init_internal_summary" msgid="4510546464921608029">"అనువర్తనాలు మరియు ఫోటోలతో సహా దేన్నైనా ఈ పరికరంలో మాత్రమే నిల్వ చేయడానికి. దీన్ని ఇతర పరికరాలతో పని చేయకుండా నిరోధించే ఫార్మాటింగ్ అవసరం."</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_public_title" msgid="5866830103788091426">"పోర్టబుల్ నిల్వగా ఫార్మాట్ చేయండి"</string>
@@ -1473,24 +1473,24 @@
     <string name="storage_wizard_format_progress_title" msgid="6905902731208646436">"<xliff:g id="NAME">^1</xliff:g>ని ఫార్మాట్ చేస్తోంది…"</string>
     <string name="storage_wizard_format_progress_body" msgid="5346709539457190419">"<xliff:g id="NAME">^1</xliff:g>ని ఫార్మాట్ చేసే సమయంలో దీనిని తీసివేయవద్దు."</string>
     <string name="storage_wizard_migrate_title" msgid="7440473364104826496">"డేటాను కొత్త నిల్వకు తరలించండి"</string>
-    <string name="storage_wizard_migrate_body" msgid="4959356431201831339">"మీరు మీ ఫోటోలు, ఫైల్‌లు మరియు కొన్ని అనువర్తనాలను ఈ కొత్త <xliff:g id="NAME">^1</xliff:g>కి తరలించవచ్చు. \n\nతరలించడానికి సుమారు <xliff:g id="TIME">^2</xliff:g> పట్టవచ్చు మరియు దీని వలన అంతర్గత నిల్వలో <xliff:g id="SIZE">^3</xliff:g> ఖాళీ అవుతుంది. ఇది జరుగుతున్నప్పుడు కొన్ని అనువర్తనాలు పని చేయవు."</string>
+    <string name="storage_wizard_migrate_body" msgid="4959356431201831339">"మీరు మీ ఫోటోలు, ఫైల్‌లు మరియు కొన్ని అనువర్తనాలను ఈ కొత్త <xliff:g id="NAME">^1</xliff:g>కి తరలించవచ్చు. \n\nతరలించడానికి సుమారు <xliff:g id="TIME">^2</xliff:g> పట్టవచ్చు మరియు దీని వలన అంతర్గత నిల్వలో <xliff:g id="SIZE">^3</xliff:g> ఖాళీ అవుతుంది. ఇది జరుగుతున్నప్పుడు కొన్ని యాప్‌లు పని చేయవు."</string>
     <string name="storage_wizard_migrate_now" msgid="9004605853000689024">"ఇప్పుడే తరలించు"</string>
     <string name="storage_wizard_migrate_later" msgid="5303070653970922924">"తర్వాత తరలించు"</string>
     <string name="storage_wizard_migrate_confirm_title" msgid="5768497751644935313">"డేటాను ఇప్పుడే తరలించు"</string>
     <string name="storage_wizard_migrate_confirm_body" msgid="7297723787416643076"><b>"తరలించడానికి సుమారు <xliff:g id="TIME">^1</xliff:g> పడుతుంది. దీని వలన <xliff:g id="NAME">^3</xliff:g>లో <xliff:g id="SIZE">^2</xliff:g> ఖాళీ చేయబడుతుంది."</b></string>
     <string name="storage_wizard_migrate_confirm_next" msgid="6539804689462991087">"తరలించు"</string>
     <string name="storage_wizard_migrate_progress_title" msgid="7542196688665109833">"డేటాను తరలిస్తోంది…"</string>
-    <string name="storage_wizard_migrate_details" msgid="4269509141637554985">"తరలించే సమయంలో: \n• <xliff:g id="NAME">^1</xliff:g>ని తీసివేయవద్దు. \n• కొన్ని అనువర్తనాలు సరిగ్గా పని చేయవు. \n• పరికరం ఛార్జ్ చేసి పెట్టండి."</string>
+    <string name="storage_wizard_migrate_details" msgid="4269509141637554985">"తరలించే సమయంలో: \n• <xliff:g id="NAME">^1</xliff:g>ని తీసివేయవద్దు. \n• కొన్ని యాప్‌లు సరిగ్గా పని చేయవు. \n• పరికరం ఛార్జ్ చేసి పెట్టండి."</string>
     <string name="storage_wizard_ready_title" msgid="4905921139763520341">"మీ <xliff:g id="NAME">^1</xliff:g> ఉపయోగించడానికి సిద్ధంగా ఉంది"</string>
     <string name="storage_wizard_ready_external_body" msgid="8785407468656286236">"మీ <xliff:g id="NAME">^1</xliff:g> ఫోటోలు మరియు ఇతర మీడియాతో ఉపయోగించేలా పూర్తిగా సెట్ చేయబడింది."</string>
     <string name="storage_wizard_ready_internal_body" msgid="2258287496678469217">"మీ కొత్త <xliff:g id="NAME">^1</xliff:g> పని చేస్తోంది. \n\nఫోటోలు, ఫైల్‌లు మరియు అనువర్తన డేటాను ఈ పరికరానికి తరలించడానికి, సెట్టింగ్‌లు &gt; నిల్వకు వెళ్లండి."</string>
     <string name="storage_wizard_move_confirm_title" msgid="7362472162039287488">"<xliff:g id="APP">^1</xliff:g>ని తరలించండి"</string>
-    <string name="storage_wizard_move_confirm_body" msgid="502315190416551319">"<xliff:g id="APP">^1</xliff:g>ను మరియు దాని డేటాను <xliff:g id="NAME_0">^2</xliff:g>కి తరలించడానికి కేవలం కొన్ని క్షణాల సమయం పడుతుంది. మీరు తరలింపు పూర్తయ్యే వరకు అనువర్తనాన్ని ఉపయోగించలేరు. \n\nతరలించే సమయంలో <xliff:g id="NAME_1">^2</xliff:g>ని తీసివేయవద్దు."</string>
+    <string name="storage_wizard_move_confirm_body" msgid="502315190416551319">"<xliff:g id="APP">^1</xliff:g>ను మరియు దాని డేటాను <xliff:g id="NAME_0">^2</xliff:g>కి తరలించడానికి కేవలం కొన్ని క్షణాల సమయం పడుతుంది. మీరు తరలింపు పూర్తయ్యే వరకు యాప్‌ను ఉపయోగించలేరు. \n\nతరలించే సమయంలో <xliff:g id="NAME_1">^2</xliff:g>ని తీసివేయవద్దు."</string>
     <string name="storage_wizard_move_unlock" msgid="7978193904519827600">"డేటాను తరలించడానికి మీరు వినియోగదారు <xliff:g id="APP">^1</xliff:g>ని అన్‌లాక్ చేయాలి."</string>
     <string name="storage_wizard_move_progress_title" msgid="5250929161803336592">"<xliff:g id="APP">^1</xliff:g>ని తరలిస్తోంది…"</string>
     <string name="storage_wizard_move_progress_body" msgid="1713792142250410169">"తరలించే సమయంలో <xliff:g id="NAME">^1</xliff:g>ని తీసివేయవద్దు. \n\nఈ డివైజ్‌లోని <xliff:g id="APP">^2</xliff:g> యాప్ తరలింపు పూర్తయ్యే వరకు అందుబాటులో ఉండదు."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="9047521329704060401">"తరలింపు రద్దు చేయి"</string>
-    <string name="storage_wizard_slow_body" msgid="2307974936036261069">"ఈ <xliff:g id="NAME_0">^1</xliff:g> నెమ్మదిగా ఉన్నట్లు కనిపిస్తోంది. \n\nమీరు కొనసాగవచ్చు, కానీ ఈ స్థానానికి తరలించిన అనువర్తనాలు మధ్యమధ్యలో ఆటంకాలతో అంత బాగా పని చేయకపోవచ్చు మరియు డేటా బదిలీలకు ఎక్కువ సమయం పట్టవచ్చు. \n\nమెరుగైన పనితీరు కోసం వేగవంతమైన <xliff:g id="NAME_1">^1</xliff:g>ని ఉపయోగించడం పరిశీలించండి."</string>
+    <string name="storage_wizard_slow_body" msgid="2307974936036261069">"ఈ <xliff:g id="NAME_0">^1</xliff:g> నెమ్మదిగా ఉన్నట్లు కనిపిస్తోంది. \n\nమీరు కొనసాగవచ్చు, కానీ ఈ స్థానానికి తరలించిన యాప్‌లు మధ్యమధ్యలో ఆటంకాలతో అంత బాగా పని చేయకపోవచ్చు మరియు డేటా బదిలీలకు ఎక్కువ సమయం పట్టవచ్చు. \n\nమెరుగైన పనితీరు కోసం వేగవంతమైన <xliff:g id="NAME_1">^1</xliff:g>ని ఉపయోగించడం పరిశీలించండి."</string>
     <string name="storage_wizard_init_v2_title" msgid="7408910177547901960">"మీరు ఈ <xliff:g id="NAME">^1</xliff:g>ని ఎలా ఉపయోగిస్తారు?"</string>
     <string name="storage_wizard_init_v2_internal_title" product="tablet" msgid="7948795312504302810">"అదనపు టాబ్లెట్ నిల్వ కోసం ఉపయోగించండి"</string>
     <string name="storage_wizard_init_v2_internal_summary" product="tablet" msgid="6237770506398410172">"ఈ టాబ్లెట్‌లో ఉన్న యాప్‌లు, ఫైల్‌లు మరియు మీడియా కోసం మాత్రమే"</string>
@@ -1568,7 +1568,7 @@
     <string name="restore_default_apn" msgid="7195266404077471007">"డిఫాల్ట్ APN సెట్టింగ్‌లను పునరుద్ధరిస్తోంది."</string>
     <string name="menu_restore" msgid="3799288817317293115">"డిఫాల్ట్‌కు రీసెట్ చేయి"</string>
     <string name="restore_default_apn_completed" msgid="5671734152740058937">"డిఫాల్ట్ APN సెట్టింగ్‌లను రీసెట్ చేయడం పూర్తయింది."</string>
-    <string name="reset_dashboard_title" msgid="7084966342252178530">"రీసెట్ ఎంపికలు"</string>
+    <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, మొబైల్ &amp; బ్లూటూత్‌ని రీసెట్ చేయండి"</string>
     <string name="reset_network_desc" msgid="4982633363916261109">"ఇది అన్ని నెట్‌వర్క్ సెట్టింగ్‌లను రీసెట్ చేస్తుంది, వీటితో సహా:\n\n"<li>"Wi‑Fi"</li>\n<li>"మొబైల్ డేటా"</li>\n<li>"బ్లూటూత్"</li></string>
@@ -1634,7 +1634,7 @@
     <string name="network_settings_title" msgid="8516526011407061679">"మొబైల్ నెట్‌వర్క్"</string>
     <string name="manage_mobile_plan_title" msgid="3312016665522553062">"మొబైల్ ప్లాన్"</string>
     <string name="sms_application_title" msgid="7815840568119334679">"SMS యాప్"</string>
-    <string name="sms_change_default_dialog_title" msgid="6301260161969667578">"SMS అనువర్తనాన్ని మార్చాలా?"</string>
+    <string name="sms_change_default_dialog_title" msgid="6301260161969667578">"SMS యాప్‌ను మార్చాలా?"</string>
     <string name="sms_change_default_dialog_text" msgid="8275088077930942680">"మీ SMS అనువర్తనంగా <xliff:g id="CURRENT_APP">%2$s</xliff:g>కి బదులుగా <xliff:g id="NEW_APP">%1$s</xliff:g>ని ఉపయోగించాలా?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="4680224695080527907">"మీ SMS అనువర్తనంగా <xliff:g id="NEW_APP">%s</xliff:g>ని ఉపయోగించాలా?"</string>
     <string name="network_scorer_picker_title" msgid="1691073966560952916">"నెట్‌వర్క్ రేటింగ్ ప్రదాత"</string>
@@ -1751,7 +1751,7 @@
     <string name="lockpattern_change_lock_pattern_label" msgid="333149762562581510">"అన్‌లాక్ నమూనాను మార్చు"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="3435796032210265723">"అన్‌లాక్ పిన్‌ను మార్చండి"</string>
     <string name="lockpattern_recording_intro_header" msgid="2262005028838969839">"అన్‌లాక్ ఆకృతిని గీయండి"</string>
-    <string name="lockpattern_recording_intro_footer" msgid="5426745740754065099">"సహాయం కోసం మెను నొక్కండి."</string>
+    <string name="lockpattern_recording_intro_footer" msgid="5426745740754065099">"సహాయం కోసం మెనూ నొక్కండి."</string>
     <string name="lockpattern_recording_inprogress" msgid="4060818382176523671">"పూర్తయినప్పుడు వేలును తీసివేయండి"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="6374760294545431845">"కనీసం <xliff:g id="NUMBER">%d</xliff:g> చుక్కలను కలపండి. మళ్లీ ప్రయత్నించండి."</string>
     <string name="lockpattern_pattern_entered_header" msgid="2108106638322637851">"ఆకృతి రికార్డ్ చేయబడింది"</string>
@@ -1827,7 +1827,7 @@
     <string name="enable_text" msgid="7179141636849225884">"ప్రారంభించు"</string>
     <string name="clear_user_data_text" msgid="8894073247302821764">"నిల్వను తీసివేయండి"</string>
     <string name="app_factory_reset" msgid="8718986000278776272">"అప్‌డేట్‌లను అన్‌ఇన్‌స్టాల్ చేయండి"</string>
-    <string name="auto_launch_enable_text" msgid="3372898942144027341">"మీరు కొన్ని చర్యల కోసం ఈ అనువర్తనాన్ని డిఫాల్ట్‌గా ప్రారంభించడానికి ఎంచుకున్నారు."</string>
+    <string name="auto_launch_enable_text" msgid="3372898942144027341">"మీరు కొన్ని చర్యల కోసం ఈ యాప్‌ను డిఫాల్ట్‌గా ప్రారంభించడానికి ఎంచుకున్నారు."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2286211654774611037">"మీరు విడ్జెట్‌లను సృష్టించడానికి మరియు వాటి డేటాను యాక్సెస్ చేయడానికి ఈ యాప్‌ను ఎంచుకున్నారు."</string>
     <string name="auto_launch_disable_text" msgid="8560921288036801416">"డిఫాల్ట్‌లు సెట్ చేయబడలేదు."</string>
     <string name="clear_activities" msgid="2068014972549235347">"డిఫాల్ట్‌లను క్లియర్ చేయి"</string>
@@ -1850,7 +1850,7 @@
     <string name="filter" msgid="2426943916212457962">"ఫిల్టర్ చేయి"</string>
     <string name="filter_dlg_title" msgid="115313222190512670">"ఫిల్టర్ ఎంపికలను ఎంచుకోండి"</string>
     <string name="filter_apps_all" msgid="3938077534861382701">"అన్ని యాప్‌లు"</string>
-    <string name="filter_apps_disabled" msgid="5394488790555678117">"నిలిపివేయబడిన అనువర్తనాలు"</string>
+    <string name="filter_apps_disabled" msgid="5394488790555678117">"నిలిపివేయబడిన యాప్‌లు"</string>
     <string name="filter_apps_third_party" msgid="3985794876813232322">"డౌన్‌లోడ్ చేయబడినవి"</string>
     <string name="filter_apps_running" msgid="6852975378502426359">"అమలయ్యేవి"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="3501701148760911442">"USB నిల్వ"</string>
@@ -1882,12 +1882,12 @@
     <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="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="force_stop_dlg_text" msgid="7435245769456493398">"మీరు యాప్‌ను నిర్బంధంగా ఆపివేస్తే, అది సరిగ్గా పని చేయకపోవచ్చు."</string>
     <string name="app_install_location_title" msgid="5121617802063021720">"ప్రాధాన్య ఇన్‌స్టాల్ స్థానం"</string>
     <string name="app_install_location_summary" msgid="109719780117187797">"కొత్త అనువర్తనాల కోసం ప్రాధాన్య ఇన్‌స్టాలేషన్ స్థానాన్ని మార్చండి"</string>
-    <string name="app_disable_dlg_positive" msgid="5508828271100168073">"అనువర్తనాన్ని నిలిపివేయి"</string>
+    <string name="app_disable_dlg_positive" msgid="5508828271100168073">"యాప్‌ను నిలిపివేయి"</string>
     <string name="app_disable_dlg_text" msgid="9221864774943530281">"మీరు ఈ యాప్‌ను నిలిపివేస్తే, Android మరియు ఇతర యాప్‌లు ఇకపై ఉద్దేశించిన రీతిలో పని చేయకపోవచ్చు. గుర్తుంచుకోండి, ఈ యాప్ మీ పరికరంలో ముందుగానే ఇన్‌స్టాల్ చేసి, అందించినది అయినందున మీరు దీనిని తొలగించలేరు. నిలిపివేయడం ద్వారా, మీరు ఈ యాప్‌ను ఆఫ్ చేసి, మీ పరికరంలో దానిని దాచవచ్చు."</string>
     <string name="app_disable_notifications_dlg_title" msgid="699530661413553928">"నోటిఫికేషన్‌లను ఆపివేయాలా?"</string>
     <string name="app_install_details_group_title" msgid="2909597319422976921">"స్టోర్"</string>
@@ -1896,7 +1896,7 @@
     <string name="instant_app_details_summary" msgid="6384264315914966114">"<xliff:g id="APP_STORE">%1$s</xliff:g>లో మరింత సమాచారం"</string>
     <string name="app_ops_running" msgid="6378418969742957805">"అమలవుతోంది"</string>
     <string name="app_ops_never_used" msgid="8305262378162525813">"(ఎప్పటికీ ఉపయోగించబడనిది)"</string>
-    <string name="no_default_apps" msgid="4519038578011412532">"డిఫా. అనువర్తనాలు లేవు."</string>
+    <string name="no_default_apps" msgid="4519038578011412532">"డిఫా. యాప్‌లు లేవు."</string>
     <string name="storageuse_settings_title" msgid="3390798597982116048">"నిల్వ వినియోగం"</string>
     <string name="storageuse_settings_summary" msgid="3013328092465903687">"అనువర్తనాల ద్వారా ఉపయోగించబడిన నిల్వను వీక్షించండి"</string>
     <string name="service_restarting" msgid="1190995225643385568">"పునఃప్రారంభం అవుతోంది"</string>
@@ -1931,7 +1931,7 @@
     <string name="service_stop" msgid="8812777462903125191">"ఆపివేయండి"</string>
     <string name="service_manage" msgid="7045214643721276662">"సెట్టింగ్‌లు"</string>
     <string name="service_stop_description" msgid="4184180745938573707">"ఈ సేవ దీని యాప్ ద్వారా ప్రారంభించబడింది. దీన్ని ఆపివేయడం వలన యాప్ విఫలం కావచ్చు."</string>
-    <string name="heavy_weight_stop_description" msgid="7444148811046611463">"ఈ అనువర్తనాన్ని సురక్షితంగా ఆపివేయడం కుదరదు. దీన్ని ఆపివేస్తే, మీరు ప్రస్తుతం చేస్తోన్న పనిలో కొంత భాగాన్ని కోల్పోడానికి అవకాశం ఉంది."</string>
+    <string name="heavy_weight_stop_description" msgid="7444148811046611463">"ఈ యాప్‌ను సురక్షితంగా ఆపివేయడం కుదరదు. దీన్ని ఆపివేస్తే, మీరు ప్రస్తుతం చేస్తోన్న పనిలో కొంత భాగాన్ని కోల్పోడానికి అవకాశం ఉంది."</string>
     <string name="background_process_stop_description" msgid="8971810208873038109">"ఇది మళ్లీ అవసరమయ్యే పరిస్థితుల్లో అప్పటికీ అమలయ్యే పాత అనువర్తన ప్రాసెస్. సాధారణంగా దీన్ని ఆపడానికి కారణం ఏదీ ఉండదు."</string>
     <string name="service_manage_description" msgid="8058123524402833082">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: ప్రస్తుతం వినియోగంలో ఉంది. దాన్ని నియంత్రించడానికి సెట్టింగ్‌లు నొక్కండి."</string>
     <string name="main_running_process_description" msgid="7733268956566861797">"ప్రధాన ప్రాసెస్ ఉపయోగంలో ఉంది."</string>
@@ -2041,7 +2041,7 @@
     <string name="vision_settings_description" msgid="3476589459009287332">"మీరు మీ అవసరాలకు అనుగుణంగా ఈ పరికరాన్ని అనుకూలీకరించవచ్చు. ఈ యాక్సెస్ పీచర్లను సెట్టింగ్‌ల్లో తర్వాత మార్చవచ్చు."</string>
     <string name="vision_settings_suggestion_title" msgid="7268661419110951128">"ఫాంట్ పరిమాణాన్ని మార్చండి"</string>
     <string name="screen_reader_category_title" msgid="6300714148519645544">"స్క్రీన్ రీడర్‌లు"</string>
-    <string name="audio_and_captions_category_title" msgid="6140472938769619212">"ఆడియో &amp; స్క్రీన్‌పై ఉన్న వచనం"</string>
+    <string name="audio_and_captions_category_title" msgid="6140472938769619212">"ఆడియో &amp; స్క్రీన్‌పై ఉండే టెక్స్ట్"</string>
     <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>
@@ -2065,7 +2065,7 @@
     <string name="accessibility_shortcut_service_title" msgid="3516052294376744060">"షార్ట్‌కట్ సేవ"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="1279441617927949980">"లాక్ స్క్రీన్ నుండి అనుమతించండి"</string>
     <string name="accessibility_shortcut_description" msgid="1427049334225166395">"షార్ట్‌కట్ ఆన్ చేయబడినప్పుడు, మీరు వాల్యూమ్ కీలు రెండింటినీ 3 సెకన్లు నొక్కి ఉంచడం ద్వారా యాక్సెస్ సామర్థ్య ఫీచర్‌ను ప్రారంభించవచ్చు."</string>
-    <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="5652244684961877255">"అధిక కాంట్రాస్ట్ వచనం"</string>
+    <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="5652244684961877255">"అధిక కాంట్రాస్ట్ టెక్స్ట్"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="2466317284195934003">"స్క్రీన్ వర్ధనాన్ని స్వయంచాలకంగా నవీకరించండి"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="6625473745911276917">"అనువర్తన పరివర్తనాల్లో స్క్రీన్ వర్ధనాన్ని నవీకరించండి"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6172987104538172869">"పవర్ బటన్ కాల్‌ను ముగిస్తుంది"</string>
@@ -2211,7 +2211,7 @@
     <string name="print_feature_state_off" msgid="208580346723223688">"ఆఫ్"</string>
     <string name="print_menu_item_add_service" msgid="6803000110578493782">"సేవను జోడించు"</string>
     <string name="print_menu_item_add_printer" msgid="8529196211179574921">"ప్రింటర్‌ను జోడించు"</string>
-    <string name="print_menu_item_search" msgid="1165316329772287360">"వెతుకు"</string>
+    <string name="print_menu_item_search" msgid="1165316329772287360">"Search"</string>
     <string name="print_searching_for_printers" msgid="6538687129687642542">"ప్రింటర్‌ల కోసం వెతుకుతోంది"</string>
     <string name="print_service_disabled" msgid="6376344992705893436">"సేవ నిలిపివేయబడింది"</string>
     <string name="print_print_jobs" msgid="7357841034181762157">"ముద్రణ జాబ్‌లు"</string>
@@ -2234,7 +2234,7 @@
     <string name="power_discharge_remaining" msgid="3461915627093471868">"<xliff:g id="REMAIN">%1$s</xliff:g> ఉంది"</string>
     <string name="power_charge_remaining" msgid="2730510256218879651">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>లోపు ఛార్జ్ చేయాలి"</string>
     <string name="background_activity_title" msgid="7207836362312111483">"బ్యాక్‌గ్రౌండ్ ప‌రిమితి"</string>
-    <string name="background_activity_summary" msgid="582372194738538145">"నేపథ్యంలో అమలు కావడానికి అనువర్తనాన్ని అనుమతించండి"</string>
+    <string name="background_activity_summary" msgid="582372194738538145">"నేపథ్యంలో అమలు కావడానికి యాప్‌ను అనుమతించండి"</string>
     <string name="background_activity_summary_disabled" msgid="457944930942085876">"నేపథ్యంలో అమలు కావడానికి యాప్ అనుమతించబడలేదు"</string>
     <string name="background_activity_summary_whitelisted" msgid="4713321059375873828">"నేపథ్య వినియోగం పరిమితం చేయబడదు"</string>
     <string name="background_activity_warning_dialog_title" msgid="2170790412855899678">"నేపథ్య కార్యకలాపాన్ని పరిమితం చేయాలా?"</string>
@@ -2343,22 +2343,22 @@
     </plurals>
     <string name="battery_header_title_alternate" msgid="1161081105263761743">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
     <string name="dialog_stop_title" msgid="4354544579084434590">"యాప్‌ని ఆపివేయాలా?"</string>
-    <string name="dialog_stop_message" product="default" msgid="1361660290824872555">"<xliff:g id="APP">%1$s</xliff:g> మీ ఫోన్‌ని మేల్కొల్పి ఉంచుతోంది, కనుక బ్యాటరీని మీ ఫోన్ సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించేందుకు ప్రయత్నించడానికి, మీరు అనువర్తనాన్ని ఆపివేయవచ్చు.\n\nఈ సమస్య కొనసాగితే, బ్యాటరీ పనితీరును మెరుగుపరచడం కోసం మీరు అనువర్తనాన్ని అన్ఇన్‌స్టాల్ చేయాల్సి రావచ్చు."</string>
-    <string name="dialog_stop_message" product="tablet" msgid="8948358625588034303">"<xliff:g id="APP">%1$s</xliff:g> మీ టాబ్లెట్‌ని మేల్కొల్పి ఉంచుతుంది, కనుక బ్యాటరీని మీ టాబ్లెట్ సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించేందుకు ప్రయత్నించడానికి, మీరు అనువర్తనాన్ని ఆపివేయవచ్చు.\n\nఈ సమస్య కొనసాగితే, బ్యాటరీ పనితీరును మెరుగుపరచడం కోసం మీరు అనువర్తనాన్ని అన్ఇన్‌స్టాల్ చేయాల్సి రావచ్చు."</string>
-    <string name="dialog_stop_message" product="device" msgid="3550459274584461359">"<xliff:g id="APP">%1$s</xliff:g> మీ పరికరాన్ని మేల్కొల్పి ఉంచుతోంది, కనుక బ్యాటరీని మీ పరికరం సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించేందుకు ప్రయత్నించడానికి, మీరు అనువర్తనాన్ని ఆపివేయవచ్చు.\n\nఈ సమస్య కొనసాగితే, బ్యాటరీ పనితీరును మెరుగుపరచడం కోసం మీరు అనువర్తనాన్ని అన్ఇన్‌స్టాల్ చేయాల్సి రావచ్చు."</string>
-    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="5361295199859282104">"<xliff:g id="APP_0">%1$s</xliff:g> మీ ఫోన్‌ని మేల్కొల్పి ఉంచుతుంది, కనుక బ్యాటరీని మీ ఫోన్ సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించేందుకు ప్రయత్నించడానికి, మీరు <xliff:g id="APP_1">%1$s</xliff:g>ని ఆపివేయవచ్చు.\n\nఈ సమస్య కొనసాగితే, బ్యాటరీ పనితీరును మెరుగుపరచడం కోసం మీరు అనువర్తనాన్ని అన్ఇన్‌స్టాల్ చేయాల్సి రావచ్చు."</string>
-    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="3270887403788487776">"<xliff:g id="APP_0">%1$s</xliff:g> మీ టాబ్లెట్‌ని మేల్కొల్పి ఉంచుతుంది, కనుక బ్యాటరీని మీ టాబ్లెట్ సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించేందుకు ప్రయత్నించడానికి, మీరు <xliff:g id="APP_1">%1$s</xliff:g>ని ఆపివేయవచ్చు.\n\nఈ సమస్య కొనసాగితే, బ్యాటరీ పనితీరును మెరుగుపరచడం కోసం మీరు అనువర్తనాన్ని అన్ఇన్‌స్టాల్ చేయాల్సి రావచ్చు."</string>
-    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="6577512995315373362">"<xliff:g id="APP_0">%1$s</xliff:g> మీ పరికరాన్ని మేల్కొల్పి ఉంచుతుంది, కనుక బ్యాటరీని మీ పరికరం సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించేందుకు ప్రయత్నించడానికి, మీరు <xliff:g id="APP_1">%1$s</xliff:g>ని ఆపివేయవచ్చు.\n\nఈ సమస్య కొనసాగితే, బ్యాటరీ పనితీరును మెరుగుపరచడం కోసం మీరు అనువర్తనాన్ని అన్ఇన్‌స్టాల్ చేయాల్సి రావచ్చు."</string>
+    <string name="dialog_stop_message" product="default" msgid="1361660290824872555">"<xliff:g id="APP">%1$s</xliff:g> మీ ఫోన్‌ని మేల్కొల్పి ఉంచుతోంది, కనుక బ్యాటరీని మీ ఫోన్ సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించేందుకు ప్రయత్నించడానికి, మీరు యాప్‌ను ఆపివేయవచ్చు.\n\nఈ సమస్య కొనసాగితే, బ్యాటరీ పనితీరును మెరుగుపరచడం కోసం మీరు యాప్‌ను అన్ఇన్‌స్టాల్ చేయాల్సి రావచ్చు."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="8948358625588034303">"<xliff:g id="APP">%1$s</xliff:g> మీ టాబ్లెట్‌ని మేల్కొల్పి ఉంచుతుంది, కనుక బ్యాటరీని మీ టాబ్లెట్ సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించేందుకు ప్రయత్నించడానికి, మీరు యాప్‌ను ఆపివేయవచ్చు.\n\nఈ సమస్య కొనసాగితే, బ్యాటరీ పనితీరును మెరుగుపరచడం కోసం మీరు యాప్‌ను అన్ఇన్‌స్టాల్ చేయాల్సి రావచ్చు."</string>
+    <string name="dialog_stop_message" product="device" msgid="3550459274584461359">"<xliff:g id="APP">%1$s</xliff:g> మీ పరికరాన్ని మేల్కొల్పి ఉంచుతోంది, కనుక బ్యాటరీని మీ పరికరం సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించేందుకు ప్రయత్నించడానికి, మీరు యాప్‌ను ఆపివేయవచ్చు.\n\nఈ సమస్య కొనసాగితే, బ్యాటరీ పనితీరును మెరుగుపరచడం కోసం మీరు యాప్‌ను అన్ఇన్‌స్టాల్ చేయాల్సి రావచ్చు."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="5361295199859282104">"<xliff:g id="APP_0">%1$s</xliff:g> మీ ఫోన్‌ని మేల్కొల్పి ఉంచుతుంది, కనుక బ్యాటరీని మీ ఫోన్ సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించేందుకు ప్రయత్నించడానికి, మీరు <xliff:g id="APP_1">%1$s</xliff:g>ని ఆపివేయవచ్చు.\n\nఈ సమస్య కొనసాగితే, బ్యాటరీ పనితీరును మెరుగుపరచడం కోసం మీరు యాప్‌ను అన్ఇన్‌స్టాల్ చేయాల్సి రావచ్చు."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="3270887403788487776">"<xliff:g id="APP_0">%1$s</xliff:g> మీ టాబ్లెట్‌ని మేల్కొల్పి ఉంచుతుంది, కనుక బ్యాటరీని మీ టాబ్లెట్ సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించేందుకు ప్రయత్నించడానికి, మీరు <xliff:g id="APP_1">%1$s</xliff:g>ని ఆపివేయవచ్చు.\n\nఈ సమస్య కొనసాగితే, బ్యాటరీ పనితీరును మెరుగుపరచడం కోసం మీరు యాప్‌ను అన్ఇన్‌స్టాల్ చేయాల్సి రావచ్చు."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="6577512995315373362">"<xliff:g id="APP_0">%1$s</xliff:g> మీ పరికరాన్ని మేల్కొల్పి ఉంచుతుంది, కనుక బ్యాటరీని మీ పరికరం సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించేందుకు ప్రయత్నించడానికి, మీరు <xliff:g id="APP_1">%1$s</xliff:g>ని ఆపివేయవచ్చు.\n\nఈ సమస్య కొనసాగితే, బ్యాటరీ పనితీరును మెరుగుపరచడం కోసం మీరు యాప్‌ను అన్ఇన్‌స్టాల్ చేయాల్సి రావచ్చు."</string>
     <string name="dialog_stop_ok" msgid="5809052504018242928">"యాప్‌ని ఆపివేయి"</string>
-    <string name="dialog_background_check_title" msgid="6289139150963983470">"నేపథ్య వినియోగాన్ని ఆఫ్ చేసి, అనువర్తనాన్ని ఆపివేయాలా?"</string>
+    <string name="dialog_background_check_title" msgid="6289139150963983470">"నేపథ్య వినియోగాన్ని ఆఫ్ చేసి, యాప్‌ను ఆపివేయాలా?"</string>
     <string name="dialog_background_check_message" product="default" msgid="944264053032952679">"<xliff:g id="APP_0">%1$s</xliff:g> మీ ఫోన్‌ను సక్రియంగా ఉంచుతుంది, కనుక బ్యాటరీని మీ ఫోన్ సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించేందుకు ప్రయత్నించాలంటే, మీరు <xliff:g id="APP_1">%1$s</xliff:g>ని ఆపివేసి, దానిని నేపథ్యంలో అమలు కాకుండా నిరోధించవచ్చు."</string>
     <string name="dialog_background_check_message" product="tablet" msgid="5246650726585461386">"<xliff:g id="APP_0">%1$s</xliff:g> మీ టాబ్లెట్‌ను సక్రియంగా ఉంచుతుంది, కనుక బ్యాటరీని మీ టాబ్లెట్ సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించేందుకు ప్రయత్నించాలంటే, మీరు <xliff:g id="APP_1">%1$s</xliff:g>ని ఆపివేసి, దానిని నేపథ్యంలో అమలు కాకుండా నిరోధించవచ్చు."</string>
     <string name="dialog_background_check_message" product="device" msgid="2746413739802588979">"<xliff:g id="APP_0">%1$s</xliff:g> మీ పరికరాన్ని సక్రియంగా ఉంచుతుంది, కనుక బ్యాటరీని మీ పరికరం సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించేందుకు ప్రయత్నించాలంటే, మీరు <xliff:g id="APP_1">%1$s</xliff:g>ని ఆపివేసి, దానిని నేపథ్యంలో అమలు కాకుండా నిరోధించవచ్చు."</string>
     <string name="dialog_background_check_ok" msgid="6916102434734525591">"ఆఫ్ చేయి"</string>
     <string name="dialog_location_title" msgid="8070185060438751995">"స్థానాన్ని ఆఫ్ చేయాలా?"</string>
-    <string name="dialog_location_message" product="default" msgid="2445581202508387558">"మీరు అనువర్తనాన్ని ఉపయోగించని సమయంలో కూడా <xliff:g id="APP">%1$s</xliff:g> మీ స్థానాన్ని అభ్యర్థిస్తోంది, కనుక బ్యాటరీని మీ ఫోన్ సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించడం కోసం, ఈ అనువర్తనానికి మీరు స్థానాన్ని ఆఫ్ చేయవచ్చు."</string>
-    <string name="dialog_location_message" product="tablet" msgid="4012891295493865096">"మీరు అనువర్తనాన్ని ఉపయోగించని సమయంలో కూడా <xliff:g id="APP">%1$s</xliff:g> మీ స్థానాన్ని అభ్యర్థిస్తోంది, కనుక బ్యాటరీని మీ టాబ్లెట్ సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించడం కోసం, ఈ అనువర్తనానికి మీరు స్థానాన్ని ఆఫ్ చేయవచ్చు."</string>
-    <string name="dialog_location_message" product="device" msgid="1454451610289205965">"మీరు అనువర్తనాన్ని ఉపయోగించని సమయంలో కూడా <xliff:g id="APP">%1$s</xliff:g> మీ స్థానాన్ని అభ్యర్థిస్తోంది, కనుక బ్యాటరీని మీ పరికరం సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించడం కోసం, ఈ అనువర్తనానికి మీరు స్థానాన్ని ఆఫ్ చేయవచ్చు."</string>
+    <string name="dialog_location_message" product="default" msgid="2445581202508387558">"మీరు యాప్‌ను ఉపయోగించని సమయంలో కూడా <xliff:g id="APP">%1$s</xliff:g> మీ స్థానాన్ని అభ్యర్థిస్తోంది, కనుక బ్యాటరీని మీ ఫోన్ సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించడం కోసం, ఈ అనువర్తనానికి మీరు స్థానాన్ని ఆఫ్ చేయవచ్చు."</string>
+    <string name="dialog_location_message" product="tablet" msgid="4012891295493865096">"మీరు యాప్‌ను ఉపయోగించని సమయంలో కూడా <xliff:g id="APP">%1$s</xliff:g> మీ స్థానాన్ని అభ్యర్థిస్తోంది, కనుక బ్యాటరీని మీ టాబ్లెట్ సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించడం కోసం, ఈ అనువర్తనానికి మీరు స్థానాన్ని ఆఫ్ చేయవచ్చు."</string>
+    <string name="dialog_location_message" product="device" msgid="1454451610289205965">"మీరు యాప్‌ను ఉపయోగించని సమయంలో కూడా <xliff:g id="APP">%1$s</xliff:g> మీ స్థానాన్ని అభ్యర్థిస్తోంది, కనుక బ్యాటరీని మీ పరికరం సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించడం కోసం, ఈ అనువర్తనానికి మీరు స్థానాన్ని ఆఫ్ చేయవచ్చు."</string>
     <string name="dialog_location_ok" msgid="1893773880878134342">"ఆఫ్ చేయి"</string>
     <string name="power_screen" msgid="8581228752332223154">"స్క్రీన్"</string>
     <string name="power_flashlight" msgid="6939780588882301575">"ఫ్లాష్‌లైట్"</string>
@@ -2413,7 +2413,7 @@
     <string name="battery_sugg_bluetooth_basic" msgid="6353294067057749310">"మీరు బ్లూటూత్‌ను ఉపయోగించనప్పుడు దాన్ని ఆపివేయండి"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="2421931037149315202">"వేరే బ్లూటూత్ పరికరానికి కనెక్ట్ చేయడానికి ప్రయత్నించండి"</string>
     <string name="battery_desc_apps" msgid="6826726880149226823">"యాప్ ద్వారా వినియోగించబడిన బ్యాటరీ"</string>
-    <string name="battery_sugg_apps_info" msgid="9175761965559743977">"అనువర్తనాన్ని ఆపివేయండి లేదా అన్‌ఇన్‌స్టాల్ చేయండి"</string>
+    <string name="battery_sugg_apps_info" msgid="9175761965559743977">"యాప్‌ను ఆపివేయండి లేదా అన్‌ఇన్‌స్టాల్ చేయండి"</string>
     <string name="battery_sugg_apps_gps" msgid="489694612870772770">"బ్యాటరీ-ఆదా మోడ్‌ను ఎంచుకోండి"</string>
     <string name="battery_sugg_apps_settings" msgid="20465932930350295">"యాప్ బ్యాటరీ వినియోగాన్ని తగ్గించడానికి సెట్టింగ్‌లను అందించవచ్చు"</string>
     <string name="battery_desc_users" msgid="3736510265433457165">"వినియోగదారు ద్వారా వినియోగించబడిన బ్యాటరీ"</string>
@@ -2517,7 +2517,7 @@
     <string name="tts_spoken_language" msgid="8057256621711361944">"చదివి వినిపించే భాష"</string>
     <string name="tts_install_voices_title" msgid="363811937643579286">"వాయిస్‌లను ఇన్‌స్టాల్ చేయండి"</string>
     <string name="tts_install_voices_text" msgid="7464832428439739995">"వాయిస్‌లను ఇన్‌స్టాల్ చేయడం కోసం <xliff:g id="TTS_APP_NAME">%s</xliff:g> అనువర్తనంలోకి కొనసాగండి"</string>
-    <string name="tts_install_voices_open" msgid="686776451008134790">"అనువర్తనాన్ని తెరువు"</string>
+    <string name="tts_install_voices_open" msgid="686776451008134790">"యాప్‌ను తెరువు"</string>
     <string name="tts_install_voices_cancel" msgid="1622512922523479646">"రద్దు చేయి"</string>
     <string name="tts_reset" msgid="8864073594540705579">"రీసెట్ చేయి"</string>
     <string name="tts_play" msgid="9023430029380675514">"ప్లే చేయి"</string>
@@ -2567,10 +2567,10 @@
     <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>
-    <string name="uninstall_device_admin" msgid="9017499299961719830">"అనువర్తనాన్ని అన్‌ఇన్‌స్టాల్ చేయి"</string>
+    <string name="uninstall_device_admin" msgid="9017499299961719830">"యాప్‌ను అన్‌ఇన్‌స్టాల్ చేయి"</string>
     <string name="remove_and_uninstall_device_admin" msgid="5607703579731496253">"నిష్క్రియం చేసి, అన్ఇన్‌స్టాల్ చేయి"</string>
     <string name="select_device_admin_msg" msgid="4173769638399075387">"పరికర నిర్వాహకుల యాప్‌లు"</string>
-    <string name="no_device_admins" msgid="4129231900385977460">"పరికర నిర్వాహకుల అనువర్తనాలు అందుబాటులో లేవు"</string>
+    <string name="no_device_admins" msgid="4129231900385977460">"పరికర నిర్వాహకుల యాప్‌లు అందుబాటులో లేవు"</string>
     <string name="personal_device_admin_title" msgid="759440849188565661">"వ్యక్తిగతం"</string>
     <string name="managed_device_admin_title" msgid="8021522755492551726">"కార్యాలయం"</string>
     <string name="sms_access_restriction_enabled" msgid="3006320256764718303">"SMS &amp; కాల్ లాగ్ యాక్సెస్‌ను పరిమితం చేయండి"</string>
@@ -2603,7 +2603,7 @@
     <string name="work_mode_off_summary" msgid="1688885392211178315">"యాప్‌లు మరియు నోటిఫికేషన్‌లు ఆఫ్ చేయబడ్డాయి"</string>
     <string name="remove_managed_profile_label" msgid="4625542553784793536">"కార్యాలయ ప్రొఫైల్‌ను తీసివేయి"</string>
     <string name="background_data" msgid="8275750862371471171">"బ్యాక్‌గ్రౌండ్ డేటా"</string>
-    <string name="background_data_summary" msgid="799640633948841990">"అనువర్తనాలు ఏ సమయంలోనైనా డేటాను సమకాలీకరించవచ్చు, పంపవచ్చు మరియు స్వీకరించవచ్చు"</string>
+    <string name="background_data_summary" msgid="799640633948841990">"యాప్‌లు ఏ సమయంలోనైనా డేటాను సమకాలీకరించవచ్చు, పంపవచ్చు మరియు స్వీకరించవచ్చు"</string>
     <string name="background_data_dialog_title" msgid="8306650658158895976">"నేపథ్య డేటాను నిలిపివేయాలా?"</string>
     <string name="background_data_dialog_message" msgid="8126774244911656527">"నేపథ్య డేటాను నిలిపివేయడం వలన బ్యాటరీ జీవితకాలం పెరుగుతుంది మరియు డేటా వినియోగం తగ్గుతుంది. కొన్ని యాప్‌లు అప్పటికీ నేపథ్య డేటా కనెక్షన్‌ను ఉపయోగించవచ్చు."</string>
     <string name="sync_automatically" msgid="5746117156896468099">"అనువర్తన డేటాను స్వయంచాలకంగా సమకాలీకరించు"</string>
@@ -2674,7 +2674,7 @@
     <string name="account_settings_menu_auto_sync_work" msgid="5721442464286552815">"ఆఫీస్ డేటాను ఆటో-సింక్ చేయి"</string>
     <string name="data_usage_change_cycle" msgid="447761920472170031">"సైకిల్‌ను మార్చు…"</string>
     <string name="data_usage_pick_cycle_day" msgid="6319750879145917066">"డేటా వినియోగ సైకిల్‌ను రీసెట్ చేయాల్సిన నెలలోని రోజు:"</string>
-    <string name="data_usage_empty" msgid="7981405723435034032">"ఈ వ్యవధిలో డేటాను ఏ అనువర్తనాలు ఉపయోగించలేదు."</string>
+    <string name="data_usage_empty" msgid="7981405723435034032">"ఈ వ్యవధిలో డేటాను ఏ యాప్‌లు ఉపయోగించలేదు."</string>
     <string name="data_usage_label_foreground" msgid="2471091128648754601">"ముందుభాగం"</string>
     <string name="data_usage_label_background" msgid="1618794447370396845">"నేపథ్యం"</string>
     <string name="data_usage_app_restricted" msgid="7569077654579299326">"పరిమితం చేయబడింది"</string>
@@ -2701,7 +2701,7 @@
     <string name="data_usage_app_restrict_background_summary" msgid="2703967920234671881">"బ్యాక్‌గ్రౌండ్‌లో మొబైల్ డేటా వినియోగాన్ని ప్రారంభిస్తుంది"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7211921499365814638">"ఈ యాప్ కోసం నేపథ్య డేటాను పరిమితం చేయడానికి, ముందుగా మొబైల్ డేటా పరిమితిని సెట్ చేయాలి."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="750037964591673167">"నేపథ్య డేటాను పరిమితం చేయాలా?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="4022530391896478031">"ఈ లక్షణం మొబైల్ నెట్‌వర్క్‌లు మాత్రమే అందుబాటులో ఉన్నప్పుడు నేపథ్య డేటాపై ఆధారపడే అనువర్తనాన్ని పని చేయనీయకుండా ఆపివేయవచ్చు.\n\nమీరు అనువర్తనంలోనే అందుబాటులో ఉన్న సెట్టింగ్‌ల్లో మరిన్ని సముచితమైన డేటా వినియోగ నియంత్రణలను కనుగొనవచ్చు."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="4022530391896478031">"ఈ లక్షణం మొబైల్ నెట్‌వర్క్‌లు మాత్రమే అందుబాటులో ఉన్నప్పుడు నేపథ్య డేటాపై ఆధారపడే యాప్‌ను పని చేయనీయకుండా ఆపివేయవచ్చు.\n\nమీరు అనువర్తనంలోనే అందుబాటులో ఉన్న సెట్టింగ్‌ల్లో మరిన్ని సముచితమైన డేటా వినియోగ నియంత్రణలను కనుగొనవచ్చు."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="18928292832775805">"మీరు మొబైల్ డేటా పరిమితిని సెట్ చేసినప్పుడు మాత్రమే నేపథ్య డేటాను పరిమితం చేయడం సాధ్యపడుతుంది."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2342323408229702005">"ఆటో-సింక్ డేటాను ప్రారంభించాలా?"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="4935430284683238901">"వెబ్‌లో మీ ఖాతాలకు ఏవైనా మార్పులు చేస్తే అవి ఆటోమేటిక్‌గా మీ టాబ్లెట్‌కు కాపీ చేయబడతాయి.\n\nకొన్ని ఖాతాలు, మీరు టాబ్లెట్‌లో ఏవైనా మార్పులు చేస్తే కూడా వాటిని ఆటోమేటిక్‌గా వెబ్‌కు కాపీ చేస్తాయి. Google ఖాతా ఈ విధంగానే పని చేస్తుంది."</string>
@@ -2717,19 +2717,19 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="2000713577999830647">"మీరు సెట్ చేసిన పరిమితిని చేరుకున్న తర్వాత మీ టాబ్లెట్‌లో మొబైల్ డేటా ఆఫ్ చేయబడుతుంది.\n\nడేటా వినియోగాన్ని మీ టాబ్లెట్ ఒక పద్ధతిలో గణిస్తే, అదే వినియోగ పరిమాణాన్ని మీ క్యారియర్ వేరే పద్ధతిలో గణించవచ్చు, కనుక కనిష్ట పరిమితిని సెట్ చేయడం మంచిది."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="943546278705619205">"మీరు సెట్ చేసిన పరిమితిని చేరుకున్న తర్వాత మీ ఫోన్‌లో మొబైల్ డేటా ఆఫ్ చేయబడుతుంది.\n\nడేటా వినియోగాన్ని మీ ఫోన్ ఒక పద్ధతిలో గణిస్తే, అదే వినియోగ పరిమాణాన్ని మీ క్యారియర్ వేరే పద్ధతిలో గణించవచ్చు. కాబ‌ట్టి క‌నిష్ఠ‌ పరిమితిని సెట్ చేయడం మంచిది."</string>
     <string name="data_usage_restrict_background_title" msgid="3568746530413220844">"నేపథ్య డేటాను పరిమితం చేయాలా?"</string>
-    <string name="data_usage_restrict_background" msgid="995811034744808575">"మీరు నేపథ్య మొబైల్ డేటాను నియంత్రిస్తే, Wi‑Fiకి కనెక్ట్ చేయకుంటే కొన్ని అనువర్తనాలు మరియు సేవలు పని చేయవు."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="6032810839234864814">"మీరు నేపథ్య మొబైల్ డేటాను నియంత్రిస్తే, Wi‑Fiకి కనెక్ట్ చేయకుంటే కొన్ని అనువర్తనాలు మరియు సేవలు పని చేయవు.\n\nఈ సెట్టింగ్ ఈ టాబ్లెట్‌లోని వినియోగదారులందరిపై ప్రభావం చూపుతుంది."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="6846901756455789858">"మీరు నేపథ్య మొబైల్ డేటాను నియంత్రిస్తే, Wi‑Fiకి కనెక్ట్ చేయకుంటే కొన్ని అనువర్తనాలు మరియు సేవలు పని చేయవు.\n\nఈ సెట్టింగ్ ఈ ఫోన్‌లోని వినియోగదారులందరిపై ప్రభావం చూపుతుంది."</string>
+    <string name="data_usage_restrict_background" msgid="995811034744808575">"మీరు నేపథ్య మొబైల్ డేటాను నియంత్రిస్తే, Wi‑Fiకి కనెక్ట్ చేయకుంటే కొన్ని యాప్‌లు మరియు సేవలు పని చేయవు."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="6032810839234864814">"మీరు నేపథ్య మొబైల్ డేటాను నియంత్రిస్తే, Wi‑Fiకి కనెక్ట్ చేయకుంటే కొన్ని యాప్‌లు మరియు సేవలు పని చేయవు.\n\nఈ సెట్టింగ్ ఈ టాబ్లెట్‌లోని వినియోగదారులందరిపై ప్రభావం చూపుతుంది."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="6846901756455789858">"మీరు నేపథ్య మొబైల్ డేటాను నియంత్రిస్తే, Wi‑Fiకి కనెక్ట్ చేయకుంటే కొన్ని యాప్‌లు మరియు సేవలు పని చేయవు.\n\nఈ సెట్టింగ్ ఈ ఫోన్‌లోని వినియోగదారులందరిపై ప్రభావం చూపుతుంది."</string>
     <string name="data_usage_sweep_warning" msgid="4646401408698778092"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"హెచ్చరిక"</font></string>
     <string name="data_usage_sweep_limit" msgid="6101105504557548269"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"పరిమితి"</font></string>
-    <string name="data_usage_uninstalled_apps" msgid="4152786786140875769">"తీసివేయబడిన అనువర్తనాలు"</string>
-    <string name="data_usage_uninstalled_apps_users" msgid="61092462416505112">"తీసివేయబడిన అనువర్తనాలు మరియు వినియోగదారులు"</string>
+    <string name="data_usage_uninstalled_apps" msgid="4152786786140875769">"తీసివేయబడిన యాప్‌లు"</string>
+    <string name="data_usage_uninstalled_apps_users" msgid="61092462416505112">"తీసివేయబడిన యాప్‌లు మరియు వినియోగదారులు"</string>
     <string name="data_usage_received_sent" msgid="5532467049487334656">"<xliff:g id="RECEIVED">%1$s</xliff:g> స్వీకరించబడింది, <xliff:g id="SENT">%2$s</xliff:g> పంపబడింది"</string>
     <string name="data_usage_total_during_range" msgid="7307562900020512747">"<xliff:g id="RANGE">%2$s</xliff:g>: సుమారు <xliff:g id="TOTAL">%1$s</xliff:g> ఉపయోగించబడింది."</string>
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="366118962920532455">"<xliff:g id="RANGE">%2$s</xliff:g>: మీ టాబ్లెట్ గణించినట్లుగా దాదాపు <xliff:g id="TOTAL">%1$s</xliff:g> ఉపయోగించబడింది. మీ క్యారియర్ డేటా వినియోగం భిన్నంగా లెక్కించబడవచ్చు."</string>
     <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>
@@ -2842,7 +2842,7 @@
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> మీ కార్యాలయ ప్రొఫైల్ కోసం సర్టిఫికెట్ అధికారాలను ఇన్‌స్టాల్ చేసింది, దీని వల్ల వారు ఇమెయిల్‌లు, యాప్‌లు మరియు సురక్షితమైన వెబ్‌సైట్‌లతో సహా కార్యాలయ నెట్‌వర్క్ కార్యకలాపాన్ని పర్యవేక్షించడానికి అనుమతించబడవచ్చు.\n\nఈ సర్టిఫికెట్ల గురించి మరింత సమాచారం కోసం, మీ నిర్వాహకులను సంప్రదించండి.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> మీ కార్యాలయ ప్రొఫైల్ కోసం సర్టిఫికెట్ అధికారాన్ని ఇన్‌స్టాల్ చేసింది, దీని వల్ల వారు ఇమెయిల్‌లు, యాప్‌లు మరియు సురక్షితమైన వెబ్‌సైట్‌లతో సహా కార్యాలయ నెట్‌వర్క్ కార్యకలాపాన్ని పర్యవేక్షించడానికి అనుమతించబడవచ్చు.\n\nఈ సర్టిఫికెట్ గురించి మరింత సమాచారం కోసం, మీ నిర్వాహకులను సంప్రదించండి.</item>
     </plurals>
-    <string name="ssl_ca_cert_warning_message" msgid="8692156828262606685">"మూడవ పక్షం ఇమెయిల్‌లు, అనువర్తనాలు మరియు సురక్షిత వెబ్‌సైట్‌లతో సహా మీ నెట్‌వర్క్ కార్యాచరణను పర్యవేక్షించగలిగే సామర్థ్యాన్ని కలిగి ఉంటారు.\n\nమీ పరికరంలో ఇన్‌స్టాల్ చేయబడిన విశ్వసనీయ ఆధారాల వలన ఇది సాధ్యపడుతుంది."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8692156828262606685">"మూడవ పక్షం ఇమెయిల్‌లు, యాప్‌లు మరియు సురక్షిత వెబ్‌సైట్‌లతో సహా మీ నెట్‌వర్క్ కార్యాచరణను పర్యవేక్షించగలిగే సామర్థ్యాన్ని కలిగి ఉంటారు.\n\nమీ పరికరంలో ఇన్‌స్టాల్ చేయబడిన విశ్వసనీయ ఆధారాల వలన ఇది సాధ్యపడుతుంది."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="3227175122066058245">
       <item quantity="other">ప్రమాణపత్రాలను తనిఖీ చేయి</item>
       <item quantity="one">ప్రమాణపత్రాన్ని తనిఖీ చేయి</item>
@@ -2855,7 +2855,7 @@
     <string name="user_add_user_or_profile_menu" msgid="4220679989900149336">"వినియోగదారు లేదా ప్రొఫైల్‌ను జోడించు"</string>
     <string name="user_add_user_menu" msgid="9006572936456324794">"వినియోగదారును జోడించు"</string>
     <string name="user_summary_restricted_profile" msgid="5214838615043574917">"పరిమితం చేయబడిన ప్రొఫైల్"</string>
-    <string name="user_need_lock_message" msgid="3421243467724322311">"మీరు పరిమితం చేయబడిన ప్రొఫైల్‌ను సృష్టించడానికి ముందు, మీ అనువర్తనాలు మరియు వ్యక్తిగత డేటాను రక్షించడానికి స్క్రీన్ లాక్‌ను సెటప్ చేయాల్సి ఉంటుంది."</string>
+    <string name="user_need_lock_message" msgid="3421243467724322311">"మీరు పరిమితం చేయబడిన ప్రొఫైల్‌ను సృష్టించడానికి ముందు, మీ యాప్‌లు మరియు వ్యక్తిగత డేటాను రక్షించడానికి స్క్రీన్ లాక్‌ను సెటప్ చేయాల్సి ఉంటుంది."</string>
     <string name="user_set_lock_button" msgid="4660971133148866612">"లాక్‌ను సెట్ చేయి"</string>
     <string name="user_summary_not_set_up" msgid="6436691939044332679">"సెటప్ చేయలేదు"</string>
     <string name="user_summary_restricted_not_set_up" msgid="896552290436689508">"సెటప్ చేయలేదు - పరిమితం చేయబడిన ప్రొఫైల్"</string>
@@ -2892,7 +2892,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>
@@ -2900,7 +2900,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">"ఫోన్ కాల్‌లు &amp; SMS ఆన్ చేయి"</string>
@@ -2911,8 +2911,8 @@
     <string name="user_enable_calling_and_sms_confirm_message" msgid="3278802798876095734">"కాల్, SMS చరిత్ర ఈ వినియోగదారుతో షేర్ చేయబడుతుంది."</string>
     <string name="emergency_info_title" msgid="1522609271881425375">"అత్యవసర సమాచారం"</string>
     <string name="emergency_info_summary" msgid="7280464759837387342">"<xliff:g id="USER_NAME">%1$s</xliff:g> సంబంధిత సమాచారం &amp; కాంటాక్ట్‌లు"</string>
-    <string name="application_restrictions" msgid="6871981013736536763">"అనువర్తనాలు మరియు కంటెంట్‌ను అనుమతించండి"</string>
-    <string name="apps_with_restrictions_header" msgid="8656739605673756176">"పరిమితులు గల అనువర్తనాలు"</string>
+    <string name="application_restrictions" msgid="6871981013736536763">"యాప్‌లు మరియు కంటెంట్‌ను అనుమతించండి"</string>
+    <string name="apps_with_restrictions_header" msgid="8656739605673756176">"పరిమితులు గల యాప్‌లు"</string>
     <string name="apps_with_restrictions_settings_button" msgid="5065896213467171744">"అనువర్తన సెట్టిం. విస్తరింపజేయి"</string>
     <string name="nfc_payment_settings_title" msgid="5070077706735415291">"నొక్కి చెల్లించండి"</string>
     <string name="nfc_payment_how_it_works" msgid="7607901964687787177">"ఇది ఎలా పని చేస్తుంది"</string>
@@ -2935,7 +2935,7 @@
     <string name="restriction_menu_reset" msgid="3642252461410370554">"పరిమితులను తీసివేయి"</string>
     <string name="restriction_menu_change_pin" msgid="592512748243421101">"పిన్‌ను మార్చు"</string>
     <string name="app_notifications_switch_label" msgid="670683308275498821">"నోటిఫికేషన్‌లను చూపు"</string>
-    <string name="help_label" msgid="1296484776243905646">"సహాయం &amp; అభిప్రాయం"</string>
+    <string name="help_label" msgid="1296484776243905646">"సహాయం &amp; ఫీడ్‌బ్యాక్"</string>
     <string name="support_summary" msgid="3278943815956130740">"సహాయక కథనాలు, ఫోన్ &amp; చాట్, ప్రారంభించండి"</string>
     <string name="user_account_title" msgid="2108666882630552859">"కంటెంట్ కోసం ఖాతా"</string>
     <string name="user_picture_title" msgid="6664602422948159123">"ఫోటో ID"</string>
@@ -3045,7 +3045,7 @@
     <string name="notification_settings_work_profile" msgid="7190550347842400029">"కార్యాలయ ప్రొఫైల్‌లో ఉన్న యాప్‌లకు సంబంధించి నోటిఫికేషన్ యాక్సెస్ అందుబాటులో లేదు."</string>
     <string name="account_dashboard_title" msgid="4734300939532555885">"ఖాతాలు"</string>
     <string name="account_dashboard_default_summary" msgid="6822549669771936206">"ఖాతాలు జోడించబడలేదు"</string>
-    <string name="app_default_dashboard_title" msgid="6575301028225232193">"డిఫాల్ట్ యాప్‌లు"</string>
+    <string name="app_default_dashboard_title" msgid="6575301028225232193">"ఆటోమేటిక్ యాప్‌లు"</string>
     <string name="system_dashboard_summary" msgid="6582464466735779394">"భాషలు, సంజ్ఞలు, సమయం, బ్యాకప్"</string>
     <string name="search_results_title" msgid="4160717656435503940">"సెట్టింగ్‌లు"</string>
     <string name="keywords_wifi" msgid="8477688080895466846">"wifi, wi-fi, నెట్‌వర్క్ కనెక్షన్, ఇంటర్నెట్, వైర్‌లెస్, డేటా, wi fi"</string>
@@ -3085,9 +3085,9 @@
     <string name="keywords_users" msgid="5880705776023155640">"పరిమితి, పరిమితం చేయి, పరిమితం చేయబడింది"</string>
     <string name="keywords_keyboard_and_ime" msgid="3327265741354129990">"వచన దిద్దుబాటు, దిద్దుబాటు చేయి, ధ్వని, వైబ్రేట్, స్వయంచాలకం, భాష, సంజ్ఞ, సూచించు, సూచన, థీమ్, అభ్యంతరకరం, పదం, రకం, ఎమోజీ, అంతర్జాతీయం"</string>
     <string name="keywords_reset_apps" msgid="2645701455052020435">"రీసెట్, ప్రాధాన్యతలు, డిఫాల్ట్"</string>
-    <string name="keywords_all_apps" msgid="846444448435698930">"అనువర్తనాలు, డౌన్‌లోడ్, అనువర్తనాలు, సిస్టమ్"</string>
-    <string name="keywords_app_permissions" msgid="8539841019997048500">"అనువర్తనాలు, అనుమతులు, భద్రత"</string>
-    <string name="keywords_default_apps" msgid="7435952699323965532">"అనువర్తనాలు, డిఫాల్ట్"</string>
+    <string name="keywords_all_apps" msgid="846444448435698930">"యాప్‌లు, డౌన్‌లోడ్, యాప్‌లు, సిస్టమ్"</string>
+    <string name="keywords_app_permissions" msgid="8539841019997048500">"యాప్‌లు, అనుమతులు, భద్రత"</string>
+    <string name="keywords_default_apps" msgid="7435952699323965532">"యాప్‌లు, డిఫాల్ట్"</string>
     <string name="keywords_ignore_optimizations" msgid="9127632532176249438">"ఆప్టిమైజేషన్‌లు నిద్రావస్థ, యాప్ స్టాండ్‌బైలను  విస్మరించు"</string>
     <string name="keywords_color_mode" msgid="8893345199519181751">"సచేతనం, RGB, sRGB, రంగు, సహజం, ప్రామాణికం"</string>
     <string name="keywords_color_temperature" msgid="2255253972992035046">"రంగు, ఉష్ణోగ్రత, D65, D73, తెలుపు, పసుపు, నీలం, గాఢమైన, లేత"</string>
@@ -3267,7 +3267,7 @@
     <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_review_schedule" msgid="2247761749333893513">"షెడ్యూల్‌ను సమీక్షించండి"</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>
     <string name="zen_custom_settings_duration_header" msgid="1806465684026300942">"వ్యవధి"</string>
@@ -3280,12 +3280,12 @@
     <string name="zen_onboarding_new_setting_summary" msgid="8264430315983860075">"మీరు నోటిఫికేషన్‌లను చూడలేరు లేదా వినలేరు. నక్షత్రం గుర్తు ఉన్న పరిచయాల మరియు రిపీట్ కాలర్‌‌ల నుండి కాల్‌లు అనుమతించబడతాయి."</string>
     <string name="zen_onboarding_current_setting_summary" msgid="3569246708507270821">"(ప్రస్తుత సెట్టింగ్)"</string>
     <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="7584229011611927613">"అంతరాయం కలిగించవద్దు నోటిఫికేషన్‌ సెట్టింగ్‌లను మార్చాలా?"</string>
-    <string name="sound_work_settings" msgid="4140215240360927923">"కార్యాలయ ప్రొఫైల్ శబ్దాలు"</string>
+    <string name="sound_work_settings" msgid="4140215240360927923">"ఆఫీస్‌ ప్రొఫైల్ శబ్దాలు"</string>
     <string name="work_use_personal_sounds_title" msgid="531727195073003599">"వ్యక్తిగత ప్రొఫైల్ శబ్దాలు ఉంచు"</string>
-    <string name="work_use_personal_sounds_summary" msgid="2886871383995187441">"కార్యాలయ మరియు వ్యక్తిగత ప్రొఫైల్‌లకు ఒకే ధ్వనులు ఉపయోగించబడతాయి"</string>
-    <string name="work_ringtone_title" msgid="5499360583947410224">"కార్యాలయ ఫోన్ రింగ్‌టోన్"</string>
-    <string name="work_notification_ringtone_title" msgid="8059159087214025757">"డిఫాల్ట్ కార్యాలయ నోటిఫికేషన్ ధ్వని"</string>
-    <string name="work_alarm_ringtone_title" msgid="5328487181385375130">"డిఫాల్ట్ కార్యాలయ అలారం ధ్వని"</string>
+    <string name="work_use_personal_sounds_summary" msgid="2886871383995187441">"ఆఫీస్‌తో పాటు వ్యక్తిగత ప్రొఫైల్‌లకు ఒకే రకమైన ధ్వనులు ఉపయోగించబడతాయి"</string>
+    <string name="work_ringtone_title" msgid="5499360583947410224">"ఆఫీస్‌ ఫోన్ రింగ్‌టోన్"</string>
+    <string name="work_notification_ringtone_title" msgid="8059159087214025757">"ఆటోమేటిక్‌ ఆఫీస్‌ నోటిఫికేషన్ ధ్వని"</string>
+    <string name="work_alarm_ringtone_title" msgid="5328487181385375130">"ఆటోమేటిక్‌ ఆఫీస్‌ అలారం ధ్వని"</string>
     <string name="work_sound_same_as_personal" msgid="7728560881697159758">"వ్యక్తిగత ప్రొఫైల్‌లో వలె ఉంచబడతాయి"</string>
     <string name="work_sync_dialog_title" msgid="4799120971202956837">"ధ్వనులను భర్తీ చేయాలా?"</string>
     <string name="work_sync_dialog_yes" msgid="2110726233746476066">"భర్తీ చేయి"</string>
@@ -3332,7 +3332,7 @@
     <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>
+    <string name="notification_channel_title" msgid="6637705960909690229">"నోటిఫికేషన్ కేటగిరీ"</string>
     <string name="notification_group_title" msgid="6105337987437608590">"నోటిఫికేషన్ వర్గం సమూహం"</string>
     <string name="notification_importance_title" msgid="4131979083408000545">"ప్రవర్తన"</string>
     <string name="notification_importance_unspecified" msgid="2515778981253707724">"ధ్వనిని అనుమతించండి"</string>
@@ -3362,7 +3362,7 @@
     <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>
@@ -3378,14 +3378,14 @@
     <string name="notification_listener_disable_warning_confirm" msgid="7863495391671154188">"ఆఫ్ చేయండి"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="6264631825225298458">"రద్దు చేయి"</string>
     <string name="vr_listeners_title" msgid="511483902408792832">"VR సహాయక సేవలు"</string>
-    <string name="no_vr_listeners" msgid="7675484190394450979">"ఇన్‌స్టాల్ చేసిన అనువర్తనాలు ఏవీ VR సహాయక సేవలుగా అమలు కావడానికి అభ్యర్థించబడలేదు."</string>
+    <string name="no_vr_listeners" msgid="7675484190394450979">"ఇన్‌స్టాల్ చేసిన యాప్‌లు ఏవీ VR సహాయక సేవలుగా అమలు కావడానికి అభ్యర్థించబడలేదు."</string>
     <string name="vr_listener_security_warning_title" msgid="7019322246707645361">"<xliff:g id="SERVICE">%1$s</xliff:g> కోసం VR సేవ ప్రాప్యతను అనుమతించాలా?"</string>
     <string name="vr_listener_security_warning_summary" msgid="5093225583584522067">"మీరు వర్చువల్ రియాలిటీ మోడ్‌లో అనువర్తనాలను ఉపయోగిస్తున్నప్పుడు <xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> అమలు కాగలదు."</string>
     <string name="display_vr_pref_title" msgid="1088464812293416981">"పరికరం VRలో ఉన్నప్పుడు"</string>
     <string name="display_vr_pref_low_persistence" msgid="3132583929174794245">"బ్లర్ తగ్గించు (సిఫార్సు చేయబడింది)"</string>
     <string name="display_vr_pref_off" msgid="4681320968818852691">"ప్ర‌కాశంలో అస్థిర‌త‌ను త‌గ్గించు"</string>
     <string name="picture_in_picture_title" msgid="4960733106166035448">"చిత్రంలో చిత్రం"</string>
-    <string name="picture_in_picture_empty_text" msgid="8664071475324685241">"చిత్రంలో చిత్రానికి మద్దతిచ్చే అనువర్తనాలు ఏవీ ఇన్‌స్టాల్ చేయబడలేదు"</string>
+    <string name="picture_in_picture_empty_text" msgid="8664071475324685241">"చిత్రంలో చిత్రానికి మద్దతిచ్చే యాప్‌లు ఏవీ ఇన్‌స్టాల్ చేయబడలేదు"</string>
     <string name="picture_in_picture_keywords" msgid="7326958702002259262">"pip picture in"</string>
     <string name="picture_in_picture_app_detail_title" msgid="3916189052657425936">"చిత్రంలో చిత్రం"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"చిత్రంలో చిత్రాన్ని అనుమతించు"</string>
@@ -3423,7 +3423,7 @@
     <string name="notification_badge_title" msgid="8989086619255666442">"నోటిఫికేషన్ డాట్‌ను అనుమతించండి"</string>
     <string name="notification_channel_badge_title" msgid="8228215248332054612">"నోటిఫికేషన్ డాట్‌ చూపించు"</string>
     <string name="app_notification_override_dnd_title" msgid="1757042206738172601">"\'అంతరాయం కలిగించవద్దు\'ను అధిగ‌మించు"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3152957611171210980">"అంతరాయం కలిగించవద్దు ఫీచర్‌ను ఆన్ చేసినప్పుడు, అంతరాయం కలిగించడం కొనసాగించడానికి ఈ నోటిఫికేషన్‌లను అనుమతిస్తుంది"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3152957611171210980">"అంతరాయం కలిగించవద్దు ఫీచర్‌ ఆన్‌లో ఉన్నా కూడా, నోటిఫికేషన్‌ వచ్చిన సంగతిని తెలియజెప్పడానికి ఈ నోటిఫికేషన్‌లను అనుమతిస్తుంది"</string>
     <string name="app_notification_visibility_override_title" msgid="2349335170165637672">"లాక్ స్క్రీన్‌లో"</string>
     <string name="app_notification_row_banned" msgid="2079325338122151677">"బ్లాక్ చేయబడింది"</string>
     <string name="app_notification_row_priority" msgid="432299064888787236">"ప్రాధాన్యత"</string>
@@ -3638,7 +3638,7 @@
     <string name="filter_instant_apps" msgid="8087483282854072366">"తక్షణ యాప్‌లు"</string>
     <string name="filter_personal_apps" msgid="3473268022652904457">"వ్యక్తిగతం"</string>
     <string name="filter_work_apps" msgid="4202483998339465542">"కార్యాలయం"</string>
-    <string name="filter_notif_all_apps" msgid="1862666327228804896">"అనువర్తనాలు: అన్నీ"</string>
+    <string name="filter_notif_all_apps" msgid="1862666327228804896">"యాప్‌లు: అన్నీ"</string>
     <string name="filter_notif_blocked_apps" msgid="5694956954776028202">"ఆఫ్ చేయబడింది"</string>
     <string name="filter_notif_urgent_channels" msgid="5000735867167027148">"వర్గాలు: అత్యవసర ప్రాధాన్యత"</string>
     <string name="filter_notif_low_channels" msgid="6859599463135775287">"వర్గాలు: తక్కువ ప్రాధాన్యత"</string>
@@ -3690,9 +3690,9 @@
     <string name="always_running" msgid="5320183445080208766">"ఎల్లప్పుడూ అమలు చేయబడుతోంది (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
     <string name="sometimes_running" msgid="3830146615620696644">"కొన్నిసార్లు అమలు చేయబడుతోంది (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
     <string name="rarely_running" msgid="7726208127642450037">"అరుదుగా అమలు చేయబడుతోంది (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
-    <string name="memory_max_use" msgid="5493310646751769451">"గరిష్టం"</string>
+    <string name="memory_max_use" msgid="5493310646751769451">"గరిష్ఠం"</string>
     <string name="memory_avg_use" msgid="3686245197961237899">"సగటు"</string>
-    <string name="memory_max_desc" msgid="2013027702130684764">"గరిష్టం <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
+    <string name="memory_max_desc" msgid="2013027702130684764">"గరిష్ఠం <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
     <string name="memory_avg_desc" msgid="1200185697910086968">"సగటు <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
     <string name="memory_use_running_format" msgid="3741170402563292232">"<xliff:g id="MEMORY">%1$s</xliff:g> / <xliff:g id="RUNNING">%2$s</xliff:g>"</string>
     <string name="process_format" msgid="8575347150598564509">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
@@ -3713,7 +3713,7 @@
     <string name="high_power_off" msgid="5906679734326490426">"బ్యాటరీ వినియోగాన్ని ఆప్టిమైజ్ చేస్తోంది"</string>
     <string name="high_power_system" msgid="739584574711292753">"బ్యాటరీ ఆప్టిమైజేషన్ అందుబాటులో లేదు"</string>
     <string name="high_power_desc" msgid="333756885680362741">"బ్యాటరీ అనుకూలీకరణను వర్తింపజేయదు. మీ బ్యాటరీ మరింత శీఘ్రంగా వినియోగించబడవచ్చు."</string>
-    <string name="high_power_prompt_title" msgid="2805745781720454052">"ఎల్లప్పుడూ నేపథ్యంలో అమలు కావడానికి అనువర్తనాన్ని అనుమతించాలా?"</string>
+    <string name="high_power_prompt_title" msgid="2805745781720454052">"ఎల్లప్పుడూ నేపథ్యంలో అమలు కావడానికి యాప్‌ను అనుమతించాలా?"</string>
     <string name="high_power_prompt_body" msgid="8067395096053552289">"ఎల్లప్పుడూ నేపథ్యంలో అమలు కావడానికి <xliff:g id="APP_NAME">%1$s</xliff:g>ని అనుమతిస్తే బ్యాటరీ జీవితకాలం తగ్గిపోవచ్చు. \n\nమీరు తర్వాత సెట్టింగ్‌లు &gt; యాప్‌లు &amp; నోటిఫికేషన్‌లలోకి వెళ్లి దీనిని మార్చవచ్చు."</string>
     <string name="battery_summary" msgid="4345690800899981339">"చివరిగా పూర్తి ఛార్జింగ్ చేసినప్పటి నుండి <xliff:g id="PERCENTAGE">%1$s</xliff:g> వినియోగించబడింది"</string>
     <string name="battery_power_management" msgid="2853925857548647969">"పవర్ నిర్వహణ"</string>
@@ -3723,8 +3723,8 @@
     <string name="additional_permissions" msgid="3142290772324571654">"అదనపు అనుమతులు"</string>
     <string name="additional_permissions_more" msgid="714264060348056246">"మరో <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="share_remote_bugreport_dialog_title" msgid="1390719492733882678">"బగ్ నివేదికను భాగస్వామ్యం చేయాలా?"</string>
-    <string name="share_remote_bugreport_dialog_message_finished" msgid="5133489230646384192">"మీ ఐటి నిర్వాహకులు ఈ పరికరం సమస్యకు పరిష్కారాన్ని కనుగొనడంలో సహాయం కోసం బగ్ నివేదికను అభ్యర్థించారు. అనువర్తనాలు మరియు డేటా భాగస్వామ్యం చేయబడవచ్చు."</string>
-    <string name="share_remote_bugreport_dialog_message" msgid="6680361103125933760">"మీ ఐటి నిర్వాహకులు ఈ పరికరం సమస్యకు పరిష్కారాన్ని కనుగొనడంలో సహాయం కోసం బగ్ నివేదికను అభ్యర్థించారు. అనువర్తనాలు మరియు డేటా భాగస్వామ్యం చేయబడవచ్చు మరియు మీ పరికరం పనితీరు తాత్కాలికంగా నెమ్మదించవచ్చు."</string>
+    <string name="share_remote_bugreport_dialog_message_finished" msgid="5133489230646384192">"మీ ఐటి నిర్వాహకులు ఈ పరికరం సమస్యకు పరిష్కారాన్ని కనుగొనడంలో సహాయం కోసం బగ్ నివేదికను అభ్యర్థించారు. యాప్‌లు మరియు డేటా భాగస్వామ్యం చేయబడవచ్చు."</string>
+    <string name="share_remote_bugreport_dialog_message" msgid="6680361103125933760">"మీ ఐటి నిర్వాహకులు ఈ పరికరం సమస్యకు పరిష్కారాన్ని కనుగొనడంలో సహాయం కోసం బగ్ నివేదికను అభ్యర్థించారు. యాప్‌లు మరియు డేటా భాగస్వామ్యం చేయబడవచ్చు మరియు మీ పరికరం పనితీరు తాత్కాలికంగా నెమ్మదించవచ్చు."</string>
     <string name="sharing_remote_bugreport_dialog_message" msgid="3814787466701526359">"ఈ బగ్ నివేదిక మీ ఐటి నిర్వాహకులతో భాగస్వామ్యం చేయబడుతోంది. మరిన్ని వివరాల కోసం వారిని సంప్రదించండి."</string>
     <string name="share_remote_bugreport_action" msgid="8600797271670537888">"షేర్ చేయి"</string>
     <string name="decline_remote_bugreport_action" msgid="706319275774199033">"తిరస్కరిస్తున్నాను"</string>
@@ -3739,7 +3739,7 @@
     <string name="usb_use_MIDI" msgid="4710632870781041401">"MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="1770966187150010947">"ఈ పరికరాన్ని MIDI వలె ఉపయోగించడం"</string>
     <string name="usb_use" msgid="8940500223316278632">"దీని కోసం USBని ఉపయోగించండి"</string>
-    <string name="usb_default_label" msgid="7471316635263936101">"డిఫాల్ట్ USB కాన్ఫిగరేషన్"</string>
+    <string name="usb_default_label" msgid="7471316635263936101">"USB ఆటోమేటిక్ కాన్ఫిగరేషన్"</string>
     <string name="usb_default_info" msgid="953775292571786528">"మరొక పరికరం కనెక్ట్ అయ్యి ఉన్నప్పుడు మరియు మీ ఫోన్ అన్‌లాక్ చేయబడి ఉన్నప్పుడు, ఈ సెట్టింగ్‌లు వర్తింపజేయబడతాయి. కేవలం విశ్వసనీయ పరికరాలకు మాత్రమే కనెక్ట్ చేయండి."</string>
     <string name="usb_pref" msgid="6194821550693495068">"USB"</string>
     <string name="usb_preference" msgid="7092987095048592826">"USB ప్రాధాన్యతలు"</string>
@@ -3794,7 +3794,7 @@
     <string name="zen_access_revoke_warning_dialog_title" msgid="6850994585577513299">"<xliff:g id="APP">%1$s</xliff:g> అంతరాయం కలిగించవద్దు ఫీచర్‌కు యాక్సెస్‌ను ఉపసంహరించాలా?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="3487422193181311403">"ఈ యాప్ ద్వారా రూపొందించిన అన్ని అంతరాయం కలిగించవద్దు నిబంధనలు తీసివేయబడతాయి."</string>
     <string name="ignore_optimizations_on" msgid="4373971641328943551">"అనుకూలీకరించవద్దు"</string>
-    <string name="ignore_optimizations_off" msgid="4372289432580282870">"అనుకూలీకరించు"</string>
+    <string name="ignore_optimizations_off" msgid="4372289432580282870">"ఆప్టిమైజ్"</string>
     <string name="ignore_optimizations_on_desc" msgid="2904484569799521559">"మీ బ్యాటరీ మరింత త్వరగా వినియోగించబడవచ్చు. ఇకపై ఈ యాప్ నేపథ్య బ్యాటరీ వినియోగం పరిమితం చేయబడదు."</string>
     <string name="ignore_optimizations_off_desc" msgid="5598702251817814289">"మెరుగైన బ్యాటరీ సామర్థ్యం కోసం సిఫార్సు చేయబడింది"</string>
     <string name="ignore_optimizations_title" msgid="7924345545276166305">"బ్యాటరీ అనుకూలీకరణలను విస్మరించడానికి <xliff:g id="APP">%s</xliff:g>ని అనుమతించాలా?"</string>
@@ -3806,25 +3806,25 @@
     <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>
     <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="filter_overlay_apps" msgid="6336897660213304743">"అనుమతి ఉన్న యాప్‌లు"</string>
     <string name="app_permission_summary_allowed" msgid="6458476982015518778">"అనుమతించబడింది"</string>
     <string name="app_permission_summary_not_allowed" msgid="1171642541675462584">"అనుమతించబడలేదు"</string>
     <string name="keywords_install_other_apps" msgid="5383559540695847668">"తెలియని యాప్‌లను ఇన్‌స్టాల్ చేయి"</string>
     <string name="write_settings" msgid="9009040811145552108">"సిస్టమ్ సెట్టింగ్‌ల సవరణ"</string>
     <string name="keywords_write_settings" msgid="3450405263390246293">"వ్రాయండి సవరించండి సిస్టమ్ సెట్టింగ్‌లు"</string>
-    <string name="write_settings_summary" msgid="4650251358459404247">"<xliff:g id="COUNT_1">%2$d</xliff:g>లో <xliff:g id="COUNT_0">%1$d</xliff:g> అనువర్తనాలు సిస్టమ్ సెట్టింగ్‌ల సవరణకు అనుమతించబడ్డాయి"</string>
+    <string name="write_settings_summary" msgid="4650251358459404247">"<xliff:g id="COUNT_1">%2$d</xliff:g>లో <xliff:g id="COUNT_0">%1$d</xliff:g> యాప్‌లు సిస్టమ్ సెట్టింగ్‌ల సవరణకు అనుమతించబడ్డాయి"</string>
     <string name="financial_apps_sms_access_title" msgid="3422655018008259655">"ఫైనాన్షియల్ యాప్‌ల Sms యాక్సెస్"</string>
     <string name="filter_install_sources_apps" msgid="4519839764020866701">"ఇతర అనువర్తనాలను ఇన్‌స్టాల్ చేయవచ్చు"</string>
     <string name="filter_write_settings_apps" msgid="6864144615530081121">"సిస్టమ్ సెట్టింగ్‌లు సవరించగలవు"</string>
     <string name="write_settings_title" msgid="5852614614193830632">"సిస్టమ్ సెట్టింగ్‌లు సవరించగలవు"</string>
     <string name="write_system_settings" msgid="20450765210832463">"సిస్టమ్ సెట్టింగ్‌ల సవరణ"</string>
     <string name="permit_write_settings" msgid="4198491281216818756">"సిస్టమ్ సెట్టింగ్‌ల సవరణను అనుమతించండి"</string>
-    <string name="write_settings_description" msgid="2536706293042882500">"ఈ అనుమతి సిస్టమ్ సెట్టింగ్‌లను సవరించడానికి అనువర్తనాన్ని అనుమతిస్తుంది."</string>
+    <string name="write_settings_description" msgid="2536706293042882500">"ఈ అనుమతి సిస్టమ్ సెట్టింగ్‌లను సవరించడానికి యాప్‌ను అనుమతిస్తుంది."</string>
     <string name="write_settings_on" msgid="7328986337962635118">"అవును"</string>
     <string name="write_settings_off" msgid="5708257434958406202">"లేదు"</string>
     <string name="external_source_switch_title" msgid="5947220058496373178">"ఈ మూలాధారం నుండి అనుమతించండి"</string>
@@ -3858,7 +3858,7 @@
       <item quantity="one">1 అనువర్తనంలో ఆఫ్ చేయబడింది</item>
     </plurals>
     <string name="notification_summary_none" msgid="5003043219430054784">"అన్ని యాప్‌లలో ఆన్ చేయబడ్డాయి"</string>
-    <string name="apps_summary" msgid="8355759446490212195">"<xliff:g id="COUNT">%1$d</xliff:g> అనువర్తనాలు ఇన్‌స్టాల్ చేయబడ్డాయి"</string>
+    <string name="apps_summary" msgid="8355759446490212195">"<xliff:g id="COUNT">%1$d</xliff:g> యాప్‌లు ఇన్‌స్టాల్ చేయబడ్డాయి"</string>
     <string name="apps_summary_example" msgid="3011143598675185269">"24 యాప్‌లు ఇన్‌స్టాల్ చేయబడ్డాయి"</string>
     <string name="storage_summary" msgid="4835916510511133784">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> ఉపయోగించబడింది - <xliff:g id="FREE_SPACE">%2$s</xliff:g> ఖాళీగా ఉంది"</string>
     <string name="storage_summary_with_sdcard" msgid="8742907204848352697">"అంతర్గత నిల్వ: <xliff:g id="PERCENTAGE">%1$s</xliff:g> ఉపయోగించబడింది - <xliff:g id="FREE_SPACE">%2$s</xliff:g> ఖాళీగా ఉంది"</string>
@@ -4069,8 +4069,8 @@
     <string name="page_tab_title_summary" msgid="4824744863994538006">"అన్నీ"</string>
     <string name="page_tab_title_support" msgid="5569262185010367870">"చిట్కాలు &amp; మద్దతు"</string>
     <string name="developer_smallest_width" msgid="2603134476228805075">"అతితక్కువ వెడల్పు"</string>
-    <string name="premium_sms_none" msgid="940723020871007898">"ఇన్‌స్టాల్ చేసిన అనువర్తనాలు ఏవీ ప్రీమియం SMS ప్రాప్యతను అభ్యర్థించలేదు"</string>
-    <string name="premium_sms_warning" msgid="7604011651486294515">"ప్రీమియం SMSతో మీకు డబ్బు ఖర్చు కావచ్చు, ఈ ఛార్జీ మీ క్యారియర్ బిల్లుల్లో విధించబడుతుంది. మీరు ఒక అనువర్తనానికి అనుమతిని అందిస్తే, ఆ అనువర్తనాన్ని ఉపయోగించి ప్రీమియం SMSను పంపగలరు."</string>
+    <string name="premium_sms_none" msgid="940723020871007898">"ఇన్‌స్టాల్ చేసిన యాప్‌లు ఏవీ ప్రీమియం SMS ప్రాప్యతను అభ్యర్థించలేదు"</string>
+    <string name="premium_sms_warning" msgid="7604011651486294515">"ప్రీమియం SMSతో మీకు డబ్బు ఖర్చు కావచ్చు, ఈ ఛార్జీ మీ క్యారియర్ బిల్లుల్లో విధించబడుతుంది. మీరు ఒక అనువర్తనానికి అనుమతిని అందిస్తే, ఆ యాప్‌ను ఉపయోగించి ప్రీమియం SMSను పంపగలరు."</string>
     <string name="premium_sms_access" msgid="4550027460595822851">"ప్రీమియం SMS యాక్సెస్"</string>
     <string name="bluetooth_disabled" msgid="6588102116819268238">"ఆఫ్"</string>
     <string name="bluetooth_connected_summary" msgid="439920840053965217">"<xliff:g id="ID_1">%1$s</xliff:g>కి కనెక్ట్ చేయబడింది"</string>
@@ -4181,16 +4181,16 @@
     <string name="enterprise_privacy_bug_reports" msgid="283443567328836380">"అత్యంత ఇటీవలి బగ్ నివేదిక"</string>
     <string name="enterprise_privacy_security_logs" msgid="8936969480449604726">"అత్యంత ఇటీవలి భద్రతా లాగ్"</string>
     <string name="enterprise_privacy_none" msgid="5990646476868794882">"ఏదీ లేదు"</string>
-    <string name="enterprise_privacy_enterprise_installed_packages" msgid="6575025134782391212">"అనువర్తనాలు ఇన్‌స్టాల్ చేయబడ్డాయి"</string>
+    <string name="enterprise_privacy_enterprise_installed_packages" msgid="6575025134782391212">"యాప్‌లు ఇన్‌స్టాల్ చేయబడ్డాయి"</string>
     <string name="enterprise_privacy_apps_count_estimation_info" msgid="5020730108878608500">"అనువర్తనాల సంఖ్య అంచనా సమాచారం మాత్రమే. Play స్టోర్ నుండి ఇన్‌స్టాల్ చేయని అనువర్తనాలను ఇందులో పరిగణనలోకి తీసుకుని ఉండకపోవచ్చు."</string>
     <plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="5161417161943060602">
-      <item quantity="other">కనీసం <xliff:g id="COUNT_1">%d</xliff:g> అనువర్తనాలు</item>
+      <item quantity="other">కనీసం <xliff:g id="COUNT_1">%d</xliff:g> యాప్‌లు</item>
       <item quantity="one">కనీసం <xliff:g id="COUNT_0">%d</xliff:g> అనువర్తనం</item>
     </plurals>
     <string name="enterprise_privacy_location_access" msgid="110406267468274216">"స్థాన అనుమతులు"</string>
     <string name="enterprise_privacy_microphone_access" msgid="4586428105675460207">"మైక్రోఫోన్ అనుమతులు"</string>
     <string name="enterprise_privacy_camera_access" msgid="2366392786153103482">"కెమెరా అనుమతులు"</string>
-    <string name="enterprise_privacy_enterprise_set_default_apps" msgid="6142937923758931242">"డిఫాల్ట్ యాప్‌లు"</string>
+    <string name="enterprise_privacy_enterprise_set_default_apps" msgid="6142937923758931242">"ఆటోమేటిక్ యాప్‌లు"</string>
     <plurals name="enterprise_privacy_number_packages" formatted="false" msgid="1480745164313890415">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> యాప్‌లు</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> యాప్</item>
@@ -4221,18 +4221,18 @@
     <string name="do_disclosure_learn_more_separator" msgid="702345537118848010">" "</string>
     <string name="learn_more" msgid="6844160787130206258">"మరింత తెలుసుకోండి"</string>
     <plurals name="default_camera_app_title" formatted="false" msgid="8762954032197483848">
-      <item quantity="other">కెమెరా అనువర్తనాలు</item>
+      <item quantity="other">కెమెరా యాప్‌లు</item>
       <item quantity="one">కెమెరా అనువర్తనం</item>
     </plurals>
     <string name="default_calendar_app_title" msgid="6484001237347739255">"క్యాలెండర్ యాప్"</string>
     <string name="default_contacts_app_title" msgid="1050372162465746272">"కాంటాక్ట్‌ల యాప్"</string>
     <plurals name="default_email_app_title" formatted="false" msgid="6875559046625447168">
-      <item quantity="other">ఇమెయిల్ క్లయింట్ అనువర్తనాలు</item>
+      <item quantity="other">ఇమెయిల్ క్లయింట్ యాప్‌లు</item>
       <item quantity="one">ఇమెయిల్ క్లయింట్ అనువర్తనం</item>
     </plurals>
     <string name="default_map_app_title" msgid="6919751358166607185">"మ్యాప్ యాప్"</string>
     <plurals name="default_phone_app_title" formatted="false" msgid="7593838689002912108">
-      <item quantity="other">ఫోన్ అనువర్తనాలు</item>
+      <item quantity="other">ఫోన్ యాప్‌లు</item>
       <item quantity="one">ఫోన్ అనువర్తనం</item>
     </plurals>
     <string name="app_names_concatenation_template_2" msgid="8267577900046506189">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
@@ -4246,7 +4246,7 @@
     <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_confirmation" msgid="1778553115373698061">"మీరు ఈ తక్షణ అనువర్తనాన్ని తీసివేయాలనుకుంటున్నారా?"</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>
     <string name="audio_files_title" msgid="3073879661731363935">"ఆడియో ఫైల్‌లు"</string>
@@ -4262,7 +4262,7 @@
     <string name="autofill_max_visible_datasets" msgid="2791081640248423492">"కనిపించగల గరిష్ఠ డేటాసమితులు"</string>
     <string name="autofill_reset_developer_options" msgid="7208417230269613101">"డిఫాల్ట్ విలువలకు రీసెట్ చేయి"</string>
     <string name="autofill_reset_developer_options_complete" msgid="5686061993002179524">"స్వీయ పూరింపు డెవలపర్ ఎంపికలు రీసెట్ చేయబడ్డాయి"</string>
-    <string name="device_theme" msgid="8992291311481135893">"పరికర థీమ్"</string>
+    <string name="device_theme" msgid="8992291311481135893">"పరికర రూపం"</string>
     <string name="default_theme" msgid="5986996377385956138">"డిఫాల్ట్"</string>
     <string name="show_operator_name_title" msgid="5056163028128447308">"నెట్‌వర్క్ పేరు"</string>
     <string name="show_operator_name_summary" msgid="6352180285743777497">"స్థితి పట్టీలో నెట్‌వర్క్ పేరును ప్రదర్శిస్తుంది"</string>
@@ -4413,7 +4413,7 @@
     <string name="mobile_network_inactive_esim" msgid="6525747163540293028">"ఇన్‌యాక్టివ్ / డౌన్‌లోడ్ చేసిన SIM"</string>
     <string name="mobile_network_sim_name" msgid="8228870017368926761">"సిమ్ పేరు"</string>
     <string name="mobile_network_sim_name_rename" msgid="4810736493612513152">"పేరు మార్చు"</string>
-    <string name="mobile_network_use_sim_on" msgid="1944823242539751387">"SIMను ఉపయోగించు"</string>
+    <string name="mobile_network_use_sim_on" msgid="1944823242539751387">"SIMను ఉపయోగించండి"</string>
     <string name="mobile_network_use_sim_off" msgid="2077820358051946635">"ఆఫ్"</string>
     <string name="mobile_network_esim_swap_confirm_title" msgid="6077154427380613615">"<xliff:g id="CARRIER">%1$s</xliff:g>కు మారాలా?"</string>
     <string name="mobile_network_esim_swap_confirm_body" msgid="1192274915146275063">"ఒకసారి ఒక డౌన్‌లోడ్ చేయబడిన SIMను మాత్రమే యాక్టివ్‌గా ఉంచగలరు.\n\n<xliff:g id="CARRIER1">%1$s</xliff:g>కు మారడం వలన మీ <xliff:g id="CARRIER2">%2$s</xliff:g> సేవ రద్దు చేయబడదు."</string>
@@ -4510,7 +4510,7 @@
     <string name="wfc_disclaimer_agree_button_text" msgid="4706101805260434404">"కొనసాగించు"</string>
     <string name="wfc_disclaimer_disagree_text" msgid="908289420390194127">"వద్దు, ధన్యవాదాలు"</string>
     <string name="wfc_disclaimer_location_title_text" msgid="5696194250838686019">"స్థానం"</string>
-    <string name="wfc_disclaimer_location_desc_text" msgid="3879710366995108723">"ఈ సేవను అందించడానికి మీ సేవా ప్రదాత మీ స్థాన సమాచారం సేకరించవచ్చు.\n\nదయచేసి మీ సేవా ప్రదాత గోప్యతా విధానాన్ని సమీక్షించండి."</string>
+    <string name="wfc_disclaimer_location_desc_text" msgid="3879710366995108723">"ఈ సేవను అందించడానికి మీ సేవా ప్రదాత మీ స్థాన సమాచారం సేకరించవచ్చు.\n\nదయచేసి మీ సేవా ప్రదాత గోప్యతా విధానాన్ని రివ్యూ చేయండి."</string>
     <string name="forget_passpoint_dialog_message" msgid="3337626966248310367">"మీరు ఏదైనా మిగిలిన సమయం లేదా డేటాకు యాక్సెస్‌ను కోల్పోవచ్చు. తీసివేసే ముందు మీ ప్రదాతతో తనిఖీ చేయండి."</string>
     <string name="keywords_content_capture" msgid="5401877823529928976">"కంటెంట్ క్యాప్చర్, స్మార్ట్ సూచనలు"</string>
     <string name="content_capture" msgid="1709538093513983279">"స్మార్ట్ సూచనలు"</string>
diff --git a/tests/CarDeveloperOptions/res/values-th/strings.xml b/tests/CarDeveloperOptions/res/values-th/strings.xml
index 7211a87..a05d4b7 100644
--- a/tests/CarDeveloperOptions/res/values-th/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-th/strings.xml
@@ -2631,7 +2631,7 @@
     <string name="really_remove_account_title" msgid="4166512362915154319">"นำบัญชีออกหรือไม่"</string>
     <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"การนำบัญชีนี้ออกจะเป็นการลบข้อความ รายชื่อติดต่อ และข้อมูลอื่นๆ ทั้งหมดของบัญชีออกจากแท็บเล็ต"</string>
     <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"การนำบัญชีนี้ออกจะลบข้อความ รายชื่อติดต่อ และข้อมูลอื่นๆ ทั้งหมดของบัญชีออกจากโทรศัพท์"</string>
-    <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"การนำบัญชีนี้ออกจะเป็นการลบข้อความ รายชื่อติดต่อ และข้อมูลอื่นๆ ทั้งหมดออกจากอุปกรณ์!"</string>
+    <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>
@@ -2690,7 +2690,7 @@
     <string name="data_usage_tab_3g" msgid="4262659656028408064">"2G-3G"</string>
     <string name="data_usage_list_mobile" msgid="5623011459774885900">"มือถือ"</string>
     <string name="data_usage_list_none" msgid="5948870220795490796">"ไม่มี"</string>
-    <string name="data_usage_enable_mobile" msgid="7238385042860001374">"เน็ตมือถือ"</string>
+    <string name="data_usage_enable_mobile" msgid="7238385042860001374">"อินเทอร์เน็ตมือถือ"</string>
     <string name="data_usage_enable_3g" msgid="3725838726334043367">"ข้อมูล 2G-3G"</string>
     <string name="data_usage_enable_4g" msgid="8872517106293561179">"ข้อมูล 4G"</string>
     <string name="data_roaming_enable_mobile" msgid="5886394350890765947">"โรมมิ่ง"</string>
diff --git a/tests/CarDeveloperOptions/res/values-tl/arrays.xml b/tests/CarDeveloperOptions/res/values-tl/arrays.xml
index de090b6..e626605 100644
--- a/tests/CarDeveloperOptions/res/values-tl/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-tl/arrays.xml
@@ -73,7 +73,7 @@
     <item msgid="3391238031431440676">"Kumukuha ng IP address…"</item>
     <item msgid="5257597310494000224">"Nakakonekta"</item>
     <item msgid="8472497592913050396">"Suspendido"</item>
-    <item msgid="1228072488815999109">"Nadidiskonekta..."</item>
+    <item msgid="1228072488815999109">"Dinidiskonekta..."</item>
     <item msgid="7253087004422991731">"Hindi nakakonekta"</item>
     <item msgid="4169850917304751227">"Hindi tagumpay"</item>
     <item msgid="6266658166690831131">"Naka-block"</item>
diff --git a/tests/CarDeveloperOptions/res/values-tl/strings.xml b/tests/CarDeveloperOptions/res/values-tl/strings.xml
index f46701f..5cd71fb 100644
--- a/tests/CarDeveloperOptions/res/values-tl/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-tl/strings.xml
@@ -2277,9 +2277,9 @@
     <string name="battery_tip_smart_battery_title" product="tablet" msgid="203494973250969040">"Patagalin ang baterya ng iyong tablet"</string>
     <string name="battery_tip_smart_battery_title" product="device" msgid="7419448992583346364">"Patagalin ang baterya ng iyong device"</string>
     <string name="battery_tip_smart_battery_summary" msgid="5344821856478265778">"I-on ang Battery Manager"</string>
-    <string name="battery_tip_early_heads_up_title" msgid="707163785378746813">"I-on ang Pangtipid sa Baterya"</string>
+    <string name="battery_tip_early_heads_up_title" msgid="707163785378746813">"I-on ang Pantipid ng Baterya"</string>
     <string name="battery_tip_early_heads_up_summary" msgid="4231489566422395156">"Maaaring maubos ang baterya nang mas maaga kaysa sa inaasahan"</string>
-    <string name="battery_tip_early_heads_up_done_title" msgid="112550885882648429">"Naka-on ang Pangtipid sa Baterya"</string>
+    <string name="battery_tip_early_heads_up_done_title" msgid="112550885882648429">"Naka-on ang Pantipid ng Baterya"</string>
     <string name="battery_tip_early_heads_up_done_summary" msgid="8692257022962771181">"Maaaring limitado ang ilang feature"</string>
     <string name="battery_tip_high_usage_title" product="default" msgid="4103005178310487352">"Nagamit ang telepono nang higit sa karaniwan"</string>
     <string name="battery_tip_high_usage_title" product="tablet" msgid="1019583260005768965">"Nagamit ang tablet nang higit sa karaniwan"</string>
@@ -2317,9 +2317,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="8120081438825031335">"Makakagamit ang app na ito ng baterya sa background. Maaaring maubos ang iyong baterya nang mas maaga kaysa sa inaasahan."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="9154938931448151479">"Alisin"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="7331148618292397166">"Kanselahin"</string>
-    <string name="battery_tip_dialog_summary_message" product="default" msgid="7244950433272770280">"Karaniwan lang ang paggamit ng baterya ng iyong mga app. Kung masyadong malakas gumamit ng baterya ang mga app, magmumungkahi ang iyong telepono ng mga aksyong puwede mong gawin.\n\nPuwede mong i-on ang Pangtipid sa Baterya anumang oras kung paubos na ang baterya mo."</string>
-    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="1721081030632329647">"Karaniwan lang ang paggamit ng baterya ng iyong mga app. Kung masyadong malakas gumamit ng baterya ang mga app, magmumungkahi ang iyong tablet ng mga aksyong puwede mong gawin.\n\nPuwede mong i-on ang Pangtipid sa Baterya anumang oras kung paubos na ang baterya mo."</string>
-    <string name="battery_tip_dialog_summary_message" product="device" msgid="146872407040848465">"Karaniwan lang ang paggamit ng baterya ng iyong mga app. Kung masyadong malakas gumamit ng baterya ang mga app, magmumungkahi ang iyong device ng mga aksyong puwede mong gawin.\n\nPuwede mong i-on ang Pangtipid sa Baterya anumang oras kung paubos na ang baterya mo."</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="7244950433272770280">"Karaniwan lang ang paggamit ng baterya ng iyong mga app. Kung masyadong malakas gumamit ng baterya ang mga app, magmumungkahi ang iyong telepono ng mga aksyong puwede mong gawin.\n\nPuwede mong i-on ang Pantipid ng Baterya anumang oras kung paubos na ang baterya mo."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="1721081030632329647">"Karaniwan lang ang paggamit ng baterya ng iyong mga app. Kung masyadong malakas gumamit ng baterya ang mga app, magmumungkahi ang iyong tablet ng mga aksyong puwede mong gawin.\n\nPuwede mong i-on ang Pantipid ng Baterya anumang oras kung paubos na ang baterya mo."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="146872407040848465">"Karaniwan lang ang paggamit ng baterya ng iyong mga app. Kung masyadong malakas gumamit ng baterya ang mga app, magmumungkahi ang iyong device ng mga aksyong puwede mong gawin.\n\nPuwede mong i-on ang Pantipid ng Baterya anumang oras kung paubos na ang baterya mo."</string>
     <string name="smart_battery_manager_title" msgid="5744035036663849515">"Battery Manager"</string>
     <string name="smart_battery_title" msgid="4919670408532804351">"Awtomatikong pamahalaan ang mga app"</string>
     <string name="smart_battery_summary" msgid="640027046471198174">"Limitahan ang baterya para sa mga app na hindi mo madalas gamitin"</string>
@@ -2446,22 +2446,22 @@
     <string name="process_kernel_label" msgid="4175060316414593760">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="8591722404282619153">"Mediaserver"</string>
     <string name="process_dex2oat_label" msgid="8249082119748556085">"Pag-optimize ng app"</string>
-    <string name="battery_saver" msgid="3989710213758938398">"Pangtipid sa Baterya"</string>
+    <string name="battery_saver" msgid="3989710213758938398">"Pantipid ng Baterya"</string>
     <string name="battery_saver_auto_title" msgid="4158659069641849952">"Awtomatikong i-on"</string>
     <string name="battery_saver_auto_no_schedule" msgid="739814529432092706">"Walang iskedyul"</string>
     <string name="battery_saver_auto_routine" msgid="886514412067906980">"Batay sa iyong routine"</string>
     <string name="battery_saver_auto_percentage" msgid="5791982309331921556">"Batay sa porsyento"</string>
-    <string name="battery_saver_auto_routine_summary" msgid="9182044424547482889">"Mag-o-on ang Pangtipid sa Baterya kung malamang na mauubos ang iyong baterya bago ang susunod mong karaniwang pag-charge"</string>
+    <string name="battery_saver_auto_routine_summary" msgid="9182044424547482889">"Mag-o-on ang Pantipid ng Baterya kung malamang na mauubos ang iyong baterya bago ang susunod mong karaniwang pag-charge"</string>
     <string name="battery_saver_auto_percentage_summary" msgid="2036128588460338677">"Mag-o-on sa <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_saver_schedule_settings_title" msgid="574233428557678128">"Magtakda ng iskedyul"</string>
     <string name="battery_saver_sticky_title_new" msgid="5328707297110866082">"I-off kapag puno na ang baterya"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="3406582427270935879">"Mao-off ang Pangtipid sa Baterya kapag nasa <xliff:g id="PERCENT">%1$s</xliff:g> na ang iyong telepono"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="3284967694001857194">"Mao-off ang Pangtipid sa Baterya kapag nasa <xliff:g id="PERCENT">%1$s</xliff:g> na ang iyong tablet"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="5056520668081504111">"Mao-off ang Pangtipid sa Baterya kapag nasa <xliff:g id="PERCENT">%1$s</xliff:g> na ang iyong device"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="3406582427270935879">"Mao-off ang Pantipid ng Baterya kapag nasa <xliff:g id="PERCENT">%1$s</xliff:g> na ang iyong telepono"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="3284967694001857194">"Mao-off ang Pantipid ng Baterya kapag nasa <xliff:g id="PERCENT">%1$s</xliff:g> na ang iyong tablet"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="5056520668081504111">"Mao-off ang Pantipid ng Baterya kapag nasa <xliff:g id="PERCENT">%1$s</xliff:g> na ang iyong device"</string>
     <!-- no translation found for battery_saver_seekbar_title (7607123201469333645) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="2321082163892561703">"I-on"</string>
-    <string name="battery_saver_master_switch_title" msgid="8241862826825517212">"Gumamit ng Pangtipid sa Baterya"</string>
+    <string name="battery_saver_master_switch_title" msgid="8241862826825517212">"Gumamit ng Pantipid ng Baterya"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="7316920304024245838">"Awtomatikong i-on"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="2623381258359775227">"Hindi Kailanman"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="434270432432390307">"sa <xliff:g id="PERCENT">%1$s</xliff:g> baterya"</string>
@@ -3127,7 +3127,7 @@
     <string name="keywords_touch_vibration" msgid="2081175517528255224">"haptics, mag-vibrate, screen, pagkasensitibo"</string>
     <string name="keywords_ring_vibration" msgid="4210509151866460210">"haptics, pag-vibrate, telepono, tawag, pagkasensitibo, pag-ring"</string>
     <string name="keywords_notification_vibration" msgid="1077515502086745166">"haptics, pag-vibrate, pagkasensitibo"</string>
-    <string name="keywords_battery_saver_sticky" msgid="8733804259716284872">"pangtipid sa baterya, sticky, manatili, pantipid ng baterya, baterya"</string>
+    <string name="keywords_battery_saver_sticky" msgid="8733804259716284872">"pantipid ng baterya, sticky, manatili, pantipid ng baterya, baterya"</string>
     <string name="default_sound" msgid="6675629744816442953">"Default na tunog"</string>
     <string name="sound_settings_summary" msgid="8467549670633195109">"Nasa <xliff:g id="PERCENTAGE">%1$s</xliff:g> ang volume ng pag-ring"</string>
     <string name="sound_dashboard_summary" msgid="5187301919242823508">"Volume, pag-vibrate, Huwag Istorbohin"</string>
@@ -3201,7 +3201,7 @@
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3049522809520549054">"Kapag may dumating na mga notification, hindi tutunog o magva-vibrate ang iyong telepono."</string>
     <string name="zen_mode_restrict_notifications_hide" msgid="3296933643539682552">"Walang visual o tunog mula sa mga notification"</string>
     <string name="zen_mode_restrict_notifications_hide_summary" msgid="1449301153755270168">"Wala kang makikita o maririnig na notification"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="7617688597593946765">"Ang iyong telepono ay hindi magpapakita ng mga bago o kasalukuyang notification o magva-vibrate o tutunog para sa mga ito. Tandaang lalabas pa rin ang mahahalagang notification para sa aktibidad ng telepono.\n\nKapag na-off mo ang Huwag Istorbohin, hanapin ang mga nalampasang notification sa pamamagitan ng pag-swipe pababa mula sa itaas ng iyong screen."</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="7617688597593946765">"Ang iyong telepono ay hindi magpapakita ng mga bago o kasalukuyang notification o magva-vibrate o tutunog para sa mga ito. Tandaang lalabas pa rin ang mahahalagang notification para sa aktibidad ng telepono.\n\nKapag ini-off mo ang Huwag Istorbohin, hanapin ang mga nalampasang notification sa pamamagitan ng pag-swipe pababa mula sa itaas ng iyong screen."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="3167252482570424133">"Custom"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="6376983315529894440">"I-enable ang custom na setting"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="8004212081465043044">"Alisin ang custom na setting"</string>
@@ -3893,7 +3893,7 @@
     <string name="condition_zen_title" msgid="2128184708916052585">"Naka-on ang Huwag Istorbohin"</string>
     <string name="condition_zen_summary_phone_muted" msgid="4396050395522974654">"Naka-mute ang telepono"</string>
     <string name="condition_zen_summary_with_exceptions" msgid="3435216391993785818">"May mga pagbubukod"</string>
-    <string name="condition_battery_title" msgid="6704870010912986274">"Naka-on ang Pangtipid sa Baterya"</string>
+    <string name="condition_battery_title" msgid="6704870010912986274">"Naka-on ang Pantipid ng Baterya"</string>
     <string name="condition_battery_summary" msgid="1236078243905690620">"Limitado ang mga feature"</string>
     <string name="condition_cellular_title" msgid="6605277435894307935">"Naka-off ang mobile data"</string>
     <string name="condition_cellular_summary" msgid="3607459310548343777">"Available lang ang Internet sa pamamagitan ng Wi‑Fi"</string>
diff --git a/tests/CarDeveloperOptions/res/values-tr/strings.xml b/tests/CarDeveloperOptions/res/values-tr/strings.xml
index 80fd9b1..3435eec 100644
--- a/tests/CarDeveloperOptions/res/values-tr/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-tr/strings.xml
@@ -26,7 +26,7 @@
       <item quantity="other">Geliştirici olmanıza <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> adım kaldı.</item>
       <item quantity="one">Geliştirici olmanıza <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> adım kaldı.</item>
     </plurals>
-    <string name="show_dev_on" msgid="9075712234786224065">"Artık siz bir geliştiricisiniz!"</string>
+    <string name="show_dev_on" msgid="9075712234786224065">"Artık bir geliştiricisiniz!"</string>
     <string name="show_dev_already" msgid="7665948832405148689">"Gerekli değil, siz zaten bir geliştiricisiniz."</string>
     <string name="dev_settings_disabled_warning" msgid="3198732189395396721">"Lütfen önce geliştirici seçeneklerini etkinleştirin."</string>
     <string name="header_category_wireless_networks" msgid="8968405993937795898">"Kablosuz ve ağlar"</string>
@@ -2491,7 +2491,7 @@
     <string name="menu_duration_6h" msgid="6169009210638008417">"6 saat"</string>
     <string name="menu_duration_12h" msgid="1435242738163843797">"12 saat"</string>
     <string name="menu_duration_1d" msgid="6476370834372352174">"1 gün"</string>
-    <string name="menu_show_system" msgid="6315865548558708248">"Sisteme ait olanları göster"</string>
+    <string name="menu_show_system" msgid="6315865548558708248">"Sisteme ait olanlar"</string>
     <string name="menu_hide_system" msgid="8457027118873733782">"Sisteme ait olanları gizle"</string>
     <string name="menu_show_percentage" msgid="6983272380729890884">"Yüzdeleri göster"</string>
     <string name="menu_use_uss" msgid="3765054705208926803">"USS\'yi kullan"</string>
@@ -2737,7 +2737,7 @@
     <string name="data_usage_metered_yes" msgid="7333744880035386073">"Sınırlı"</string>
     <string name="data_usage_metered_no" msgid="1961524615778610008">"Sınırsız"</string>
     <string name="data_usage_disclaimer" msgid="4683321532922590425">"Operatörünüzün veri hesaplaması, cihazınızınkinden farklı olabilir."</string>
-    <string name="cryptkeeper_emergency_call" msgid="4625420047524693116">"Acil durum çağrısı"</string>
+    <string name="cryptkeeper_emergency_call" msgid="4625420047524693116">"Acil durum araması"</string>
     <string name="cryptkeeper_return_to_call" msgid="4433942821196822815">"Çağrıya dön"</string>
     <string name="vpn_name" msgid="3538818658670774080">"Ad"</string>
     <string name="vpn_type" msgid="6389116710008658550">"Tür"</string>
@@ -4155,7 +4155,7 @@
     <string name="instant_apps_settings" msgid="879003203555847537">"Hazır Uygulama tercihleri"</string>
     <string name="domain_url_section_title" msgid="206403507921518321">"Yüklü uygulamalar"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="2630083316417707308">"Depolama alanınız artık depolama yöneticisi tarafından yönetiliyor"</string>
-    <string name="account_for_section_header" msgid="5975241715840642563">"<xliff:g id="USER_NAME">%1$s</xliff:g> adlı kullanıcının hesapları"</string>
+    <string name="account_for_section_header" msgid="5975241715840642563">"<xliff:g id="USER_NAME">%1$s</xliff:g> kullanıcı hesapları"</string>
     <string name="configure_section_header" msgid="6988981883075615136">"Yapılandırma"</string>
     <string name="auto_sync_account_title" msgid="2394463123733529506">"Verileri otomatik senkronize et"</string>
     <string name="auto_sync_personal_account_title" msgid="6844465157916100655">"Kişisel verileri otomatik olarak senkronize et"</string>
@@ -4254,7 +4254,7 @@
     <string name="autofill_app" msgid="3990765434980280073">"Otomatik doldurma hizmeti"</string>
     <string name="autofill_keywords" msgid="7717726766232862218">"otomatik, doldur, otomatik doldur"</string>
     <string name="autofill_confirmation_message" msgid="1385894598730361304">"&lt;b&gt;Bu uygulamaya güvendiğinizden emin olun&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Otomatik Doldurma&gt;%1$s&lt;/xliff:g&gt; otomatik doldurulabilecek öğeleri belirlemek için ekranınızdaki bilgileri kullanır."</string>
-    <string name="debug_autofill_category" msgid="6262526615416295645">"Otomatik Doldurma"</string>
+    <string name="debug_autofill_category" msgid="6262526615416295645">"Otomatik Doldur"</string>
     <string name="autofill_logging_level_title" msgid="2577340324541102626">"Günlük kaydı düzeyi"</string>
     <string name="autofill_max_partitions" msgid="125269645910590057">"Oturum başına maksimum istek"</string>
     <string name="autofill_max_visible_datasets" msgid="2791081640248423492">"Maksimum görünür veri kümesi"</string>
diff --git a/tests/CarDeveloperOptions/res/values-uk/strings.xml b/tests/CarDeveloperOptions/res/values-uk/strings.xml
index 19a4068..17fa325 100644
--- a/tests/CarDeveloperOptions/res/values-uk/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-uk/strings.xml
@@ -2084,7 +2084,7 @@
     <string name="vision_settings_suggestion_title" msgid="7268661419110951128">"Змінити розмір шрифту"</string>
     <string name="screen_reader_category_title" msgid="6300714148519645544">"Програми зчитування з екрана"</string>
     <string name="audio_and_captions_category_title" msgid="6140472938769619212">"Аудіо й текст на екрані"</string>
-    <string name="display_category_title" msgid="545168481672250195">"Дисплей"</string>
+    <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>
@@ -2405,7 +2405,7 @@
     <string name="restricted_app_detail_footer" msgid="482460517275754465">"Ці додатки споживали заряд акумулятора у фоновому режимі. Якщо ви їх обмежите, можливо, вони працюватимуть неналежним чином, а сповіщення надходитимуть із затримкою."</string>
     <string name="battery_auto_restriction_title" msgid="488905332794794076">"Використовувати диспетчер заряду акумулятора"</string>
     <string name="battery_auto_restriction_summary" msgid="1638072655581821837">"Виявляти, коли додатки швидко розряджають акумулятор"</string>
-    <string name="battery_manager_on" msgid="5626982529932239656">"Увімкнено / Виявляється, коли додатки швидко розряджають акумулятор"</string>
+    <string name="battery_manager_on" msgid="5626982529932239656">"Увімкнено (функція виявляє додатки, які швидко розряджають акумулятор)"</string>
     <string name="battery_manager_off" msgid="9114027524232450371">"Вимкнено"</string>
     <plurals name="battery_manager_app_restricted" formatted="false" msgid="6721813588142691216">
       <item quantity="one">%1$d додаток обмежено</item>
@@ -3702,7 +3702,7 @@
     <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>
-    <string name="storage_used" msgid="2457948583478332647">"Використано пам’яті"</string>
+    <string name="storage_used" msgid="2457948583478332647">"Використане сховище"</string>
     <string name="change" msgid="41563753961948554">"Змінити"</string>
     <string name="change_storage" msgid="2064045078609862770">"Змінити пам’ять"</string>
     <string name="notifications_label" msgid="2792398288062643318">"Сповіщення"</string>
@@ -3860,8 +3860,8 @@
     <string name="usb_pref" msgid="6194821550693495068">"USB"</string>
     <string name="usb_preference" msgid="7092987095048592826">"Параметри USB"</string>
     <string name="usb_control_title" msgid="2379698856760894768">"USB керує"</string>
-    <string name="usb_control_host" msgid="193292043691034178">"Підключений пристрій"</string>
-    <string name="usb_control_device" msgid="9154790265254725254">"Цей пристрій"</string>
+    <string name="usb_control_host" msgid="193292043691034178">"Підключеним пристроєм"</string>
+    <string name="usb_control_device" msgid="9154790265254725254">"Цим пристроєм"</string>
     <string name="usb_switching" msgid="1230386065163529904">"Змінюється…"</string>
     <string name="usb_switching_failed" msgid="6857722544186145439">"Не вдалося змінити"</string>
     <string name="usb_summary_charging_only" msgid="4118449308708872339">"Заряджання пристрою"</string>
diff --git a/tests/CarDeveloperOptions/res/values-ur/strings.xml b/tests/CarDeveloperOptions/res/values-ur/strings.xml
index a7c5e80..68025a6 100644
--- a/tests/CarDeveloperOptions/res/values-ur/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ur/strings.xml
@@ -26,9 +26,9 @@
       <item quantity="other">اب آپ ایک ڈویلپر بننے سے <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> قدم دور ہیں۔</item>
       <item quantity="one">اب آپ ایک ڈویلپر بننے سے <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> قدم دور ہیں۔</item>
     </plurals>
-    <string name="show_dev_on" msgid="9075712234786224065">"اب آپ ایک ڈیولپر ہیں!"</string>
-    <string name="show_dev_already" msgid="7665948832405148689">"کوئی ضرورت نہیں ہے، آپ پہلے سے ہی ایک ڈیولپر ہیں۔"</string>
-    <string name="dev_settings_disabled_warning" msgid="3198732189395396721">"براہ کرم پہلے ڈیولپر کے اختیارات فعال کریں"</string>
+    <string name="show_dev_on" msgid="9075712234786224065">"اب آپ ایک ڈویلپر ہیں!"</string>
+    <string name="show_dev_already" msgid="7665948832405148689">"کوئی ضرورت نہیں ہے، آپ پہلے سے ہی ایک ڈویلپر ہیں۔"</string>
+    <string name="dev_settings_disabled_warning" msgid="3198732189395396721">"براہ کرم پہلے ڈویلپر کے اختیارات فعال کریں"</string>
     <string name="header_category_wireless_networks" msgid="8968405993937795898">"وائرلیس اور نیٹ ورکس"</string>
     <string name="header_category_system" msgid="4045988717359334410">"سسٹم"</string>
     <string name="radio_info_data_connection_enable" msgid="2554249462719717119">"ڈیٹا کنکشن فعال کریں"</string>
@@ -125,7 +125,7 @@
     <string name="bluetooth_no_devices_found" msgid="4396050022213494322">"کوئی قریبی بلوٹوتھ آلات نہیں ملے۔"</string>
     <string name="bluetooth_notif_ticker" msgid="8398481099943141819">"بلوٹوتھ جوڑا بنانے کی درخواست"</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">"بذریعہ بلوٹوتھ موصول شدہ فائلیں"</string>
     <string name="device_picker" msgid="8345264486071697705">"بلوٹوتھ آلہ منتخب کریں"</string>
@@ -449,9 +449,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>
@@ -577,7 +577,7 @@
     <string name="current_screen_lock" msgid="398328543694154510">"موجودہ اسکرین لاک"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="132337696546315927">"فنگر پرنٹ + پیٹرن"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="886426673328906002">"فنگر پرنٹ + PIN"</string>
-    <string name="fingerprint_unlock_set_unlock_password" msgid="3325527833422156515">"فنگر پرنٹ + پاسورڈ"</string>
+    <string name="fingerprint_unlock_set_unlock_password" msgid="3325527833422156515">"فنگر پرنٹ + پاس ورڈ"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="2063700014903801639">"فنگر پرنٹ کے بغیر جاری رکھیں"</string>
     <string name="fingerprint_unlock_title" msgid="8009992449332532869">"آپ اپنے فون کو اپنا فنگر پرنٹ استعمال کر کے غیر مقفل کر سکتے ہیں۔ سیکیورٹی کیلئے، اس اختیار کو ایک بیک اپ اسکرین قفل درکار ہے۔"</string>
     <string name="face_unlock_set_unlock_pattern" msgid="3748596996869406905">"چہرے سے تصدیق + پیٹرن"</string>
@@ -619,8 +619,8 @@
     <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="5118210431544156122">"پروفائل کے تحفظ کی خصوصیات آپ کے PIN کے بغیر کام نہیں کریں گی۔<xliff:g id="EMPTY_LINE">
 
 </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">
+    <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>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="4066001421137974082">"پروفائل کے تحفظ کی خصوصیات آپ کے اسکرین قفل کے بغیر کام نہیں کریں گی۔"</string>
@@ -729,7 +729,7 @@
     <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_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_enable_alphanumeric_pin" msgid="9138308197078115672">"PIN میں حروف یا علامات شامل ہیں"</string>
@@ -754,7 +754,7 @@
     <string name="bluetooth_pairing_dialog_title" msgid="7900515495932064945">"اس آلہ کے ساتھ جوڑا بنائیں؟"</string>
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7395493311980018460">"فون بُک کا اشتراک کریں؟"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="2103132762434487717">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> آپ کے رابطوں اور کال کی سرگزشت تک رسائی حاصل کرنا چاہتا ہے۔"</string>
-    <string name="bluetooth_pairing_dialog_paring_request" msgid="5513953935086446387">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>بلوٹوتھ کے ساتھ جوڑا بنانا چاہتا ہے۔ منسلک ہونے پر، اسے آپکے رابطوں و کال کی سرگزشت تک رسائی ہوگی۔"</string>
+    <string name="bluetooth_pairing_dialog_paring_request" msgid="5513953935086446387">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> بلوٹوتھ کے ساتھ جوڑا بنانا چاہتا ہے۔ منسلک ہونے پر، اسے آپکے رابطوں و کال کی سرگزشت تک رسائی ہوگی۔‫"</string>
     <string name="bluetooth_preference_found_media_devices" msgid="5748539613567836379">"دستیاب آلات"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="4190090666412408576">"کوئی آلات دستیاب نہیں ہیں"</string>
     <string name="bluetooth_device_context_connect" msgid="1812090541371432890">"مربوط کریں"</string>
@@ -875,7 +875,7 @@
     <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_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_access_points" msgid="1647976498906871869">"Wi‑Fi نیٹ ورکس"</string>
@@ -1309,8 +1309,8 @@
     <string name="pin_failed" msgid="4877356137480446727">"SIM کے PIN کا عمل ناکام ہوگیا!"</string>
     <string name="system_update_settings_list_item_title" msgid="1907497454722790033">"سسٹم اپ ڈیٹس"</string>
     <string name="system_update_settings_list_item_summary" msgid="3497456690691907873"></string>
-    <string name="firmware_version" msgid="547095584029938749">"Android ورژن"</string>
-    <string name="security_patch" msgid="483709031051932208">"Android سیکیورٹی پیچ کی سطح"</string>
+    <string name="firmware_version" msgid="547095584029938749">"‫Android ورژن"</string>
+    <string name="security_patch" msgid="483709031051932208">"‫Android سیکیورٹی پیچ کا لیول"</string>
     <string name="model_info" msgid="1729765474260797594">"ماڈل"</string>
     <string name="model_summary" msgid="8781425868254352168">"ماڈل: ‎%1$s‎‎"</string>
     <string name="hardware_info" msgid="174270144950621815">"ماڈل اور ہارڈ ویئر"</string>
@@ -1566,8 +1566,8 @@
     <string name="error_mnc_not23" msgid="6738398924368729180">"MNC فیلڈ میں لازمی طور پر 2 یا 3 ہندسے ہونے چاہئیں۔"</string>
     <string name="error_adding_apn_type" msgid="671634520340569678">"کیریئر APNs کی قسم ‎%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="menu_restore" msgid="3799288817317293115">"ڈیفالٹ پر ری سیٹ کریں"</string>
+    <string name="restore_default_apn_completed" msgid="5671734152740058937">"ڈیفالٹ APN ترتیبات کو ری سیٹ کرنے کا عمل مکمل ہو گیا۔"</string>
     <string name="reset_dashboard_title" msgid="7084966342252178530">"ری سیٹ کے اختیارات"</string>
     <string name="reset_dashboard_summary" msgid="8778383341461126642">"نیٹ ورک، ایپس، یا آلہ کو ری سیٹ کیا جا سکتا ہے"</string>
     <string name="reset_network_title" msgid="8944059136930806211">"Wi-Fi، موبائل اور بلوٹوتھ ری سیٹ کریں"</string>
@@ -1575,12 +1575,12 @@
     <string name="reset_esim_title" msgid="7630781767040831893">"ڈاؤن لوڈ کردہ SIMs کو مٹائیں"</string>
     <string name="reset_esim_desc" msgid="433226911566802">"متبادل SIMs کو ڈاؤن لوڈ کرنے کے لیے، اپنے کیریئر سے رابطہ کریں۔ اس سے موبائل سروس کا کوئی بھی پلان منسوخ نہیں ہوگا۔"</string>
     <string name="reset_network_button_text" msgid="4293271046867912819">"ترتیبات ری سیٹ کریں"</string>
-    <string name="reset_network_final_desc" msgid="2463817067048751373">"نیٹ ورک کی سبھی ترتیبات کو دوبارہ ترتیب دیں؟ آپ اس کارروائی کو کالعدم نہیں کر سکتے ہیں۔"</string>
+    <string name="reset_network_final_desc" msgid="2463817067048751373">"نیٹ ورک کی سبھی ترتیبات کو ری سیٹ کریں؟ آپ اس کارروائی کو کالعدم نہیں کر سکتے ہیں۔"</string>
     <string name="reset_network_final_desc_esim" msgid="4676436976372555750">"نیٹ ورک کی سبھی ترتیبات کو ری سیٹ کریں اور ڈاؤن لوڈ کردہ SIMs کو مٹائیں؟ آپ اس کارروائی کو کالعدم نہیں کر سکتے ہیں۔"</string>
     <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="network_reset_not_available" msgid="6146655531868016281">"اس صارف کیلئے نیٹ ورک کو ری سیٹ کرنا دستیاب نہیں ہے"</string>
+    <string name="reset_network_complete_toast" msgid="128225929536005495">"نیٹ ورک کی ترتیبات کو ری سیٹ کر دیا گیا ہے"</string>
     <string name="reset_esim_error_title" msgid="4728931209471875632">"SIMs کو نہیں مٹا سکتے"</string>
     <string name="reset_esim_error_msg" msgid="4716366079119742235">"کسی خرابی کی وجہ سے ڈاؤن لوڈ کردہ SIMs کو مٹایا نہیں جا سکتا ہے۔\n\nاپنا آلہ دوبارہ شروع کریں اور دوبارہ کوشش کریں۔"</string>
     <string name="master_clear_title" msgid="1560712943955904673">"تمام ڈیٹا حذف کریں (فیکٹری ری سیٹ)"</string>
@@ -1707,8 +1707,8 @@
     <string name="settings_safetylegal_activity_loading" msgid="7680998654145172">"لوڈ ہو رہا ہے…"</string>
     <string name="confirm_device_credential_use_alternate_method" msgid="1279869272895739941">"متبادل طریقہ استعمال کریں"</string>
     <string name="lockpassword_choose_your_screen_lock_header" msgid="6283518876031424798">"اسکرین لاک سیٹ کریں"</string>
-    <string name="lockpassword_choose_your_password_message" msgid="2838273977481046536">"سیکیورٹی کیلئے، پاسورڈ سیٹ کریں"</string>
-    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="4921343500484160894">"فنگر پرنٹ کے استعمال کے لیے پاسورڈ سیٹ کریں"</string>
+    <string name="lockpassword_choose_your_password_message" msgid="2838273977481046536">"سیکیورٹی کیلئے، پاس ورڈ سیٹ کریں"</string>
+    <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="4921343500484160894">"فنگر پرنٹ کے استعمال کے لیے پاس ورڈ سیٹ کریں"</string>
     <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="314870151462139417">"فنگر پرنٹ کے استعمال کے لیے پیٹرن سیٹ کریں"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="8942598950627277885">"سیکیورٹی کیلئے، PIN سیٹ کریں"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1102927520952116303">"فنگر پرنٹ کے استعمال کے لیے PIN سیٹ کریں"</string>
@@ -1728,10 +1728,10 @@
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="7238352632535405068">"چہرے سے تصدیق کے لیے PIN سیٹ کریں"</string>
     <string name="lockpassword_confirm_your_pattern_generic" msgid="6146545393074070916">"جاری رکھنے کیلئے اپنے آلہ کا پیٹرن استعمال کریں"</string>
     <string name="lockpassword_confirm_your_pin_generic" msgid="8732268389177735264">"جاری رکھنے کیلئے اپنے آلہ کا PIN درج کریں"</string>
-    <string name="lockpassword_confirm_your_password_generic" msgid="6304552647060899594">"جاری رکھنے کیلئے اپنے آلہ کا پاسورڈ درج کریں"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="6304552647060899594">"جاری رکھنے کیلئے اپنے آلہ کا پاس ورڈ درج کریں"</string>
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="3074250084050465513">"جاری رکھنے کیلئے اپنا دفتری پیٹرن استعمال کریں"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="6037908971086439523">"جاری رکھنے کیلئے اپنا دفتری PIN درج کریں"</string>
-    <string name="lockpassword_confirm_your_password_generic_profile" msgid="2646162490703489685">"جاری رکھنے کیلئے اپنا دفتری پاسورڈ درج کریں"</string>
+    <string name="lockpassword_confirm_your_password_generic_profile" msgid="2646162490703489685">"جاری رکھنے کیلئے اپنا دفتری پاس ورڈ درج کریں"</string>
     <string name="lockpassword_strong_auth_required_device_pattern" msgid="1014214190135045781">"اضافی سیکیورٹی کیلئے اپنے آلہ کا پیٹرن استعمال کریں"</string>
     <string name="lockpassword_strong_auth_required_device_pin" msgid="24030584350601016">"اضافی سیکیورٹی کیلئے اپنے آلہ کا PIN درج کریں"</string>
     <string name="lockpassword_strong_auth_required_device_password" msgid="7746588206458754598">"اضافی سیکیورٹی کیلئے، اپنے آلہ کا پاس ورڈ درج کریں"</string>
@@ -2245,7 +2245,7 @@
     <string name="screen_usage_summary" msgid="263396144684078341">"مکمل چارج کے بعد سے اسکرین آن ہونے کے وقت کی مقدار"</string>
     <string name="device_usage_list_summary" msgid="8299017481332816368">"مکمل چارج کے بعد سے آلہ کا استعمال"</string>
     <string name="battery_since_unplugged" msgid="6486555910264026856">"پلگ ہٹانے کے بعد سے بیٹری کا استعمال"</string>
-    <string name="battery_since_reset" msgid="4747587791838336661">"دوبارہ ترتیب دیے جانے کے بعد سے بیٹری کا استعمال"</string>
+    <string name="battery_since_reset" msgid="4747587791838336661">"ری سیٹ کیے جانے کے بعد سے بیٹری کا استعمال"</string>
     <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>
@@ -2563,7 +2563,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>
@@ -2673,7 +2673,7 @@
     <string name="account_settings_menu_auto_sync_personal" msgid="3235831897309033754">"ذاتی ڈیٹا آٹو سنک کریں"</string>
     <string name="account_settings_menu_auto_sync_work" msgid="5721442464286552815">"کام کا ڈیٹا آٹو سنک کریں"</string>
     <string name="data_usage_change_cycle" msgid="447761920472170031">"سائیکل تبدیل کریں…"</string>
-    <string name="data_usage_pick_cycle_day" msgid="6319750879145917066">"ڈیٹا کے استعمال کو دوبارہ ترتیب دینے کیلئے مہینے کا دن:"</string>
+    <string name="data_usage_pick_cycle_day" msgid="6319750879145917066">"ڈیٹا کے استعمال کو ری سیٹ کرنے کیلئے مہینے کا دن:"</string>
     <string name="data_usage_empty" msgid="7981405723435034032">"اس وقفہ میں کسی ایپ نے ڈیٹا استعمال نہيں کیا۔"</string>
     <string name="data_usage_label_foreground" msgid="2471091128648754601">"پیش منظر"</string>
     <string name="data_usage_label_background" msgid="1618794447370396845">"پس منظر"</string>
@@ -3027,8 +3027,10 @@
     <string name="sim_selection_required_pref" msgid="8738591348923992419">"انتخاب درکار ہے"</string>
     <string name="sim_selection_channel_title" msgid="5671915549529226023">"SIM کا انتخاب"</string>
     <string name="dashboard_title" msgid="3343056553551876215">"ترتیبات"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for settings_suggestion_header_summary_hidden_items (4475734332610696843) -->
+    <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="4475734332610696843">
+      <item quantity="other">%d مخفی آئٹمز دکھائیں</item>
+      <item quantity="one">%d مخفی آئٹم دکھائیں</item>
+    </plurals>
     <string name="network_dashboard_title" msgid="8288134139584687806">"نیٹ ورک اور انٹرنیٹ"</string>
     <string name="network_dashboard_summary_mobile" msgid="5560545061217580626">"موبائل"</string>
     <string name="network_dashboard_summary_data_usage" msgid="4695629715072542102">"ڈیٹا کا استعمال"</string>
@@ -3565,7 +3567,7 @@
     <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_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>
@@ -3996,7 +3998,7 @@
     <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_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>
@@ -4076,7 +4078,7 @@
     <string name="dark_ui_mode_title" msgid="8774932716427742413">"تھیم منتخب کریں"</string>
     <string name="dark_ui_settings_light_summary" msgid="5219102347744462812">"اس ترتیب کا اطلاق ایپس پر بھی ہوتا ہے"</string>
     <string name="dark_ui_settings_dark_summary" msgid="7042737828943784289">"تعاون یافتہ ایپس بھی گہری تھیم پر سوئچ ہو جائیں گی"</string>
-    <string name="quick_settings_developer_tiles" msgid="7423485925757678719">"فوری ترتیبات کے ڈیولپر ٹائلز"</string>
+    <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>
     <string name="managed_profile_settings_title" msgid="4340409321523532402">"دفتری پروفائل کی ترتیبات"</string>
@@ -4257,7 +4259,7 @@
     <string name="autofill_max_partitions" msgid="125269645910590057">"فی سیشن زیادہ سے زیادہ درخواستیں"</string>
     <string name="autofill_max_visible_datasets" msgid="2791081640248423492">"زیادہ سے زیادہ مرئی ڈیٹا سیٹس"</string>
     <string name="autofill_reset_developer_options" msgid="7208417230269613101">"ڈیفالٹ اقدار پر دوبارہ ری سیٹ کریں"</string>
-    <string name="autofill_reset_developer_options_complete" msgid="5686061993002179524">"آٹو فل ڈویلپر کے اختیارات کو دوبارہ ترتیب دے دیا گیا ہے"</string>
+    <string name="autofill_reset_developer_options_complete" msgid="5686061993002179524">"آٹو فل ڈویلپر کے اختیارات کو ری سیٹ کر دیا گیا ہے"</string>
     <string name="device_theme" msgid="8992291311481135893">"آلہ کا تھیم"</string>
     <string name="default_theme" msgid="5986996377385956138">"ڈیفالٹ"</string>
     <string name="show_operator_name_title" msgid="5056163028128447308">"نیٹ ورک کا نام"</string>
diff --git a/tests/CarDeveloperOptions/res/values-uz/arrays.xml b/tests/CarDeveloperOptions/res/values-uz/arrays.xml
index 8c3e21c..c58789b 100644
--- a/tests/CarDeveloperOptions/res/values-uz/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-uz/arrays.xml
@@ -70,7 +70,7 @@
     <item msgid="4157625910392775808">"Qidiruv…"</item>
     <item msgid="5597394826455877834">"Ulanmoqda…"</item>
     <item msgid="5848277343965362748">"Autentifikatsiya qilinmoqda…"</item>
-    <item msgid="3391238031431440676">"IP manzil o‘zlashtirilmoqda…"</item>
+    <item msgid="3391238031431440676">"IP manzil olinmoqda…"</item>
     <item msgid="5257597310494000224">"Ulandi"</item>
     <item msgid="8472497592913050396">"Muzlatildi"</item>
     <item msgid="1228072488815999109">"Uzilyapti…"</item>
@@ -420,7 +420,7 @@
   </string-array>
   <string-array name="security_settings_premium_sms_values">
     <item msgid="1164265643455394443">"So‘rash"</item>
-    <item msgid="7718817231348607934">"Hech qachon ruxsat berilmasin"</item>
+    <item msgid="7718817231348607934">"Ruxsat berilmasin"</item>
     <item msgid="8184570120217958741">"Har doim ruxsat berilsin"</item>
   </string-array>
   <string-array name="ram_states">
@@ -477,8 +477,8 @@
     <item msgid="1008268820118852416">"Bu – bepul tarmoq"</item>
   </string-array>
   <string-array name="wifi_privacy_entries">
-    <item msgid="6545683814310036454">"Ixtiyoriy MAC manzil (standart)"</item>
-    <item msgid="214234417308375326">"Ixtiyoriy MAC manzil"</item>
+    <item msgid="6545683814310036454">"Tasodifiy MAC manzil (standart)"</item>
+    <item msgid="214234417308375326">"Qurilmaning MAC manzili"</item>
   </string-array>
   <string-array name="wifi_hidden_entries">
     <item msgid="7426878022650940844">"Yo‘q"</item>
diff --git a/tests/CarDeveloperOptions/res/values-uz/strings.xml b/tests/CarDeveloperOptions/res/values-uz/strings.xml
index 8267243..6ea207a 100644
--- a/tests/CarDeveloperOptions/res/values-uz/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-uz/strings.xml
@@ -27,7 +27,7 @@
       <item quantity="one">Dasturchi sifatida ro‘yxatdan o‘tishni yakunlashga <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> qadam qoldi.</item>
     </plurals>
     <string name="show_dev_on" msgid="9075712234786224065">"Siz endi dasturchisiz!"</string>
-    <string name="show_dev_already" msgid="7665948832405148689">"Shart emas, siz allaqachon dasturchi rejimiga o‘tgansiz."</string>
+    <string name="show_dev_already" msgid="7665948832405148689">"Shart emas, siz allaqachon dasturchi rejimidasiz."</string>
     <string name="dev_settings_disabled_warning" msgid="3198732189395396721">"Avval dasturchi sozlamalarini yoqing."</string>
     <string name="header_category_wireless_networks" msgid="8968405993937795898">"Simsiz tarmoqlar"</string>
     <string name="header_category_system" msgid="4045988717359334410">"Tizim"</string>
@@ -368,7 +368,7 @@
     <string name="profile_info_settings_title" msgid="4855892878512562551">"Profil haqida axborot"</string>
     <string name="Accounts_settings_title" msgid="7901374987121953746">"Hisoblar"</string>
     <string name="location_settings_title" msgid="2707201457572301030">"Joylashuv"</string>
-    <string name="location_settings_master_switch_title" msgid="3108016866082816733">"Joylashuv axborotidan foydalanish"</string>
+    <string name="location_settings_master_switch_title" msgid="3108016866082816733">"Joylashuvni aniqlash"</string>
     <string name="location_settings_summary_location_off" msgid="5563530256978372978">"Yoqilmagan"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="7893342914540884818">
       <item quantity="other">Yoniq – <xliff:g id="COUNT_1">%1$d</xliff:g> ta ilovada joylashuv axborotiga ruxsat bor</item>
@@ -874,7 +874,7 @@
     <string name="wifi_switch_away_when_unvalidated" msgid="2418577764071293971">"Agar Wi-Fi da internet uzilib qolsa, mobil internetga ulansin."</string>
     <string name="wifi_cellular_data_fallback_title" msgid="5067241930716252665">"Mobil internetga avtomatik ulanish"</string>
     <string name="wifi_cellular_data_fallback_summary" msgid="2721467405851519769">"Wi-Fi orqali Internet aloqasi yo‘qligida mobil internetdan foydalanish. Sarflangan trafik uchun haq olinishi mumkin."</string>
-    <string name="wifi_add_network" msgid="4094957940791876640">"Tarmoq qo‘shish"</string>
+    <string name="wifi_add_network" msgid="4094957940791876640">"Tarmoq kiritish"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2678534679408777268">"Wi‑Fi sozlamalari"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="5714892572614655675">"Wi-Fi avtomatik tarzda qayta yoqiladi"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="286904094152909651">"Wi‑Fi avtomatik ulanmaydi"</string>
@@ -1860,7 +1860,7 @@
     <string name="no_applications" msgid="6811396016303576024">"Hech narsa topilmadi."</string>
     <string name="internal_storage" msgid="7392373600013294853">"Ichki xotira"</string>
     <string name="recompute_size" msgid="4290692197892743928">"Xajm qayta hisoblanmoqda…"</string>
-    <string name="clear_data_dlg_title" msgid="7388024498687029597">"Ilova maʼlumotlari oʻchirilsinmi?"</string>
+    <string name="clear_data_dlg_title" msgid="7388024498687029597">"Bu ilova maʼlumotlari oʻchirilsinmi?"</string>
     <string name="clear_data_dlg_text" msgid="6849657743695013414">"Ushbu ilovaning barcha ma’lumotlari, jumladan, fayllar, ma’lumotlar bazalari, sozlamalar, hisoblar va boshqa narsalar o‘chirib tashlanadi. Keyin ularni qayta tiklab bo‘lmaydi."</string>
     <string name="dlg_ok" msgid="4666570206507476557">"OK"</string>
     <string name="dlg_cancel" msgid="2434951039156262467">"Bekor qilish"</string>
@@ -1872,7 +1872,7 @@
     <string name="computing_size" msgid="2234106107535318136">"Hisoblanmoqda…"</string>
     <string name="invalid_size_value" msgid="1202239724000802296">"Paket o‘lchamini hisoblamadi"</string>
     <string name="version_text" msgid="5421619604445758652">"<xliff:g id="VERSION_NUM">%1$s</xliff:g> versiya"</string>
-    <string name="move_app" msgid="5400135231255614785">"Ko‘chirish"</string>
+    <string name="move_app" msgid="5400135231255614785">"Boshqa joyga olish"</string>
     <string name="move_app_to_internal" product="tablet" msgid="8658767231643024635">"Planshetga o‘tkazish"</string>
     <string name="move_app_to_internal" product="default" msgid="1031111519418252055">"Telefonga ko‘chirish"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="5555917755995563518">"USB xotiraga o‘tkazish"</string>
@@ -2241,15 +2241,9 @@
     <string name="background_activity_warning_dialog_text" msgid="8242749826732375096">"Bu ilovaning ishlashiga ta’sir ko‘rsatishi mumkin"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4234598000779459640">"Bu ilova batareya sarfini optimallashtirish uchun sozlanmagani sababli uni cheklash imkonsiz.\n\nIlovani cheklash uchun avval batareya sarfini optimallashtirish funksiyasini yoqing."</string>
     <string name="device_screen_usage" msgid="4470485475363132750">"Toʻliq quvvatlanganidan beri ekrandan foydalanish"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for power_usage_list_summary (4314438658308211057) -->
-    <skip />
-    <!-- String.format failed for translation -->
-    <!-- no translation found for screen_usage_summary (263396144684078341) -->
-    <skip />
-    <!-- String.format failed for translation -->
-    <!-- no translation found for device_usage_list_summary (8299017481332816368) -->
-    <skip />
+    <string name="power_usage_list_summary" msgid="4314438658308211057">"Toʻliq quvvatlanganidan beri quvvat sarfi"</string>
+    <string name="screen_usage_summary" msgid="263396144684078341">"Toʻliq quvvatlanganidan beri ekranning yoniq turgan vaqti"</string>
+    <string name="device_usage_list_summary" msgid="8299017481332816368">"Toʻliq quvvatlanganidan beri qurilmadan foydalanish vaqti"</string>
     <string name="battery_since_unplugged" msgid="6486555910264026856">"Quvvat manbaidan uzilganidan keyin sarflangan batareya quvvati"</string>
     <string name="battery_since_reset" msgid="4747587791838336661">"Statistika tozalandan keyingi batareya sarfi"</string>
     <string name="battery_stats_on_battery" msgid="2644055304085279716">"Batareyada qolgan vaqt: <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -2291,15 +2285,9 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="1019583260005768965">"Planshet odatdagidan ko‘proq ishlatildi"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="8304138287288309490">"Qurilma odatdagidan ko‘proq ishlatildi"</string>
     <string name="battery_tip_high_usage_summary" msgid="5514749872957528189">"Batareya quvvati odatdagiga nisbatan tezroq tugashi mumkin"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for battery_tip_dialog_message (8453700079047810964) -->
-    <skip />
-    <!-- String.format failed for translation -->
-    <!-- no translation found for battery_tip_dialog_message (6489981050645444068) -->
-    <skip />
-    <!-- String.format failed for translation -->
-    <!-- no translation found for battery_tip_dialog_message (6348123094674390337) -->
-    <skip />
+    <string name="battery_tip_dialog_message" product="default" msgid="8453700079047810964">"Telefoningiz odatdagidan koʻproq ishlatildi. Batareya quvvati kutilganidan tezroq tugashi mumkin.\n\nToʻliq quvvatlanganidan keyin eng koʻp ishlatilgan ilovalar:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="6489981050645444068">"Planshetingiz odatdagidan koʻproq ishlatildi. Batareya quvvati kutilganidan tezroq tugashi mumkin.\n\nToʻliq quvvatlanganidan keyin eng koʻp ishlatilgan ilovalar:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="6348123094674390337">"Qurilmangiz odatdagidan koʻproq ishlatildi. Batareya quvvati kutilganidan tezroq tugashi mumkin.\n\nToʻliq quvvatlanganidan keyin eng koʻp ishlatilgan ilovalar:"</string>
     <string name="battery_tip_dialog_message_footer" msgid="1118827395267487197">"Ichiga koʻproq quvvat talab qiluvchi fondagi harakatni oladi"</string>
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="7140926804142734420">
       <item quantity="other">%1$d ta ilovani cheklash</item>
@@ -2438,13 +2426,9 @@
     <string name="battery_screen_usage" msgid="8327893465518679384">"Ekrandan foydalanish: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="840331542883421888">"<xliff:g id="APP">%2$s</xliff:g> – <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="5874301442415987516">"<xliff:g id="PERCENT">%1$s</xliff:g> batareya quvvati"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for battery_detail_since_full_charge (3814176986148084378) -->
-    <skip />
+    <string name="battery_detail_since_full_charge" msgid="3814176986148084378">"Toʻliq quvvatlanganidan beri batareya sarfi"</string>
     <string name="battery_last_full_charge" msgid="5624033030647170717">"Oxirgi toʻliq quvvatlanish"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for battery_full_charge_last (4614554109170251301) -->
-    <skip />
+    <string name="battery_full_charge_last" msgid="4614554109170251301">"Toʻliq quvvat qancha vaqtga yetishi"</string>
     <string name="battery_footer_summary" msgid="4828444679643906943">"Batareyaning qolgan vaqti taxminiy va u foydalanish intensivligiga qarab farq qilishi mumkin"</string>
     <string name="battery_detail_foreground" msgid="6616408559186553085">"Faol rejimda"</string>
     <string name="battery_detail_background" msgid="7938146832943604280">"Fon rejimida"</string>
@@ -2530,7 +2514,7 @@
     <string name="tts_sliders_title" msgid="1927481069989092278">"Nutq tezligi va ohang"</string>
     <string name="tts_engine_section_title" msgid="7796486438271227076">"Nutq sintezatori"</string>
     <string name="tts_install_voice_title" msgid="3143328760690690254">"Ovozlar"</string>
-    <string name="tts_spoken_language" msgid="8057256621711361944">"So‘zlashuv tili"</string>
+    <string name="tts_spoken_language" msgid="8057256621711361944">"Nutq tili"</string>
     <string name="tts_install_voices_title" msgid="363811937643579286">"Ovozlarni o‘rnatish"</string>
     <string name="tts_install_voices_text" msgid="7464832428439739995">"Ovozlarni o‘rnatish uchun <xliff:g id="TTS_APP_NAME">%s</xliff:g> ilovasiga o‘ting"</string>
     <string name="tts_install_voices_open" msgid="686776451008134790">"Ilovani ochish"</string>
@@ -2543,7 +2527,7 @@
     <string name="credentials_install" product="default" msgid="8997183776710118353">"SD-kartadan o‘rnatish"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="3426661965567059596">"Sertifikatlarni xotira kartasidan o‘rnatish"</string>
     <string name="credentials_install_summary" product="default" msgid="4943897416156671633">"Sertifikatlarni SD-kartadan o‘rnatish"</string>
-    <string name="credentials_reset" msgid="355080737664731678">"Hisob axborotini tozalash"</string>
+    <string name="credentials_reset" msgid="355080737664731678">"Hisobga oid axborotni tozalash"</string>
     <string name="credentials_reset_summary" msgid="7622528359699428555">"Barcha sertifikatlarni o‘chirib tashlash"</string>
     <string name="trusted_credentials" msgid="6989242522455395200">"Ishonchli sertifikatlar"</string>
     <string name="trusted_credentials_summary" msgid="7411781319056251582">"Ishonchli CA sertifikatlarini chiqarish"</string>
@@ -2647,7 +2631,7 @@
     <string name="really_remove_account_title" msgid="4166512362915154319">"Hisob olib tashlansinmi?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Ushbu hisob bilan bog‘liq barcha xabarlar, kontaktlar va boshqa ma’lumotlar telefondan o‘chib ketadi."</string>
     <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Ushbu hisob bilan bog‘liq barcha xabarlar, kontaktlar va boshqa ma’lumotlar telefondan o‘chib ketadi."</string>
-    <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Ushbu hisob o‘chirilganda unga bog‘liq barcha xabar, kontakt va boshqa ma’lumotlar qurilmadan o‘chib ketadi."</string>
+    <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Bu hisobga tegishli barcha xabarlar, kontaktlar va boshqa maʼlumotlar ushbu qurilmadan oʻchirib tashlanadi!"</string>
     <string name="remove_account_failed" msgid="491458185327106966">"Bu o‘zgarishni amalga oshirish uchun administrator ruxsat bermagan"</string>
     <string name="cant_sync_dialog_title" msgid="5483419398223189881">"Qo‘lbola sinxronlanmadi"</string>
     <string name="cant_sync_dialog_message" msgid="3467126947262857534">"Ushbu narsani sinxronlash hozir o‘chirilgan. Bu sozlamani o‘zgartirish uchun vaqtincha fonda trafik yuklashni yoqib, keyin avtomatik sinx-lashga o‘ting."</string>
@@ -2914,8 +2898,8 @@
     <string name="user_delete_user_description" msgid="3627684990761268859">"Foydalanuvchini o‘chirib tashlash"</string>
     <string name="user_delete_button" msgid="6747802570634772774">"O‘chirib tashlash"</string>
     <string name="user_guest" msgid="6226240869459683235">"Mehmon"</string>
-    <string name="user_exit_guest_title" msgid="7279886200373071797">"Mehmon hisobini o‘chirish"</string>
-    <string name="user_exit_guest_confirm_title" msgid="4767911571671099844">"Mehmon hisobi o‘chirib tashlansinmi?"</string>
+    <string name="user_exit_guest_title" msgid="7279886200373071797">"Mehmonni olib tashlash"</string>
+    <string name="user_exit_guest_confirm_title" msgid="4767911571671099844">"Mehmon olib tashlansinmi?"</string>
     <string name="user_exit_guest_confirm_message" msgid="6955182181145748919">"Ushbu seansdagi barcha ilovalar va ma’lumotlar o‘chirib tashlanadi."</string>
     <string name="user_exit_guest_dialog_remove" msgid="1878866060881115716">"Olib tashlash"</string>
     <string name="user_enable_calling" msgid="864760054792249503">"Telefon chaqiruvlari"</string>
@@ -2951,7 +2935,7 @@
     <string name="restriction_menu_reset" msgid="3642252461410370554">"Cheklovlarni olib tashlash"</string>
     <string name="restriction_menu_change_pin" msgid="592512748243421101">"PIN kodni o‘zgartirish"</string>
     <string name="app_notifications_switch_label" msgid="670683308275498821">"Xabarnomalarni ko‘rsatish"</string>
-    <string name="help_label" msgid="1296484776243905646">"Yordam va fikr-mulohaza"</string>
+    <string name="help_label" msgid="1296484776243905646">"Yordam/fikr-mulohaza"</string>
     <string name="support_summary" msgid="3278943815956130740">"Yordam maqolalari, telefon va chat, ishni boshlash"</string>
     <string name="user_account_title" msgid="2108666882630552859">"Kontent uchun hisob"</string>
     <string name="user_picture_title" msgid="6664602422948159123">"Suratli hujjat"</string>
@@ -3354,7 +3338,7 @@
     <string name="notification_importance_unspecified" msgid="2515778981253707724">"Ovozga ruxsat berish"</string>
     <string name="notification_importance_blocked" msgid="446807935484629222">"Bildirishnomalar hech qachon ko‘rsatilmasin"</string>
     <string name="notification_importance_min" msgid="4622854784474818944">"Tovushsiz chiqarish va kichraytirish"</string>
-    <string name="notification_importance_low" msgid="7609797151662295364">"Tovushsiz"</string>
+    <string name="notification_importance_low" msgid="7609797151662295364">"Sokin"</string>
     <string name="notification_importance_default" msgid="4091563759103917166">"Tovush bilan"</string>
     <string name="notification_importance_high" msgid="7973764540402436656">"Tovush va qalqib chiquvchi oyna"</string>
     <string name="notification_importance_high_silent" msgid="3177662759865661155">"Ekranga qalqib chiqish"</string>
@@ -3363,7 +3347,7 @@
     <string name="notification_importance_default_title" msgid="7985549807203332482">"Yuqori"</string>
     <string name="notification_importance_high_title" msgid="7258373094258585858">"Ekranga qalqib chiqish"</string>
     <string name="notification_block_title" msgid="2570364198866886906">"Bloklash"</string>
-    <string name="notification_silence_title" msgid="6959637402003838093">"Tovushsiz"</string>
+    <string name="notification_silence_title" msgid="6959637402003838093">"Sokin"</string>
     <string name="notification_alert_title" msgid="750683027055192648">"Signal"</string>
     <string name="allow_interruption" msgid="3548841026410702850">"Bildirishnomalarga ruxsat berish"</string>
     <string name="allow_interruption_summary" msgid="5207637026831135377">"Ilovaga ovozli signal va tebranishni yoqishi hamda ekranga bildirishnomalarni chiqarishiga imkon beradi"</string>
@@ -3376,7 +3360,7 @@
     <string name="notifications_sent_daily" msgid="6874886521964822824">"Kuniga ~<xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="notifications_sent_weekly" msgid="5859675428990259432">"Haftasiga ~<xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="notifications_sent_never" msgid="237997329598144638">"Hech qachon"</string>
-    <string name="manage_notification_access_title" msgid="5348743662189787547">"Bildirishnomalarga kirish"</string>
+    <string name="manage_notification_access_title" msgid="5348743662189787547">"Bildirishnomalarga ruxsat"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8148871282484870576">"Ish profili bildirishnomalariga kirish taqiqlangan"</string>
     <string name="manage_notification_access_summary_zero" msgid="236809421271593016">"Ilovalar bildirishnomalarni ko‘ra olmaydi"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="8496218948429646792">
@@ -3411,8 +3395,8 @@
     <string name="zen_access_empty_text" msgid="7667538993781607731">"Hech qanday ilova “Bezovta qilinmasin” funksiyasiga ruxsat so‘ramagan"</string>
     <string name="loading_notification_apps" msgid="1978345231934072091">"Ilovalar yuklanmoqda…"</string>
     <string name="app_notifications_off_desc" msgid="3904090905748895146">"Android ushbu ilova bildirishnomalarini ekranga chiqarmaydi"</string>
-    <string name="channel_notifications_off_desc" msgid="8005444443218306611">"Talabingizga binoan, Android bu turkumdagi bildirishnomalarni bloklamoqda"</string>
-    <string name="channel_group_notifications_off_desc" msgid="7154205544298672850">"Talabingizga binoan, Android bunday bildirishnomalar guruhini bloklaydi"</string>
+    <string name="channel_notifications_off_desc" msgid="8005444443218306611">"Android bu turkumdagi bildirishnomalarni bloklamoqda"</string>
+    <string name="channel_group_notifications_off_desc" msgid="7154205544298672850">"Android bunday bildirishnomalar guruhini bloklaydi"</string>
     <string name="notification_channels" msgid="956764228116145956">"Turkumlar"</string>
     <string name="notification_channels_other" msgid="1615988645667411530">"Boshqa"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3744856747513344999">
@@ -3661,7 +3645,7 @@
     <string name="advanced_apps" msgid="6643869089344883537">"Kengaytirilgan sozlamalar"</string>
     <string name="configure_apps" msgid="4066683118857400943">"Ilovalarni sozlash"</string>
     <string name="unknown_app" msgid="2312052973570376877">"Noma’lum ilova"</string>
-    <string name="app_permissions" msgid="3215958256821756086">"Ruxsatlar menejeri"</string>
+    <string name="app_permissions" msgid="3215958256821756086">"Ruxsatlar boshqaruvi"</string>
     <string name="app_permissions_summary" msgid="8785798165776061594">"Ruxsatga ega ilovalar (<xliff:g id="APPS">%1$s</xliff:g>)"</string>
     <string name="tap_to_wake" msgid="1902991239401652323">"Teginib yoqish"</string>
     <string name="tap_to_wake_summary" msgid="8485222120721006793">"Qurilmani yoqish uchun ekranning istalgan joyiga ikki marta bosing"</string>
@@ -3729,9 +3713,7 @@
     <string name="high_power_desc" msgid="333756885680362741">"Batareya quvvati tejalmaydi. Batareya quvvati tez sarflanishi mumkin."</string>
     <string name="high_power_prompt_title" msgid="2805745781720454052">"Ilova doim fonda ishlashiga ruxsat berilsinmi?"</string>
     <string name="high_power_prompt_body" msgid="8067395096053552289">"<xliff:g id="APP_NAME">%1$s</xliff:g> ilovasiga doim fonda ishlashiga ruxsat berilsa, batareya quvvati tezroq sarflanadi. \n\nBuni keyinroq Sozlamalar &gt; Ilovalar va bildirishnomalar orqali o‘zgartirishingiz mumkin."</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for battery_summary (4345690800899981339) -->
-    <skip />
+    <string name="battery_summary" msgid="4345690800899981339">"Toʻliq quvvatlanganidan beri <xliff:g id="PERCENTAGE">%1$s</xliff:g> quvvat sarflandi"</string>
     <string name="battery_power_management" msgid="2853925857548647969">"Quvvat boshqaruvi"</string>
     <string name="no_battery_summary" msgid="4105932628367471314">"Toʻliq quvvatlanganidan beri quvvat sarflanmadi"</string>
     <string name="app_notification_preferences" msgid="5154466638524523201">"Ilova sozlamalari"</string>
@@ -3746,7 +3728,7 @@
     <string name="decline_remote_bugreport_action" msgid="706319275774199033">"Rad etish"</string>
     <string name="usb_use_charging_only" msgid="2344625733377110164">"Axborot uzatilmasin"</string>
     <string name="usb_use_charging_only_desc" msgid="3283518562582478950">"Faqat shu qurilmani quvvatlash"</string>
-    <string name="usb_use_power_only" msgid="6595783381323810697">"Ulangan qurilmani quvvatlang"</string>
+    <string name="usb_use_power_only" msgid="6595783381323810697">"Ulangan qurilmani quvvatlash"</string>
     <string name="usb_use_file_transfers" msgid="6153021302176151884">"Fayl uzatish"</string>
     <string name="usb_use_file_transfers_desc" msgid="6953866660041189580">"Boshqa qurilmaga fayl o‘tkazish"</string>
     <string name="usb_use_photo_transfers" msgid="5974236250197451257">"PTP"</string>
@@ -4526,7 +4508,7 @@
     <string name="wfc_disclaimer_agree_button_text" msgid="4706101805260434404">"DAVOM ETISH"</string>
     <string name="wfc_disclaimer_disagree_text" msgid="908289420390194127">"KERAK EMAS"</string>
     <string name="wfc_disclaimer_location_title_text" msgid="5696194250838686019">"Joylashuv"</string>
-    <string name="wfc_disclaimer_location_desc_text" msgid="3879710366995108723">"Xizmat taʼminotchingiz bu xizmatni taqdim etish uchun joylashuv axborotingizni toʻplashi mumkin.\n\nXizmat taʼminotchingiz maxfiylik siyosati bilan tanishib chiqing."</string>
+    <string name="wfc_disclaimer_location_desc_text" msgid="3879710366995108723">"Mobil operatoringiz bu xizmatni taqdim etish uchun joylashuvingiz haqidagi axborotni olishi mumkin.\n\nUning maxfiylik siyosati bilan tanishib chiqing."</string>
     <string name="forget_passpoint_dialog_message" msgid="3337626966248310367">"Qolgan vaqt yoki axborotga ruxsatni yoʻqotishingiz mumkin. Olib tashlashdan oldin provayderingiz bilan tekshiring."</string>
     <string name="keywords_content_capture" msgid="5401877823529928976">"kontentni yozib olish, smart bildirgilar"</string>
     <string name="content_capture" msgid="1709538093513983279">"Smart bildirgilar"</string>
diff --git a/tests/CarDeveloperOptions/res/values-vi/arrays.xml b/tests/CarDeveloperOptions/res/values-vi/arrays.xml
index e04d389..089117e 100644
--- a/tests/CarDeveloperOptions/res/values-vi/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-vi/arrays.xml
@@ -249,8 +249,8 @@
     <item msgid="5332718516635907742">"máy ảnh"</item>
     <item msgid="6098422447246167852">"ghi âm"</item>
     <item msgid="9182794235292595296">"phát âm thanh"</item>
-    <item msgid="8760743229597702019">"đọc khay nhớ tạm"</item>
-    <item msgid="2266923698240538544">"sửa đổi khay nhớ tạm"</item>
+    <item msgid="8760743229597702019">"đọc bảng nhớ tạm"</item>
+    <item msgid="2266923698240538544">"sửa đổi bảng nhớ tạm"</item>
     <item msgid="1801619438618539275">"các nút phương tiện truyền thông"</item>
     <item msgid="31588119965784465">"tập trung âm thanh"</item>
     <item msgid="7565226799008076833">"âm lượng chính"</item>
@@ -316,8 +316,8 @@
     <item msgid="78432174621628659">"Máy ảnh"</item>
     <item msgid="3986116419882154794">"Ghi âm"</item>
     <item msgid="4516840825756409490">"Phát âm thanh"</item>
-    <item msgid="6811712502798183957">"Đọc khay nhớ tạm"</item>
-    <item msgid="2780369012602289114">"Sửa đổi khay nhớ tạm"</item>
+    <item msgid="6811712502798183957">"Đọc bảng nhớ tạm"</item>
+    <item msgid="2780369012602289114">"Sửa đổi bảng nhớ tạm"</item>
     <item msgid="2331359440170850868">"Các nút phương tiện"</item>
     <item msgid="6133599737122751231">"Tập trung âm thanh"</item>
     <item msgid="6844485713404805301">"Âm lượng chính"</item>
diff --git a/tests/CarDeveloperOptions/res/values-vi/strings.xml b/tests/CarDeveloperOptions/res/values-vi/strings.xml
index 0529a14..b5a91d0 100644
--- a/tests/CarDeveloperOptions/res/values-vi/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-vi/strings.xml
@@ -162,7 +162,7 @@
     <string name="bluetooth_map_acceptance_dialog_text" msgid="736507842082640410">"%1$s muốn truy cập tin nhắn của bạn. Bạn có muốn cấp quyền truy cập cho %2$s không?"</string>
     <string name="bluetooth_sap_request" msgid="6318039677671263261">"Yêu cầu truy cập SIM"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="1909352413109340355">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> muốn truy cập vào thẻ SIM của bạn. Cấp quyền truy cập vào thẻ SIM sẽ vô hiệu hóa khả năng kết nối dữ liệu trên thiết bị của bạn trong suốt thời gian kết nối. Cấp quyền truy cập vào <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
-    <string name="bluetooth_device_name_summary" msgid="8661066392056595005">"Hiển thị là \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" với các thiết bị khác"</string>
+    <string name="bluetooth_device_name_summary" msgid="8661066392056595005">"Tên xuất hiện trên các thiết bị khác: <xliff:g id="DEVICE_NAME">^1</xliff:g>"</string>
     <string name="bluetooth_off_footer" msgid="7658444560543730571">"Bật Bluetooth để kết nối với các thiết bị khác."</string>
     <string name="bluetooth_paired_device_title" msgid="8361860197780425286">"Thiết bị của bạn"</string>
     <string name="bluetooth_pairing_page_title" msgid="9053463656712597709">"Ghép nối thiết bị mới"</string>
@@ -777,7 +777,7 @@
     <string name="bluetooth_unpair_dialog_body" product="device" msgid="6385091489719875730">"Thiết bị của bạn sẽ không được ghép nối với <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nữa"</string>
     <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="8485211340349958886">"Xóa thiết bị"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="2381509181266180406">"Kết nối với…"</string>
-    <string name="bluetooth_disconnect_a2dp_profile" msgid="8072503764470451567">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ bị ngắt kết nối khỏi âm thanh phương tiện."</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="8072503764470451567">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ bị ngắt kết nối khỏi âm thanh nội dung nghe nhìn"</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8384028101155317339">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ bị ngắt kết nối khỏi âm thanh thiết bị rảnh tay."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="6964226087090465662">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ bị ngắt kết nối khỏi thiết bị nhập."</string>
     <string name="bluetooth_disconnect_pan_user_profile" msgid="5523689915196343097">"Truy cập Internet qua <xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ bị ngắt kết nối."</string>
@@ -805,7 +805,7 @@
     <string name="wifi_display_status_connected" msgid="85692409327461403">"Đã kết nối"</string>
     <string name="wifi_display_status_in_use" msgid="7646114501132773174">"Đang được sử dụng"</string>
     <string name="wifi_display_status_not_available" msgid="5600448733204688205">"Không có sẵn"</string>
-    <string name="wifi_display_details" msgid="6379855523460749126">"Cài đặt hiển thị"</string>
+    <string name="wifi_display_details" msgid="6379855523460749126">"Cài đặt màn hình"</string>
     <string name="wifi_display_options_title" msgid="4587264519668872213">"Tùy chọn hiển thị không dây"</string>
     <string name="wifi_display_options_forget" msgid="7882982544626742073">"Xóa"</string>
     <string name="wifi_display_options_done" msgid="5922060890309265817">"Xong"</string>
@@ -1842,8 +1842,8 @@
     <string name="show_running_services" msgid="1895994322704667543">"Hiện dịch vụ đang chạy"</string>
     <string name="show_background_processes" msgid="88012264528093617">"Hiện quá trình lưu trong cache"</string>
     <string name="default_emergency_app" msgid="286530070173495823">"Ứng dụng khẩn cấp"</string>
-    <string name="reset_app_preferences" msgid="1426500030595212077">"Đặt lại tùy chọn ứng dụng"</string>
-    <string name="reset_app_preferences_title" msgid="792909865493673598">"Đặt lại tùy chọn ứng dụng?"</string>
+    <string name="reset_app_preferences" msgid="1426500030595212077">"Đặt lại các lựa chọn ưu tiên về ứng dụng"</string>
+    <string name="reset_app_preferences_title" msgid="792909865493673598">"Đặt lại các lựa chọn ưu tiên về ứng dụng?"</string>
     <string name="reset_app_preferences_desc" msgid="7935273005301096031">"Thao tác này sẽ đặt lại tất cả tùy chọn cho:\n\n "<li>"Ứng dụng bị tắt"</li>\n" "<li>"Thông báo ứng dụng bị tắt"</li>\n" "<li>"Ứng dụng mặc định cho các thao tác"</li>\n" "<li>"Các hạn chế về dữ liệu nền cho ứng dụng"</li>\n" "<li>"Mọi hạn chế về quyền truy cập"</li>\n\n" Bạn sẽ không mất bất kỳ dữ liệu ứng dụng nào."</string>
     <string name="reset_app_preferences_button" msgid="2041894727477934656">"Đặt lại ứng dụng"</string>
     <string name="manage_space_text" msgid="6166469422303124302">"Quản lý dung lượng"</string>
@@ -1884,7 +1884,7 @@
     <string name="system_package" msgid="1824541892695233351">"Không thể cài đặt bản cập nhật hệ thống trên phương tiện bên ngoài."</string>
     <string name="move_error_device_admin" msgid="6640501923867066901">"Không thể cài đặt ứng dụng quản trị thiết bị trên phương tiện ngoài"</string>
     <string name="force_stop_dlg_title" msgid="8822779487097246675">"Buộc dừng?"</string>
-    <string name="force_stop_dlg_text" msgid="7435245769456493398">"Nếu bạn buộc dừng một ứng dụng, ứng dụng đó có thể hoạt động sai."</string>
+    <string name="force_stop_dlg_text" msgid="7435245769456493398">"Nếu bạn buộc dừng một ứng dụng, ứng dụng đó có thể hoạt động không đúng cách."</string>
     <string name="app_install_location_title" msgid="5121617802063021720">"Vị trí cài đặt ưa thích"</string>
     <string name="app_install_location_summary" msgid="109719780117187797">"Thay đổi vị trí cài đặt ưa thích cho ứng dụng mới"</string>
     <string name="app_disable_dlg_positive" msgid="5508828271100168073">"Tắt ứng dụng"</string>
@@ -2233,12 +2233,12 @@
     <string name="power_usage_level_and_status" msgid="8873534076894160727">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="3461915627093471868">"<xliff:g id="REMAIN">%1$s</xliff:g> còn lại"</string>
     <string name="power_charge_remaining" msgid="2730510256218879651">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> để tính phí"</string>
-    <string name="background_activity_title" msgid="7207836362312111483">"Hạn chế trong nền"</string>
+    <string name="background_activity_title" msgid="7207836362312111483">"Hạn chế chạy trong nền"</string>
     <string name="background_activity_summary" msgid="582372194738538145">"Cho phép ứng dụng chạy trong nền"</string>
     <string name="background_activity_summary_disabled" msgid="457944930942085876">"Ứng dụng không được phép chạy trong nền"</string>
     <string name="background_activity_summary_whitelisted" msgid="4713321059375873828">"Không thể hạn chế sử dụng trong nền"</string>
     <string name="background_activity_warning_dialog_title" msgid="2170790412855899678">"Giới hạn hoạt động nền?"</string>
-    <string name="background_activity_warning_dialog_text" msgid="8242749826732375096">"Nếu bạn giới hạn hoạt động nền cho một ứng dụng, ứng dụng đó có thể hoạt động sai"</string>
+    <string name="background_activity_warning_dialog_text" msgid="8242749826732375096">"Nếu bạn giới hạn hoạt động nền cho một ứng dụng, ứng dụng đó có thể hoạt động không đúng cách"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4234598000779459640">"Không thể hạn chế ứng dụng này vì bạn chưa đặt để tối ưu hóa pin.\n\nĐể hạn chế ứng dụng, trước tiên hãy bật tối ưu hóa pin."</string>
     <string name="device_screen_usage" msgid="4470485475363132750">"Mức sử dụng màn hình kể từ lần sạc đầy"</string>
     <string name="power_usage_list_summary" msgid="4314438658308211057">"Mức sử dụng pin kể từ lần sạc đầy"</string>
@@ -2448,9 +2448,9 @@
     <string name="process_dex2oat_label" msgid="8249082119748556085">"Tối ưu hóa ứng dụng"</string>
     <string name="battery_saver" msgid="3989710213758938398">"Trình tiết kiệm pin"</string>
     <string name="battery_saver_auto_title" msgid="4158659069641849952">"Tự động bật"</string>
-    <string name="battery_saver_auto_no_schedule" msgid="739814529432092706">"Chưa có lịch biểu nào"</string>
+    <string name="battery_saver_auto_no_schedule" msgid="739814529432092706">"Không có lịch biểu"</string>
     <string name="battery_saver_auto_routine" msgid="886514412067906980">"Dựa trên thói quen của bạn"</string>
-    <string name="battery_saver_auto_percentage" msgid="5791982309331921556">"Dựa trên số phần trăm pin"</string>
+    <string name="battery_saver_auto_percentage" msgid="5791982309331921556">"Dựa trên mức phần trăm pin"</string>
     <string name="battery_saver_auto_routine_summary" msgid="9182044424547482889">"Nếu pin có khả năng hết trước lần sạc thông thường tiếp theo, hệ thống sẽ bật Trình tiết kiệm pin."</string>
     <string name="battery_saver_auto_percentage_summary" msgid="2036128588460338677">"Sẽ bật khi pin ở mức <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_saver_schedule_settings_title" msgid="574233428557678128">"Đặt lịch biểu"</string>
@@ -2522,7 +2522,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">"Bộ nhớ chứa thông tin xác thực"</string>
+    <string name="credentials_title" msgid="7119207354982673965">"Vùng lưu trữ 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>
@@ -2629,9 +2629,9 @@
     <string name="remove_account_label" msgid="5885425720323823387">"Xóa tài khoản"</string>
     <string name="header_add_an_account" msgid="8482614556580804956">"Thêm tài khoản"</string>
     <string name="really_remove_account_title" msgid="4166512362915154319">"Xóa tài khoản?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Xóa tài khoản này sẽ xóa tất cả thư, danh bạ và dữ liệu khác khỏi máy tính bảng!"</string>
-    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Xóa tài khoản này sẽ xóa tất cả thư, danh bạ và dữ liệu khác khỏi điện thoại!"</string>
-    <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Xóa tài khoản này sẽ xóa tất cả thư, danh bạ và dữ liệu khác khỏi thiết bị!"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Nếu bạn xóa tài khoản này, tất cả thư, danh bạ và dữ liệu khác có liên quan sẽ bị xóa khỏi máy tính bảng!"</string>
+    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Nếu bạn xóa tài khoản này, tất cả thư, danh bạ và dữ liệu khác có liên quan sẽ bị xóa khỏi điện thoại!"</string>
+    <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Nếu bạn xóa tài khoản này, tất cả thư, danh bạ và dữ liệu khác có liên quan sẽ bị xóa khỏi thiết bị!"</string>
     <string name="remove_account_failed" msgid="491458185327106966">"Quản trị viên của bạn không cho phép thực hiện thay đổi này"</string>
     <string name="cant_sync_dialog_title" msgid="5483419398223189881">"Không thể đồng bộ hóa theo cách thủ công"</string>
     <string name="cant_sync_dialog_message" msgid="3467126947262857534">"Đồng bộ hóa cho mục này hiện đã bị vô hiệu hóa. Để thay đổi cài đặt này, hãy tạm thời bật dữ liệu nền và đồng bộ hóa tự động."</string>
@@ -3156,7 +3156,7 @@
     <string name="vibrate_on_touch_summary" msgid="5504424764028676043">"Phản hồi xúc giác cho thao tác chạm, bàn phím và nhiều thao tác khác"</string>
     <string name="dock_audio_media_title" msgid="1859521680502040781">"Phát âm đế kết nối"</string>
     <string name="dock_audio_media_disabled" msgid="4300752306178486302">"Tất cả âm thanh"</string>
-    <string name="dock_audio_media_enabled" msgid="2873275045878628153">"Chỉ âm thanh phương tiện"</string>
+    <string name="dock_audio_media_enabled" msgid="2873275045878628153">"Chỉ âm thanh nội dung nghe nhìn"</string>
     <string name="emergency_tone_silent" msgid="804809075282717882">"Im lặng"</string>
     <string name="emergency_tone_alert" msgid="907868135091891015">"Âm"</string>
     <string name="emergency_tone_vibrate" msgid="5020068066905681181">"Rung"</string>
@@ -3173,9 +3173,9 @@
     <string name="zen_mode_behavior_settings_title" msgid="423125904296667490">"Ngoại lệ"</string>
     <string name="zen_mode_duration_settings_title" msgid="5522668871014735728">"Thời lượng mặc định"</string>
     <string name="zen_mode_behavior_allow_title" msgid="2440627647424280842">"Cho phép âm thanh và rung từ"</string>
-    <string name="zen_mode_behavior_no_sound" msgid="7290387625018248748">"Không có âm báo"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="7290387625018248748">"Không có âm thanh"</string>
     <string name="zen_mode_behavior_total_silence" msgid="371498357539257671">"Hoàn toàn tắt tiếng"</string>
-    <string name="zen_mode_behavior_no_sound_except" msgid="8894465423364103198">"Không có âm báo ngoại trừ <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
+    <string name="zen_mode_behavior_no_sound_except" msgid="8894465423364103198">"Không có âm thanh ngoại trừ <xliff:g id="CATEGORIES">%1$s</xliff:g>"</string>
     <string name="zen_mode_behavior_alarms_only" msgid="8406622989983047562">"Không phát âm thanh nào ngoại trừ báo thức và phương tiện"</string>
     <string name="zen_mode_automation_settings_title" msgid="3916960043054489008">"Lịch biểu"</string>
     <string name="zen_mode_delete_automatic_rules" msgid="2455264581527305755">"Xóa lịch biểu"</string>
@@ -3337,17 +3337,17 @@
     <string name="notification_importance_title" msgid="4131979083408000545">"Hành vi"</string>
     <string name="notification_importance_unspecified" msgid="2515778981253707724">"Cho phép âm thanh"</string>
     <string name="notification_importance_blocked" msgid="446807935484629222">"Không bao giờ hiển thị thông báo"</string>
-    <string name="notification_importance_min" msgid="4622854784474818944">"Hiển thị mà không phát âm báo và thu nhỏ"</string>
-    <string name="notification_importance_low" msgid="7609797151662295364">"Hiển thị mà không phát âm báo"</string>
-    <string name="notification_importance_default" msgid="4091563759103917166">"Phát âm báo"</string>
-    <string name="notification_importance_high" msgid="7973764540402436656">"Phát âm báo và hiển thị trên màn hình"</string>
+    <string name="notification_importance_min" msgid="4622854784474818944">"Hiển thị mà không phát âm thanh và thu nhỏ"</string>
+    <string name="notification_importance_low" msgid="7609797151662295364">"Hiển thị mà không phát âm thanh"</string>
+    <string name="notification_importance_default" msgid="4091563759103917166">"Phát âm thanh"</string>
+    <string name="notification_importance_high" msgid="7973764540402436656">"Phát âm thanh và hiển thị trên màn hình"</string>
     <string name="notification_importance_high_silent" msgid="3177662759865661155">"Hiển thị trên màn hình"</string>
     <string name="notification_importance_min_title" msgid="705872537330744154">"Thu nhỏ"</string>
     <string name="notification_importance_low_title" msgid="2956199021781786232">"Trung bình"</string>
     <string name="notification_importance_default_title" msgid="7985549807203332482">"Cao"</string>
-    <string name="notification_importance_high_title" msgid="7258373094258585858">"Hiển thị trên màn hình"</string>
+    <string name="notification_importance_high_title" msgid="7258373094258585858">"Hiện trên màn hình"</string>
     <string name="notification_block_title" msgid="2570364198866886906">"Chặn"</string>
-    <string name="notification_silence_title" msgid="6959637402003838093">"Hiển thị mà không phát âm báo"</string>
+    <string name="notification_silence_title" msgid="6959637402003838093">"Hiển thị mà không phát âm thanh"</string>
     <string name="notification_alert_title" msgid="750683027055192648">"Cảnh báo"</string>
     <string name="allow_interruption" msgid="3548841026410702850">"Cho phép gián đoạn"</string>
     <string name="allow_interruption_summary" msgid="5207637026831135377">"Cho phép ứng dụng phát ra âm thanh, rung và/hoặc hiển thị thông báo trên màn hình"</string>
@@ -3421,18 +3421,18 @@
     <string name="notification_content_block_title" msgid="2805138591864484587">"Hiển thị thông báo"</string>
     <string name="notification_content_block_summary" msgid="2743896875255591743">"Không bao giờ hiển thị thông báo trong ngăn thông báo hoặc trên thiết bị ngoại vi"</string>
     <string name="notification_badge_title" msgid="8989086619255666442">"Cho phép dấu chấm thông báo"</string>
-    <string name="notification_channel_badge_title" msgid="8228215248332054612">"Hiển thị dấu chấm thông báo"</string>
+    <string name="notification_channel_badge_title" msgid="8228215248332054612">"Hiện dấu chấm thông báo"</string>
     <string name="app_notification_override_dnd_title" msgid="1757042206738172601">"Vô hiệu hóa chế độ Không làm phiền"</string>
     <string name="app_notification_override_dnd_summary" msgid="3152957611171210980">"Cho phép những thông báo này tiếp tục làm gián đoạn khi chế độ Không làm phiền đang bật"</string>
     <string name="app_notification_visibility_override_title" msgid="2349335170165637672">"Trên màn hình khóa"</string>
     <string name="app_notification_row_banned" msgid="2079325338122151677">"Bị chặn"</string>
-    <string name="app_notification_row_priority" msgid="432299064888787236">"Mức độ ưu tiên"</string>
+    <string name="app_notification_row_priority" msgid="432299064888787236">"Ưu tiên"</string>
     <string name="app_notification_row_sensitive" msgid="4919671519227722958">"Nhạy cảm"</string>
     <string name="app_notifications_dialog_done" msgid="5395611029779655968">"Xong"</string>
     <string name="app_notification_importance_title" msgid="1902794400671001142">"Mức độ quan trọng"</string>
     <string name="notification_show_lights_title" msgid="5381920725933228542">"Nhấp nháy đèn"</string>
     <string name="notification_vibrate_title" msgid="8221718258793835282">"Rung"</string>
-    <string name="notification_channel_sound_title" msgid="7635366839003304745">"Âm báo"</string>
+    <string name="notification_channel_sound_title" msgid="7635366839003304745">"Âm thanh"</string>
     <string name="zen_mode_rule_delete_button" msgid="6763486487220471193">"Xóa"</string>
     <string name="zen_mode_rule_rename_button" msgid="1428130397306726792">"Đổi tên"</string>
     <string name="zen_mode_rule_name" msgid="8583652780885724670">"Tên lịch biểu"</string>
@@ -3589,7 +3589,7 @@
     <string name="imei_information_summary" msgid="716516316022275083">"Thông tin liên quan đến IMEI"</string>
     <string name="slot_number" msgid="785422579177068698">"(Khe cắm<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
     <string name="launch_by_default" msgid="6106985160202769725">"Mở theo mặc định"</string>
-    <string name="app_launch_domain_links_title" msgid="2987289657348349133">"Mở liên kết"</string>
+    <string name="app_launch_domain_links_title" msgid="2987289657348349133">"Mở đường liên kết"</string>
     <string name="app_launch_open_domain_urls_title" msgid="8595126859922391331">"Mở các liên kết được hỗ trợ"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="6803029846855502366">"Mở không cần hỏi"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="503976327533974142">"Các liên kết được hỗ trợ"</string>
@@ -3649,7 +3649,7 @@
     <string name="app_permissions_summary" msgid="8785798165776061594">"Ứng dụng sử dụng <xliff:g id="APPS">%1$s</xliff:g>"</string>
     <string name="tap_to_wake" msgid="1902991239401652323">"Nhấn để đánh thức"</string>
     <string name="tap_to_wake_summary" msgid="8485222120721006793">"Nhấn đúp vào vị trí bất kỳ trên màn hình để đánh thức thiết bị"</string>
-    <string name="domain_urls_title" msgid="7939209950373945367">"Mở liên kết"</string>
+    <string name="domain_urls_title" msgid="7939209950373945367">"Mở đường liên kết"</string>
     <string name="domain_urls_summary_none" msgid="5401203416941265109">"Không mở các liên kết được hỗ trợ"</string>
     <string name="domain_urls_summary_one" msgid="3893975485064803435">"Mở <xliff:g id="DOMAIN">%s</xliff:g>"</string>
     <string name="domain_urls_summary_some" msgid="2130534984153210797">"Mở <xliff:g id="DOMAIN">%s</xliff:g> và các URL khác"</string>
@@ -4335,7 +4335,7 @@
     <string name="pref_title_network_details" msgid="3971074015034595956">"Chi tiết mạng"</string>
     <string name="about_phone_device_name_warning" msgid="9088572775969880106">"Tên thiết bị của bạn sẽ hiển thị với các ứng dụng trên điện thoại. Những người khác cũng có thể thấy tên thiết bị này khi bạn kết nối với thiết bị Bluetooth hoặc thiết lập điểm phát sóng Wi-Fi."</string>
     <string name="devices_title" msgid="4768432575951993648">"Thiết bị"</string>
-    <string name="homepage_all_settings" msgid="3201220879559136116">"Tất cả tùy chọn cài đặt"</string>
+    <string name="homepage_all_settings" msgid="3201220879559136116">"Tất cả chế độ cài đặt"</string>
     <string name="homepage_personal_settings" msgid="7472638597249114564">"Đề xuất"</string>
     <string name="choose_network_title" msgid="3213314359630522396">"Chọn mạng"</string>
     <string name="network_disconnected" msgid="8677203031237141594">"Đã ngắt kết nối"</string>
@@ -4388,7 +4388,7 @@
     <string name="mobile_data_settings_summary" msgid="6492798151325636912">"Sử dụng dữ liệu qua mạng di động"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="3665863214578471494">"Điện thoại sẽ tự động chuyển sang nhà mạng này khi nằm trong vùng phủ sóng"</string>
     <string name="calls_preference" msgid="2076353032705811243">"Tùy chọn cuộc gọi"</string>
-    <string name="sms_preference" msgid="8449270011976880">"Tùy chọn SMS"</string>
+    <string name="sms_preference" msgid="8449270011976880">"Tùy chọn cho SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="2776167541223210738">"Luôn hỏi"</string>
     <string name="mobile_network_summary_add_a_network" msgid="5408745221357144009">"Thêm mạng"</string>
     <plurals name="mobile_network_summary_count" formatted="false" msgid="6222822873390636020">
@@ -4417,7 +4417,7 @@
     <string name="mobile_network_esim_swap_confirm_body" msgid="1192274915146275063">"Chỉ một SIM đã tải xuống có thể hoạt động mỗi lần.\n\nKhi chuyển sang <xliff:g id="CARRIER1">%1$s</xliff:g>, dịch vụ <xliff:g id="CARRIER2">%2$s</xliff:g> của bạn sẽ không bị hủy."</string>
     <string name="mobile_network_esim_swap_confirm_ok" msgid="4253442720111626242">"Chuyển sang <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="mobile_network_erase_sim" msgid="7813251003613841044">"Xóa SIM"</string>
-    <string name="mobile_network_erase_sim_dialog_title" msgid="3796268164204467499">"Bạn muốn xóa SIM đã tải xuống này?"</string>
+    <string name="mobile_network_erase_sim_dialog_title" msgid="3796268164204467499">"Bạn muốn xóa SIM đã tải xuống?"</string>
     <string name="mobile_network_erase_sim_dialog_body" msgid="1923189407958581450">"Khi bạn xóa SIM này, dịch vụ <xliff:g id="CARRIER_0">%1$s</xliff:g> sẽ bị xóa khỏi thiết bị này.\n\nDịch vụ của <xliff:g id="CARRIER_1">%2$s</xliff:g> sẽ không bị hủy."</string>
     <string name="mobile_network_erase_sim_dialog_ok" msgid="7133484721717815447">"Xóa"</string>
     <string name="mobile_network_erase_sim_dialog_progress" msgid="4881754030959536493">"Đang xóa SIM…"</string>
@@ -4447,7 +4447,7 @@
     <string name="manual_mode_disallowed_summary" msgid="799800630000340665">"Không sử dụng được khi kết nối với <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="emergency_info_contextual_card_summary" msgid="5541444321969803486">"Thông tin y tế, người liên hệ lúc khẩn cấp"</string>
     <string name="see_more" msgid="7463940160389802632">"Xem thêm"</string>
-    <string name="see_less" msgid="3718892257002813387">"Xem bớt"</string>
+    <string name="see_less" msgid="3718892257002813387">"Ẩn bớt"</string>
     <string name="network_connection_request_dialog_title" msgid="3150489262902506588">"Thiết bị sẽ sử dụng với <xliff:g id="APPNAME">%1$s</xliff:g>"</string>
     <string name="network_connection_timeout_dialog_message" msgid="7036704569274087733">"Không tìm thấy thiết bị nào. Đảm bảo rằng các thiết bị đang bật và sẵn sàng kết nối."</string>
     <string name="network_connection_timeout_dialog_ok" msgid="5156496438627748361">"Thử lại"</string>
@@ -4480,7 +4480,7 @@
     <string name="low_storage_summary" msgid="4562224870189133400">"Sắp hết bộ nhớ. Đã sử dụng <xliff:g id="PERCENTAGE">%1$s</xliff:g> - Còn trống <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
     <string name="contextual_card_feedback_send" msgid="8698649023854350623">"Gửi phản hồi"</string>
     <string name="contextual_card_feedback_confirm_message" msgid="3987973028353264878">"Bạn có muốn cung cấp phản hồi về nội dung đề xuất này cho chúng tôi không?"</string>
-    <string name="copyable_slice_toast" msgid="1357518174923789947">"Đã sao chép <xliff:g id="COPY_CONTENT">%1$s</xliff:g>vào khay nhớ tạm."</string>
+    <string name="copyable_slice_toast" msgid="1357518174923789947">"Đã sao chép <xliff:g id="COPY_CONTENT">%1$s</xliff:g>vào bảng nhớ tạm."</string>
     <string name="search_bar_account_avatar_content_description" msgid="947628881535053409"></string>
     <string name="permission_bar_chart_empty_text" msgid="5893326513700540130">"0 ứng dụng đã sử dụng quyền"</string>
     <string name="permission_bar_chart_title" msgid="874145405516650073">"Mức sử dụng quyền truy cập trong 24 giờ qua"</string>
diff --git a/tests/CarDeveloperOptions/res/values-zh-rCN/strings.xml b/tests/CarDeveloperOptions/res/values-zh-rCN/strings.xml
index cf03f82..f30b389 100644
--- a/tests/CarDeveloperOptions/res/values-zh-rCN/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-zh-rCN/strings.xml
@@ -2621,7 +2621,7 @@
     <string name="sync_gmail" msgid="4457967084840001296">"Gmail"</string>
     <string name="sync_calendar" msgid="6573708019827519372">"日历"</string>
     <string name="sync_contacts" msgid="5687434785723746534">"联系人"</string>
-    <string name="sync_plug" msgid="6703804441408427257"><font fgcolor="#ffffffff">"欢迎使用 Google Sync！"</font>" \n这款数据同步工具可让您随时随地查看您的联系人、约会以及更多信息。"</string>
+    <string name="sync_plug" msgid="6703804441408427257"><font fgcolor="#ffffffff">"欢迎使用 Google 同步！"</font>" \n这款数据同步工具可让您随时随地查看您的联系人、约会以及更多信息。"</string>
     <string name="header_application_sync_settings" msgid="4581847153669774489">"应用同步设置"</string>
     <string name="header_data_and_synchronization" msgid="400831816068697286">"数据与同步"</string>
     <string name="preference_change_password_title" msgid="7243527448378789274">"更改密码"</string>
@@ -3432,7 +3432,7 @@
     <string name="app_notification_importance_title" msgid="1902794400671001142">"重要程度"</string>
     <string name="notification_show_lights_title" msgid="5381920725933228542">"闪烁指示灯"</string>
     <string name="notification_vibrate_title" msgid="8221718258793835282">"振动"</string>
-    <string name="notification_channel_sound_title" msgid="7635366839003304745">"提示音"</string>
+    <string name="notification_channel_sound_title" msgid="7635366839003304745">"声音"</string>
     <string name="zen_mode_rule_delete_button" msgid="6763486487220471193">"删除"</string>
     <string name="zen_mode_rule_rename_button" msgid="1428130397306726792">"重命名"</string>
     <string name="zen_mode_rule_name" msgid="8583652780885724670">"时间表名称"</string>
@@ -4036,7 +4036,7 @@
     <string name="notification_log_details_parcel" msgid="4024970850647594029">"parcel 大小"</string>
     <string name="notification_log_details_ashmem" msgid="4272241723105041393">"ashmem"</string>
     <string name="notification_log_details_alerted" msgid="1891749888625061319">"已发出通知提醒"</string>
-    <string name="notification_log_details_sound" msgid="4028782443557466322">"提示音"</string>
+    <string name="notification_log_details_sound" msgid="4028782443557466322">"声音"</string>
     <string name="notification_log_details_vibrate" msgid="8372400602058888072">"振动"</string>
     <string name="notification_log_details_vibrate_pattern" msgid="7015554755444260922">"图案"</string>
     <string name="notification_log_details_default" msgid="455451833359888182">"默认"</string>
diff --git a/tests/CarDeveloperOptions/res/values-zh-rHK/strings.xml b/tests/CarDeveloperOptions/res/values-zh-rHK/strings.xml
index 91a5f32..d0c0d6a 100644
--- a/tests/CarDeveloperOptions/res/values-zh-rHK/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-zh-rHK/strings.xml
@@ -1574,7 +1574,7 @@
     <string name="reset_network_title" msgid="8944059136930806211">"重設 Wi-Fi、流動數據和藍牙"</string>
     <string name="reset_network_desc" msgid="4982633363916261109">"此操作會重設所有網絡設定，包括：\n\n"<li>"Wi‑Fi"</li>\n<li>"流動數據"</li>\n<li>"藍牙"</li></string>
     <string name="reset_esim_title" msgid="7630781767040831893">"清除已下載的 SIM 卡"</string>
-    <string name="reset_esim_desc" msgid="433226911566802">"如要下載 SIM 替換卡，請聯絡流動網絡供應商。此動作不會取消任何流動服務計劃。"</string>
+    <string name="reset_esim_desc" msgid="433226911566802">"如要下載替換用的 SIM 卡，請聯絡流動網絡供應商。此操作不會取消任何流動服務計劃。"</string>
     <string name="reset_network_button_text" msgid="4293271046867912819">"重設設定"</string>
     <string name="reset_network_final_desc" msgid="2463817067048751373">"您要重設所有網絡設定嗎？您將無法復原這項動作。"</string>
     <string name="reset_network_final_desc_esim" msgid="4676436976372555750">"您要重設所有網絡設定並清除已下載的 SIM 卡嗎？您無法復原這個動作。"</string>
@@ -2449,7 +2449,7 @@
     <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_no_schedule" msgid="739814529432092706">"不設定時間"</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>
     <string name="battery_saver_auto_routine_summary" msgid="9182044424547482889">"如果電量很可能在下次慣常充電時間之前耗盡，「省電模式」就會自動開啟"</string>
@@ -4419,7 +4419,7 @@
     <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>
diff --git a/tests/CarDeveloperOptions/res/values-zh-rTW/strings.xml b/tests/CarDeveloperOptions/res/values-zh-rTW/strings.xml
index 1ea9dfb..771677b 100644
--- a/tests/CarDeveloperOptions/res/values-zh-rTW/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-zh-rTW/strings.xml
@@ -2046,7 +2046,7 @@
     <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="feature_flags_dashboard_title" msgid="3153034144122754381">"功能標記"</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>
     <string name="select_to_speak_summary" msgid="7514180457557735421">"輕觸畫面上的項目即可聽取項目內容"</string>
@@ -3283,7 +3283,7 @@
     <string name="sound_work_settings" msgid="4140215240360927923">"工作資料夾音效"</string>
     <string name="work_use_personal_sounds_title" msgid="531727195073003599">"使用個人設定檔音效"</string>
     <string name="work_use_personal_sounds_summary" msgid="2886871383995187441">"工作資料夾和個人設定檔使用相同的音效"</string>
-    <string name="work_ringtone_title" msgid="5499360583947410224">"Work 手機鈴聲"</string>
+    <string name="work_ringtone_title" msgid="5499360583947410224">"工作手機鈴聲"</string>
     <string name="work_notification_ringtone_title" msgid="8059159087214025757">"預設 Work 通知音效"</string>
     <string name="work_alarm_ringtone_title" msgid="5328487181385375130">"預設 Work 鬧鐘音效"</string>
     <string name="work_sound_same_as_personal" msgid="7728560881697159758">"與個人設定檔相同"</string>
diff --git a/tests/CarDeveloperOptions/res/values-zu/strings.xml b/tests/CarDeveloperOptions/res/values-zu/strings.xml
index febfd3c..8155d16 100644
--- a/tests/CarDeveloperOptions/res/values-zu/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-zu/strings.xml
@@ -113,7 +113,7 @@
     <string name="bluetooth_disconnect_all_profiles" product="device" msgid="4707569949253450208">"Idivayisi yakho izonqamuka kusuka ku-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_disconnect_dialog_ok" msgid="4183522987246110145">"Nqamula"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="3616298363281495777">"Awunayo imvume yokushintsha izilungiselelo ze-Bluetooth."</string>
-    <string name="bluetooth_pairing_pref_title" msgid="2904954138013884029">"Bhanqa idivayisi entsha"</string>
+    <string name="bluetooth_pairing_pref_title" msgid="2904954138013884029">"Bhangqa idivayisi entsha"</string>
     <string name="bluetooth_is_visible_message" msgid="6341088682252805612">"I-<xliff:g id="DEVICE_NAME">%1$s</xliff:g> iyabonakala kumadivayisi aseduzane ngenkathi izilungiselelo ze-Bluetooth zivulekile."</string>
     <string name="bluetooth_footer_mac_message" product="default" msgid="335341476746836260">"Ikheli le-Bluetooth lefoni: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_footer_mac_message" product="tablet" msgid="6033609611245782463">"Ikhli le-Bluetooth lethebhulethi: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
@@ -165,7 +165,7 @@
     <string name="bluetooth_device_name_summary" msgid="8661066392056595005">"Kubonakala njenge-\"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" kwamanye amadivayisi"</string>
     <string name="bluetooth_off_footer" msgid="7658444560543730571">"Vula i-Bluetooth ukuze ixhumeke kwamanye amadivayisi."</string>
     <string name="bluetooth_paired_device_title" msgid="8361860197780425286">"Amadivayisi akho"</string>
-    <string name="bluetooth_pairing_page_title" msgid="9053463656712597709">"Bhanqa idivayisi entsha"</string>
+    <string name="bluetooth_pairing_page_title" msgid="9053463656712597709">"Bhangqa idivayisi entsha"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3601662966604648212">"Vumela ithebhulethi yakho ukuxhumana namadivayisi e-Bluetooth aseduze"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2286727776570956969">"Vumela idivayisi yakho ukuxhumana namadivayisi aseduze e-Bluetooth"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="863659221858781186">"Vumela ifoni yakho ukuxhumana namadivayisi aseduze e-Bluetooth"</string>
@@ -729,7 +729,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">"Lawula uxhumano, setha igama ledivaysi nokutholakala"</string>
-    <string name="bluetooth_pairing_request" msgid="7221745525632573125">"Bhanqa ne-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
+    <string name="bluetooth_pairing_request" msgid="7221745525632573125">"Bhangqa ne-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_pairing_key_msg" msgid="1139230917419961975">"Ikhodi yokumatanisa ye-Bluetooth"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="6205151011298670207">"Thayipha ikhodi yokumatanisa bese ucindezela ku-Buyela noma ku-Enter"</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="9138308197078115672">"Iphinikhodi iqukethe amaletha namasimbui"</string>
@@ -751,7 +751,7 @@
     <string name="bluetooth_preference_paired_dialog_internet_option" msgid="3693599743477470469">"Uxhumo lwe-inthanethi"</string>
     <string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="4627309436489645755">"Ikhibhodi"</string>
     <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="5290994459307558039">"Oxhumana nabo nomlando wekholi"</string>
-    <string name="bluetooth_pairing_dialog_title" msgid="7900515495932064945">"Bhanqa nale divayisi"</string>
+    <string name="bluetooth_pairing_dialog_title" msgid="7900515495932064945">"Bhangqa nale divayisi"</string>
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7395493311980018460">"Yabelana ngebhuku lefoni?"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="2103132762434487717">"I-<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ifuna ukuifnyelela oxhumana nabo nomlando wekholi."</string>
     <string name="bluetooth_pairing_dialog_paring_request" msgid="5513953935086446387">"I-<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ifuna ukubhanqa ne-Bluetooth. Uma ixhumekile, izokwazi ukufinyelela oxhumana nabo nomlando wekholi."</string>
@@ -3423,7 +3423,7 @@
     <string name="notification_content_block_summary" msgid="2743896875255591743">"Ungalokothi ubonise izaziso kumthunzi noma kumadivayisi alawulwa ikhompuyutha"</string>
     <string name="notification_badge_title" msgid="8989086619255666442">"Vumela ichashazi lesaziso"</string>
     <string name="notification_channel_badge_title" msgid="8228215248332054612">"Bonisa ichashazi lesaziso"</string>
-    <string name="app_notification_override_dnd_title" msgid="1757042206738172601">"Bhala ngaphezulu okuthi ungaphazamisi"</string>
+    <string name="app_notification_override_dnd_title" msgid="1757042206738172601">"Susa Ukungaphazamisi"</string>
     <string name="app_notification_override_dnd_summary" msgid="3152957611171210980">"Vumela lezi zaziso ziqhubeke ziphazamise uma Ukungaphazamisi kuvuliwe"</string>
     <string name="app_notification_visibility_override_title" msgid="2349335170165637672">"Kusikrini sokukhiya"</string>
     <string name="app_notification_row_banned" msgid="2079325338122151677">"Ivinjelwe"</string>
diff --git a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/development/AppsNotRespondingPreferenceController.java b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/development/AppsNotRespondingPreferenceController.java
index f504d1b..86d89f4 100644
--- a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/development/AppsNotRespondingPreferenceController.java
+++ b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/development/AppsNotRespondingPreferenceController.java
@@ -16,6 +16,7 @@
 package com.android.car.developeroptions.development;
 
 import android.content.Context;
+import android.os.UserHandle;
 import android.provider.Settings;
 
 import androidx.annotation.VisibleForTesting;
@@ -47,24 +48,31 @@
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean isEnabled = (Boolean) newValue;
-        Settings.Secure.putInt(mContext.getContentResolver(),
+        // Set for system user since Android framework will read it as that user.
+        // Note that this will enable/disable this option for all users.
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
                 Settings.Secure.ANR_SHOW_BACKGROUND,
-                isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+                isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF,
+                UserHandle.SYSTEM.getIdentifier());
         return true;
     }
 
     @Override
     public void updateState(Preference preference) {
-        final int mode = Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.ANR_SHOW_BACKGROUND, SETTING_VALUE_OFF);
+        final int mode = Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                Settings.Secure.ANR_SHOW_BACKGROUND,
+                SETTING_VALUE_OFF, UserHandle.SYSTEM.getIdentifier());
         ((SwitchPreference) mPreference).setChecked(mode != SETTING_VALUE_OFF);
     }
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
         super.onDeveloperOptionsSwitchDisabled();
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.ANR_SHOW_BACKGROUND, SETTING_VALUE_OFF);
+        // Set for system user since Android framework will read it as that user.
+        // Note that this will enable/disable this option for all users.
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                Settings.Secure.ANR_SHOW_BACKGROUND,
+                SETTING_VALUE_OFF, UserHandle.SYSTEM.getIdentifier());
         ((SwitchPreference) mPreference).setChecked(false);
     }
 }
diff --git a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/development/MockLocationAppPreferenceController.java b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/development/MockLocationAppPreferenceController.java
index 8908ee8..48d9f47 100644
--- a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/development/MockLocationAppPreferenceController.java
+++ b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/development/MockLocationAppPreferenceController.java
@@ -86,6 +86,12 @@
         return true;
     }
 
+    @Override
+    public void onDeveloperOptionsDisabled() {
+        super.onDeveloperOptionsDisabled();
+        removeAllMockLocations();
+    }
+
     private void updateMockLocation() {
         final String mockLocationApp = getCurrentMockLocationApp();
 
diff --git a/tests/CarSecurityPermissionTest/Android.bp b/tests/CarSecurityPermissionTest/Android.bp
index 066ecc8..7be1d0b 100644
--- a/tests/CarSecurityPermissionTest/Android.bp
+++ b/tests/CarSecurityPermissionTest/Android.bp
@@ -21,6 +21,7 @@
 
     libs: [
         "android.car",
+        "android.hardware.automotive.vehicle-V2.0-java",
         "android.test.runner",
         "android.test.base",
         "android.test.mock",
diff --git a/tests/DiagnosticTools/res/values-ta/strings.xml b/tests/DiagnosticTools/res/values-ta/strings.xml
index 09e74cc..abb9412 100644
--- a/tests/DiagnosticTools/res/values-ta/strings.xml
+++ b/tests/DiagnosticTools/res/values-ta/strings.xml
@@ -17,5 +17,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_freeze_frame_info" msgid="1425573367248263107">"ஃப்ரீஸ் ஃப்ரேம் தகவலைக் காட்டு"</string>
+    <string name="display_freeze_frame_info" msgid="1425573367248263107">"ஃப்ரீஸ் ஃபிரேம் தகவலைக் காட்டு"</string>
 </resources>
diff --git a/tests/EmbeddedKitchenSinkApp/AndroidManifest.xml b/tests/EmbeddedKitchenSinkApp/AndroidManifest.xml
index ec480c4..b5fc2f4 100644
--- a/tests/EmbeddedKitchenSinkApp/AndroidManifest.xml
+++ b/tests/EmbeddedKitchenSinkApp/AndroidManifest.xml
@@ -94,6 +94,7 @@
     <!-- use for CarServiceTest -->
     <uses-permission android:name="android.permission.MONITOR_INPUT"/>
     <uses-permission android:name="android.permission.SET_ACTIVITY_WATCHER"/>
+    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
     <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
     <!-- use for vendor properties -->
@@ -104,6 +105,9 @@
 
     <uses-permission android:name="android.car.permission.CONTROL_CAR_FEATURES"/>
 
+    <!-- use for rotary fragment to enable/disable packages related to rotary -->
+    <uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
+
     <application android:label="@string/app_title"
         android:icon="@drawable/ic_launcher">
         <uses-library android:name="android.test.runner"/>
@@ -184,6 +188,36 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".activityresolver.TestActivity1"
+            android:exported="true"
+            android:label="Test Activity 1">
+            <intent-filter>
+                <action android:name="com.google.android.car.kitchensink.activityresolver.TRIGGER_ACTIVITY_RESOLVER" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".activityresolver.TestActivity2"
+            android:exported="true"
+            android:label="Test Activity 2">
+            <intent-filter>
+                <action android:name="com.google.android.car.kitchensink.activityresolver.TRIGGER_ACTIVITY_RESOLVER" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".activityresolver.TestActivity3"
+            android:exported="true"
+            android:label="Test Activity 3">
+            <intent-filter>
+                <action android:name="com.google.android.car.kitchensink.activityresolver.TRIGGER_ACTIVITY_RESOLVER" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
     </application>
 </manifest>
 
diff --git a/tests/EmbeddedKitchenSinkApp/res/layout/activity_resolver_fragment.xml b/tests/EmbeddedKitchenSinkApp/res/layout/activity_resolver_fragment.xml
new file mode 100644
index 0000000..0c8a4d8
--- /dev/null
+++ b/tests/EmbeddedKitchenSinkApp/res/layout/activity_resolver_fragment.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent">
+
+    <Button
+        android:id="@+id/trigger_activity_resolver"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="Trigger Activity Resolver"/>
+
+</FrameLayout>
diff --git a/tests/EmbeddedKitchenSinkApp/res/layout/kitchen_activity.xml b/tests/EmbeddedKitchenSinkApp/res/layout/kitchen_activity.xml
index e6de221..56f3dc8 100644
--- a/tests/EmbeddedKitchenSinkApp/res/layout/kitchen_activity.xml
+++ b/tests/EmbeddedKitchenSinkApp/res/layout/kitchen_activity.xml
@@ -20,6 +20,15 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <!-- When not in touch mode, if we clear focus in current window, Android will re-focus the
+         first focusable view in the window automatically. Adding a FocusParkingView to the window
+         can fix this issue, because it can take focus, and it is transparent and its default focus
+         highlight is disabled, so it's invisible to the user no matter whether it's focused or not.
+         -->
+    <com.android.car.ui.FocusParkingView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
     <Button
         android:id="@+id/menu_button"
         android:layout_width="wrap_content"
diff --git a/tests/EmbeddedKitchenSinkApp/res/layout/rotary_fragment.xml b/tests/EmbeddedKitchenSinkApp/res/layout/rotary_fragment.xml
new file mode 100644
index 0000000..e1f739a
--- /dev/null
+++ b/tests/EmbeddedKitchenSinkApp/res/layout/rotary_fragment.xml
@@ -0,0 +1,129 @@
+<?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.
+  -->
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/content"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:fadeScrollbars="false">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/unavailable_message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="CarRotaryService does not exist in this build"
+            android:textSize="30sp"
+            android:textColor="@*android:color/red"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="30sp"
+            android:text="Overall Controls"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <Button
+                android:id="@+id/enable_all_rotary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:text="Enable All"
+                android:textSize="30sp"/>
+
+            <Button
+                android:id="@+id/disable_all_rotary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:text="Disable All"
+                android:textSize="30sp"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_margin="10dp">
+
+            <TextView
+                android:layout_width="500dp"
+                android:layout_height="wrap_content"
+                android:textSize="30sp"
+                android:text="CarRotaryService state"/>
+
+            <Switch
+                android:id="@+id/rotary_service_toggle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="30sp"
+                android:layout_gravity="center"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_margin="10dp">
+
+            <TextView
+                android:layout_width="500dp"
+                android:layout_height="wrap_content"
+                android:textSize="30sp"
+                android:text="RotaryIME state"/>
+
+            <Switch
+                android:id="@+id/rotary_ime_toggle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="30sp"
+                android:layout_gravity="center"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_margin="10dp">
+
+            <TextView
+                android:layout_width="500dp"
+                android:layout_height="wrap_content"
+                android:textSize="30sp"
+                android:text="RotaryPlayground state"/>
+
+            <Switch
+                android:id="@+id/rotary_playground_toggle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="30sp"
+                android:layout_gravity="center"/>
+
+        </LinearLayout>
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/tests/EmbeddedKitchenSinkApp/res/layout/test_activity.xml b/tests/EmbeddedKitchenSinkApp/res/layout/test_activity.xml
new file mode 100644
index 0000000..05e30a3
--- /dev/null
+++ b/tests/EmbeddedKitchenSinkApp/res/layout/test_activity.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent">
+
+    <Button
+        android:id="@+id/dismiss_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="Exit Activity"/>
+
+</FrameLayout>
diff --git a/tests/EmbeddedKitchenSinkApp/res/layout/window_insets_fragment.xml b/tests/EmbeddedKitchenSinkApp/res/layout/window_insets_fragment.xml
new file mode 100644
index 0000000..5533668
--- /dev/null
+++ b/tests/EmbeddedKitchenSinkApp/res/layout/window_insets_fragment.xml
@@ -0,0 +1,150 @@
+<?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.
+  -->
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/content"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:fadeScrollbars="false">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Control Status Bar Insets"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <Button
+                android:id="@+id/show_status_bar_insets"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:text="Show Status Bar Insets"
+                android:textSize="30sp"/>
+
+            <Button
+                android:id="@+id/hide_status_bar_insets"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:text="Hide Status Bar Insets"
+                android:textSize="30sp"/>
+
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Control Navigation Bar Insets"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <Button
+                android:id="@+id/show_nav_bar_insets"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:text="Show Navigation Bar Insets"
+                android:textSize="30sp"/>
+
+            <Button
+                android:id="@+id/hide_nav_bar_insets"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:text="Hide Navigation Bar Insets"
+                android:textSize="30sp"/>
+
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Control System Bar Insets (both Status and Navigation)"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <Button
+                android:id="@+id/show_system_bar_insets"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:text="Show System Bar Insets"
+                android:textSize="30sp"/>
+
+            <Button
+                android:id="@+id/hide_system_bar_insets"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:text="Hide System Bar Insets"
+                android:textSize="30sp"/>
+
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Set System Bar Behavior"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <Button
+                android:id="@+id/show_bars_by_touch"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:text="Show By Touch"
+                android:textSize="30sp"/>
+
+            <Button
+                android:id="@+id/show_bars_by_swipe"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:text="Show By Swipe"
+                android:textSize="30sp"/>
+
+            <Button
+                android:id="@+id/show_transient_bars_by_swipe"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:text="Show Transient By Swipe"
+                android:textSize="30sp"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
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 20dd9fc..2a7e0af 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
@@ -41,6 +41,7 @@
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.car.kitchensink.activityresolver.ActivityResolverFragment;
 import com.google.android.car.kitchensink.activityview.ActivityViewTestFragment;
 import com.google.android.car.kitchensink.alertdialog.AlertDialogTestFragment;
 import com.google.android.car.kitchensink.assistant.CarAssistantFragment;
@@ -56,12 +57,14 @@
 import com.google.android.car.kitchensink.displayinfo.DisplayInfoFragment;
 import com.google.android.car.kitchensink.experimental.ExperimentalFeatureTestFragment;
 import com.google.android.car.kitchensink.hvac.HvacTestFragment;
+import com.google.android.car.kitchensink.insets.WindowInsetsFragment;
 import com.google.android.car.kitchensink.notification.NotificationFragment;
 import com.google.android.car.kitchensink.orientation.OrientationTestFragment;
 import com.google.android.car.kitchensink.packageinfo.PackageInfoFragment;
 import com.google.android.car.kitchensink.power.PowerTestFragment;
 import com.google.android.car.kitchensink.projection.ProjectionFragment;
 import com.google.android.car.kitchensink.property.PropertyTestFragment;
+import com.google.android.car.kitchensink.rotary.RotaryFragment;
 import com.google.android.car.kitchensink.sensor.SensorsTestFragment;
 import com.google.android.car.kitchensink.storagelifetime.StorageLifetimeFragment;
 import com.google.android.car.kitchensink.storagevolumes.StorageVolumesFragment;
@@ -164,6 +167,7 @@
     }
 
     private final List<MenuEntry> mMenuEntries = Arrays.asList(
+            new FragmentMenuEntry("activity resolver", ActivityResolverFragment.class),
             new FragmentMenuEntry("activity view", ActivityViewTestFragment.class),
             new FragmentMenuEntry("alert window", AlertDialogTestFragment.class),
             new FragmentMenuEntry("assistant", CarAssistantFragment.class),
@@ -189,6 +193,7 @@
             new FragmentMenuEntry("profile_user", ProfileUserFragment.class),
             new FragmentMenuEntry("projection", ProjectionFragment.class),
             new FragmentMenuEntry("property test", PropertyTestFragment.class),
+            new FragmentMenuEntry("rotary", RotaryFragment.class),
             new FragmentMenuEntry("sensors", SensorsTestFragment.class),
             new FragmentMenuEntry("storage lifetime", StorageLifetimeFragment.class),
             new FragmentMenuEntry("storage volumes", StorageVolumesFragment.class),
@@ -198,7 +203,8 @@
             new FragmentMenuEntry("vehicle ctrl", VehicleCtrlFragment.class),
             new FragmentMenuEntry("vehicle hal", VehicleHalFragment.class),
             new FragmentMenuEntry("volume test", VolumeTestFragment.class),
-            new FragmentMenuEntry("web links", WebLinksTestFragment.class));
+            new FragmentMenuEntry("web links", WebLinksTestFragment.class),
+            new FragmentMenuEntry("window insets", WindowInsetsFragment.class));
 
     private Car mCarApi;
     private CarHvacManager mHvacManager;
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/activityresolver/ActivityResolverFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/activityresolver/ActivityResolverFragment.java
new file mode 100644
index 0000000..3dae43f
--- /dev/null
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/activityresolver/ActivityResolverFragment.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.activityresolver;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import com.google.android.car.kitchensink.R;
+
+/**
+ * This fragment triggers the activity resolver by sending an intent handled by three test
+ * activities.
+ */
+public final class ActivityResolverFragment extends Fragment {
+
+    private static final String ACTIVITY_RESOLVER_INTENT =
+            "com.google.android.car.kitchensink.activityresolver.TRIGGER_ACTIVITY_RESOLVER";
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+            @Nullable Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.activity_resolver_fragment, container, false);
+        Button button = view.requireViewById(R.id.trigger_activity_resolver);
+        button.setOnClickListener(v -> startActivity(new Intent(ACTIVITY_RESOLVER_INTENT)));
+        return view;
+    }
+}
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/activityresolver/TestActivity1.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/activityresolver/TestActivity1.java
new file mode 100644
index 0000000..bf0a6d9
--- /dev/null
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/activityresolver/TestActivity1.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.activityresolver;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+
+import com.google.android.car.kitchensink.R;
+
+public final class TestActivity1 extends Activity {
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.test_activity);
+        requireViewById(R.id.dismiss_button).setOnClickListener(v -> finish());
+    }
+}
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/activityresolver/TestActivity2.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/activityresolver/TestActivity2.java
new file mode 100644
index 0000000..8b3554c
--- /dev/null
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/activityresolver/TestActivity2.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.activityresolver;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+
+import com.google.android.car.kitchensink.R;
+
+public final class TestActivity2 extends Activity {
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.test_activity);
+        requireViewById(R.id.dismiss_button).setOnClickListener(v -> finish());
+    }
+}
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/activityresolver/TestActivity3.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/activityresolver/TestActivity3.java
new file mode 100644
index 0000000..fbd6ba6
--- /dev/null
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/activityresolver/TestActivity3.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.activityresolver;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+
+import com.google.android.car.kitchensink.R;
+
+public final class TestActivity3 extends Activity {
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.test_activity);
+        requireViewById(R.id.dismiss_button).setOnClickListener(v -> finish());
+    }
+}
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/insets/WindowInsetsFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/insets/WindowInsetsFragment.java
new file mode 100644
index 0000000..f4d52cf
--- /dev/null
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/insets/WindowInsetsFragment.java
@@ -0,0 +1,87 @@
+/*
+ * 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.insets;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowInsets;
+import android.view.WindowInsetsController;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import com.google.android.car.kitchensink.R;
+
+/** Test fragment for controlling window insets. */
+public final class WindowInsetsFragment extends Fragment {
+
+    private WindowInsetsController mWindowInsetsController;
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+            @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.window_insets_fragment, container,
+                /* attachToRoot= */ false);
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        mWindowInsetsController = view.getWindowInsetsController();
+        initStatusBarInsetsButtons(view);
+        initNavigationBarInsetsButtons(view);
+        initSystemBarInsetsButtons(view);
+        initSystemBarBehaviorButtons(view);
+    }
+
+    private void initStatusBarInsetsButtons(View view) {
+        view.findViewById(R.id.show_status_bar_insets).setOnClickListener(
+                v -> mWindowInsetsController.show(WindowInsets.Type.statusBars()));
+        view.findViewById(R.id.hide_status_bar_insets).setOnClickListener(
+                v -> mWindowInsetsController.hide(WindowInsets.Type.statusBars()));
+    }
+
+    private void initNavigationBarInsetsButtons(View view) {
+        view.findViewById(R.id.show_nav_bar_insets).setOnClickListener(
+                v -> mWindowInsetsController.show(WindowInsets.Type.navigationBars()));
+        view.findViewById(R.id.hide_nav_bar_insets).setOnClickListener(
+                v -> mWindowInsetsController.hide(WindowInsets.Type.navigationBars()));
+    }
+
+    private void initSystemBarInsetsButtons(View view) {
+        view.findViewById(R.id.show_system_bar_insets).setOnClickListener(
+                v -> mWindowInsetsController.show(WindowInsets.Type.systemBars()));
+        view.findViewById(R.id.hide_system_bar_insets).setOnClickListener(
+                v -> mWindowInsetsController.hide(WindowInsets.Type.systemBars()));
+    }
+
+    private void initSystemBarBehaviorButtons(View view) {
+        view.findViewById(R.id.show_bars_by_touch).setOnClickListener(
+                v -> mWindowInsetsController.setSystemBarsBehavior(
+                        WindowInsetsController.BEHAVIOR_SHOW_BARS_BY_TOUCH));
+        view.findViewById(R.id.show_bars_by_swipe).setOnClickListener(
+                v -> mWindowInsetsController.setSystemBarsBehavior(
+                        WindowInsetsController.BEHAVIOR_SHOW_BARS_BY_SWIPE));
+        view.findViewById(R.id.show_transient_bars_by_swipe).setOnClickListener(
+                v -> mWindowInsetsController.setSystemBarsBehavior(
+                        WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE));
+    }
+}
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/rotary/RotaryFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/rotary/RotaryFragment.java
new file mode 100644
index 0000000..bf13017
--- /dev/null
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/rotary/RotaryFragment.java
@@ -0,0 +1,306 @@
+/*
+ * 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.rotary;
+
+import android.app.ActivityManager;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.Switch;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import com.google.android.car.kitchensink.R;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/** Test fragment to enable/disable various components related to RotaryController. */
+public final class RotaryFragment extends Fragment {
+
+    private static final String TAG = RotaryFragment.class.getSimpleName();
+    private static final String ROTARY_CONTROLLER_PACKAGE = "com.android.car.rotary";
+    private static final ComponentName ROTARY_SERVICE_NAME = ComponentName.unflattenFromString(
+            ROTARY_CONTROLLER_PACKAGE + "/com.android.car.rotary.RotaryService");
+    private static final String ROTARY_PLAYGROUND_PACKAGE = "com.android.car.rotaryplayground";
+    private static final String ROTARY_IME_PACKAGE = "com.android.car.rotaryime";
+
+    private static final String ACCESSIBILITY_DELIMITER = ":";
+
+    private static final int ON = 1;
+    private static final int OFF = 0;
+
+    private final IntentFilter mFilter = new IntentFilter();
+
+    private TextView mUnavailableMessage;
+    private Button mEnableAllButton;
+    private Button mDisableAllButton;
+    private Switch mRotaryServiceToggle;
+    private Switch mRotaryImeToggle;
+    private Switch mRotaryPlaygroundToggle;
+
+    private final BroadcastReceiver mPackagesUpdatedReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            switch (action) {
+                case Intent.ACTION_PACKAGE_ADDED:
+                case Intent.ACTION_PACKAGE_CHANGED:
+                case Intent.ACTION_PACKAGE_REMOVED:
+                    refreshUi();
+                    break;
+            }
+        }
+    };
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mFilter.addAction(Intent.ACTION_PACKAGE_ADDED);
+        mFilter.addAction(Intent.ACTION_PACKAGE_CHANGED);
+        mFilter.addAction(Intent.ACTION_PACKAGE_REMOVED);
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+            @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.rotary_fragment, container, /* attachToRoot= */ false);
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        mUnavailableMessage = view.findViewById(R.id.unavailable_message);
+
+        mEnableAllButton = view.findViewById(R.id.enable_all_rotary);
+        mDisableAllButton = view.findViewById(R.id.disable_all_rotary);
+
+        mRotaryServiceToggle = view.findViewById(R.id.rotary_service_toggle);
+        mRotaryImeToggle = view.findViewById(R.id.rotary_ime_toggle);
+        mRotaryPlaygroundToggle = view.findViewById(R.id.rotary_playground_toggle);
+
+        mRotaryServiceToggle.setOnCheckedChangeListener(
+                (buttonView, isChecked) -> enableRotaryService(getContext(), isChecked));
+        mRotaryImeToggle.setOnCheckedChangeListener(
+                (buttonView, isChecked) -> enableApplication(getContext(), ROTARY_IME_PACKAGE,
+                        isChecked));
+        mRotaryPlaygroundToggle.setOnCheckedChangeListener(
+                (buttonView, isChecked) -> enableApplication(getContext(),
+                        ROTARY_PLAYGROUND_PACKAGE, isChecked));
+
+        mEnableAllButton.setOnClickListener(v -> {
+            if (mRotaryServiceToggle.isEnabled()) {
+                mRotaryServiceToggle.setChecked(true);
+            }
+            if (mRotaryImeToggle.isEnabled()) {
+                mRotaryImeToggle.setChecked(true);
+            }
+            if (mRotaryPlaygroundToggle.isEnabled()) {
+                mRotaryPlaygroundToggle.setChecked(true);
+            }
+        });
+
+        mDisableAllButton.setOnClickListener(v -> {
+            if (mRotaryServiceToggle.isEnabled()) {
+                mRotaryServiceToggle.setChecked(false);
+            }
+            if (mRotaryImeToggle.isEnabled()) {
+                mRotaryImeToggle.setChecked(false);
+            }
+            if (mRotaryPlaygroundToggle.isEnabled()) {
+                mRotaryPlaygroundToggle.setChecked(false);
+            }
+        });
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+
+        getContext().registerReceiver(mPackagesUpdatedReceiver, mFilter);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        refreshUi();
+    }
+
+    private void refreshUi() {
+        ApplicationInfo info = findApplication(getContext(), ROTARY_CONTROLLER_PACKAGE);
+        boolean rotaryApplicationExists = info != null;
+        info = findApplication(getContext(), ROTARY_IME_PACKAGE);
+        boolean rotaryImeExists = info != null;
+        info = findApplication(getContext(), ROTARY_PLAYGROUND_PACKAGE);
+        boolean rotaryPlaygroundExists = info != null;
+
+        mUnavailableMessage.setVisibility(!rotaryApplicationExists ? View.VISIBLE : View.GONE);
+
+        mEnableAllButton.setEnabled(rotaryApplicationExists);
+        mDisableAllButton.setEnabled(rotaryApplicationExists);
+        mRotaryServiceToggle.setEnabled(rotaryApplicationExists);
+        mRotaryImeToggle.setEnabled(rotaryApplicationExists && rotaryImeExists);
+        mRotaryPlaygroundToggle.setEnabled(rotaryApplicationExists && rotaryPlaygroundExists);
+
+        mRotaryServiceToggle.setChecked(isRotaryServiceEnabled(getContext()));
+        mRotaryImeToggle.setChecked(
+                rotaryImeExists && isApplicationEnabled(getContext(), ROTARY_IME_PACKAGE));
+        mRotaryPlaygroundToggle.setChecked(
+                rotaryPlaygroundExists && isApplicationEnabled(getContext(),
+                        ROTARY_PLAYGROUND_PACKAGE));
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+
+        getContext().unregisterReceiver(mPackagesUpdatedReceiver);
+    }
+
+    @Nullable
+    private static ApplicationInfo findApplication(Context context, String packageName) {
+        PackageManager pm = context.getPackageManager();
+        try {
+            Log.d(TAG, "Searching for: " + packageName);
+            return pm.getApplicationInfoAsUser(packageName, /* flags= */ 0,
+                    ActivityManager.getCurrentUser());
+        } catch (PackageManager.NameNotFoundException e) {
+            Log.e(TAG, "Could not find: " + packageName);
+            return null;
+        }
+    }
+
+    private static boolean isApplicationEnabled(Context context, String packageName) {
+        ApplicationInfo info = findApplication(context, packageName);
+        if (info == null) {
+            return false;
+        }
+
+        return info.enabled;
+    }
+
+    private static void enableApplication(Context context, String packageName, boolean enable) {
+        // Check that the application exists.
+        ApplicationInfo info = findApplication(context, packageName);
+        if (info == null) {
+            Log.e(TAG, "Cannot enable application. " + packageName + " package does not exist");
+            return;
+        }
+
+        PackageManager pm = context.getPackageManager();
+        int currentState = pm.getApplicationEnabledSetting(packageName);
+        int desiredState = enable ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+                : PackageManager.COMPONENT_ENABLED_STATE_DISABLED;
+
+        boolean isEnabled = currentState == PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
+        if (isEnabled != enable
+                || currentState == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT) {
+            Log.d(TAG, "Application state updated for " + packageName + ": " + enable);
+            pm.setApplicationEnabledSetting(packageName, desiredState, /* flags= */ 0);
+        }
+    }
+
+    private static boolean isRotaryServiceEnabled(Context context) {
+        ApplicationInfo info = findApplication(context, ROTARY_CONTROLLER_PACKAGE);
+        if (info == null) {
+            return false;
+        }
+
+        int isAccessibilityEnabled = Settings.Secure.getInt(context.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_ENABLED, OFF);
+        if (isAccessibilityEnabled != ON) {
+            return false;
+        }
+
+        String services = Settings.Secure.getString(context.getContentResolver(),
+                Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
+        if (services == null) {
+            return false;
+        }
+
+        return services.contains(ROTARY_CONTROLLER_PACKAGE);
+    }
+
+    private static void enableRotaryService(Context context, boolean enable) {
+        // Check that the RotaryController exists.
+        ApplicationInfo info = findApplication(context, ROTARY_CONTROLLER_PACKAGE);
+        if (info == null) {
+            Log.e(TAG, "Cannot enable rotary service. " + ROTARY_CONTROLLER_PACKAGE
+                    + " package does not exist");
+            return;
+        }
+
+        // Set the list of accessibility services.
+        String services = Settings.Secure.getString(context.getContentResolver(),
+                Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
+        if (services == null) {
+            services = "";
+        }
+        Log.d(TAG, "Current list of accessibility services: " + services);
+
+        String[] servicesArray = services.split(ACCESSIBILITY_DELIMITER);
+        Set<ComponentName> servicesSet = new HashSet<>();
+        for (String service : servicesArray) {
+            ComponentName name = ComponentName.unflattenFromString(service);
+            if (name != null) {
+                servicesSet.add(name);
+            }
+        }
+
+        if (enable) {
+            servicesSet.add(ROTARY_SERVICE_NAME);
+        } else {
+            servicesSet.remove(ROTARY_SERVICE_NAME);
+        }
+
+        StringBuilder builder = new StringBuilder();
+        for (ComponentName service : servicesSet) {
+            if (builder.length() > 0) {
+                builder.append(ACCESSIBILITY_DELIMITER);
+            }
+            builder.append(service.flattenToString());
+        }
+
+        Log.d(TAG, "New list of accessibility services: " + builder);
+        Settings.Secure.putString(context.getContentResolver(),
+                Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES,
+                builder.toString());
+
+        // Set the overall enabled state.
+        int desiredState = enable ? ON : OFF;
+        Settings.Secure.putInt(context.getContentResolver(), Settings.Secure.ACCESSIBILITY_ENABLED,
+                desiredState);
+    }
+}
diff --git a/tests/MultiDisplaySecondaryHomeTestLauncher/res/values-ar/strings.xml b/tests/MultiDisplaySecondaryHomeTestLauncher/res/values-ar/strings.xml
index fcc9ff5..8913f2a 100644
--- a/tests/MultiDisplaySecondaryHomeTestLauncher/res/values-ar/strings.xml
+++ b/tests/MultiDisplaySecondaryHomeTestLauncher/res/values-ar/strings.xml
@@ -22,7 +22,7 @@
     <string name="couldnt_launch" msgid="7815676424138012351">"تعذَّر تشغيل النشاط."</string>
     <string name="select_display" msgid="1682700853391296117">"اختَر شاشة."</string>
     <string name="add_app_shortcut" msgid="8873512136913188432">"إضافة اختصار التطبيق"</string>
-    <string name="set_wallpaper" msgid="3650915172749345197">"تحديد الخلفية"</string>
+    <string name="set_wallpaper" msgid="3650915172749345197">"ضبط الخلفية"</string>
     <string name="new_instance" msgid="1924479866055190730">"طلب التشغيل في مثيل جديد"</string>
     <string name="wallpaper_description" msgid="5885164573334720996">"نموذج خلفية الشاشة المتعددة"</string>
 </resources>
diff --git a/tests/MultiDisplaySecondaryHomeTestLauncher/res/values-mk/strings.xml b/tests/MultiDisplaySecondaryHomeTestLauncher/res/values-mk/strings.xml
index 1ff9c0f..2594b85 100644
--- a/tests/MultiDisplaySecondaryHomeTestLauncher/res/values-mk/strings.xml
+++ b/tests/MultiDisplaySecondaryHomeTestLauncher/res/values-mk/strings.xml
@@ -19,7 +19,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="3477029631237519798">"Повеќе екрани"</string>
     <string name="md_launcher" msgid="327845696688732506">"Стартер на повеќе екрани"</string>
-    <string name="couldnt_launch" msgid="7815676424138012351">"Активноста не можеше да се стартува"</string>
+    <string name="couldnt_launch" msgid="7815676424138012351">"Активноста не може да се стартува"</string>
     <string name="select_display" msgid="1682700853391296117">"Изберете екран"</string>
     <string name="add_app_shortcut" msgid="8873512136913188432">"Додајте кратенка за апликација"</string>
     <string name="set_wallpaper" msgid="3650915172749345197">"Поставете го тапетот"</string>
diff --git a/tests/MultiDisplaySecondaryHomeTestLauncher/res/values-mn/strings.xml b/tests/MultiDisplaySecondaryHomeTestLauncher/res/values-mn/strings.xml
index d8efa60..b1d6029 100644
--- a/tests/MultiDisplaySecondaryHomeTestLauncher/res/values-mn/strings.xml
+++ b/tests/MultiDisplaySecondaryHomeTestLauncher/res/values-mn/strings.xml
@@ -22,7 +22,7 @@
     <string name="couldnt_launch" msgid="7815676424138012351">"Үйл ажиллагааг эхлүүлж чадсангүй"</string>
     <string name="select_display" msgid="1682700853391296117">"Дэлгэц сонгох"</string>
     <string name="add_app_shortcut" msgid="8873512136913188432">"Аппын товчлол нэмэх"</string>
-    <string name="set_wallpaper" msgid="3650915172749345197">"Ханын зураг тохируулах"</string>
+    <string name="set_wallpaper" msgid="3650915172749345197">"Дэлгэцийн зураг тохируулах"</string>
     <string name="new_instance" msgid="1924479866055190730">"Шинэ инстансаар эхлүүлэх хүсэлт тавих"</string>
-    <string name="wallpaper_description" msgid="5885164573334720996">"Жишээ олон дэлгэцэт ханын зураг"</string>
+    <string name="wallpaper_description" msgid="5885164573334720996">"Жишээ олон дэлгэцэт дэлгэцийн зураг"</string>
 </resources>
diff --git a/tests/SecondaryHomeApp/res/values-mk/strings.xml b/tests/SecondaryHomeApp/res/values-mk/strings.xml
index 645fed4..00dedb0 100644
--- a/tests/SecondaryHomeApp/res/values-mk/strings.xml
+++ b/tests/SecondaryHomeApp/res/values-mk/strings.xml
@@ -19,6 +19,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="1232190134475133062">"SecondaryHomeApp"</string>
     <string name="app_launcher" msgid="3285007106222765396">"Стартер на SecHome"</string>
-    <string name="launch_fail_msg" msgid="2935729218024647088">"Не можеше да се стартува"</string>
+    <string name="launch_fail_msg" msgid="2935729218024647088">"Не може да се стартува"</string>
     <string name="clear_all" msgid="7403807937179450743">"Исчисти сѐ"</string>
 </resources>
diff --git a/tests/carservice_test/src/com/android/car/audio/CarAudioZonesHelperLegacyTest.java b/tests/carservice_test/src/com/android/car/audio/CarAudioZonesHelperLegacyTest.java
index 170ae8c..b0e932e 100644
--- a/tests/carservice_test/src/com/android/car/audio/CarAudioZonesHelperLegacyTest.java
+++ b/tests/carservice_test/src/com/android/car/audio/CarAudioZonesHelperLegacyTest.java
@@ -23,6 +23,7 @@
 
 import android.annotation.XmlRes;
 import android.content.Context;
+import android.util.SparseArray;
 
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -90,9 +91,9 @@
         CarAudioZonesHelperLegacy helper = new CarAudioZonesHelperLegacy(mContext, mCarVolumeGroups,
                 carAudioDeviceInfos, mMockAudioControlWrapper, mMockCarAudioSettings);
 
-        CarAudioZone[] zones = helper.loadAudioZones();
+        SparseArray<CarAudioZone> zones = helper.loadAudioZones();
 
-        assertThat(zones).hasLength(1);
+        assertThat(zones.size()).isEqualTo(1);
     }
 
     @Test
@@ -104,8 +105,8 @@
         CarAudioZonesHelperLegacy helper = new CarAudioZonesHelperLegacy(mContext, mCarVolumeGroups,
                 carAudioDeviceInfos, mMockAudioControlWrapper, mMockCarAudioSettings);
 
-        CarAudioZone[] zones = helper.loadAudioZones();
-        CarVolumeGroup[] volumeGroups = zones[0].getVolumeGroups();
+        SparseArray<CarAudioZone> zones = helper.loadAudioZones();
+        CarVolumeGroup[] volumeGroups = zones.get(0).getVolumeGroups();
         assertThat(volumeGroups).hasLength(2);
     }
 
@@ -119,9 +120,9 @@
         CarAudioZonesHelperLegacy helper = new CarAudioZonesHelperLegacy(mContext, mCarVolumeGroups,
                 carAudioDeviceInfos, mMockAudioControlWrapper, mMockCarAudioSettings);
 
-        CarAudioZone[] zones = helper.loadAudioZones();
+        SparseArray<CarAudioZone> zones = helper.loadAudioZones();
 
-        CarVolumeGroup[] volumeGroups = zones[0].getVolumeGroups();
+        CarVolumeGroup[] volumeGroups = zones.get(0).getVolumeGroups();
         CarVolumeGroup mediaVolumeGroup = volumeGroups[0];
         List<Integer> contexts = IntStream.of(mediaVolumeGroup.getContexts()).boxed().collect(
                 Collectors.toList());
@@ -146,9 +147,9 @@
         CarAudioZonesHelperLegacy helper = new CarAudioZonesHelperLegacy(mContext, mCarVolumeGroups,
                 carAudioDeviceInfos, mMockAudioControlWrapper, mMockCarAudioSettings);
 
-        CarAudioZone[] zones = helper.loadAudioZones();
+        SparseArray<CarAudioZone> zones = helper.loadAudioZones();
 
-        CarVolumeGroup[] volumeGroups = zones[0].getVolumeGroups();
+        CarVolumeGroup[] volumeGroups = zones.get(0).getVolumeGroups();
         CarVolumeGroup mediaVolumeGroup = volumeGroups[0];
         List<Integer> contexts = IntStream.of(mediaVolumeGroup.getContexts()).boxed().collect(
                 Collectors.toList());
diff --git a/tests/carservice_test/src/com/android/car/audio/CarAudioZonesHelperTest.java b/tests/carservice_test/src/com/android/car/audio/CarAudioZonesHelperTest.java
index fce0a78..87cefb8 100644
--- a/tests/carservice_test/src/com/android/car/audio/CarAudioZonesHelperTest.java
+++ b/tests/carservice_test/src/com/android/car/audio/CarAudioZonesHelperTest.java
@@ -27,6 +27,7 @@
 import android.content.Context;
 import android.media.AudioDeviceAttributes;
 import android.media.AudioDeviceInfo;
+import android.util.SparseArray;
 import android.util.SparseIntArray;
 
 import androidx.test.core.app.ApplicationProvider;
@@ -43,6 +44,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -137,9 +139,9 @@
         CarAudioZonesHelper cazh = new CarAudioZonesHelper(mCarAudioSettings, mInputStream,
                 mCarAudioOutputDeviceInfos, mInputAudioDeviceInfos);
 
-        List<CarAudioZone> zoneList = Arrays.asList(cazh.loadAudioZones());
+        SparseArray<CarAudioZone> zones = cazh.loadAudioZones();
 
-        assertThat(zoneList).hasSize(2);
+        assertThat(zones.size()).isEqualTo(2);
     }
 
     @Test
@@ -149,9 +151,9 @@
             CarAudioZonesHelper cazh = new CarAudioZonesHelper(mCarAudioSettings, versionOneStream,
                     mCarAudioOutputDeviceInfos, mInputAudioDeviceInfos);
 
-            CarAudioZone[] zones = cazh.loadAudioZones();
+            SparseArray<CarAudioZone> zones = cazh.loadAudioZones();
 
-            assertThat(zones.length).isEqualTo(2);
+            assertThat(zones.size()).isEqualTo(2);
         }
     }
 
@@ -160,12 +162,13 @@
         CarAudioZonesHelper cazh = new CarAudioZonesHelper(mCarAudioSettings, mInputStream,
                 mCarAudioOutputDeviceInfos, mInputAudioDeviceInfos);
 
-        CarAudioZone[] zones = cazh.loadAudioZones();
+        SparseArray<CarAudioZone> zones = cazh.loadAudioZones();
+
 
         List<Integer> zoneIds = getListOfZoneIds(zones);
-        assertThat(zoneIds.size()).isEqualTo(2);
-        assertThat(zoneIds)
-                .containsExactly(CarAudioManager.PRIMARY_AUDIO_ZONE, SECONDARY_ZONE_ID).inOrder();
+        assertThat(zones.size()).isEqualTo(2);
+        assertThat(zones.contains(CarAudioManager.PRIMARY_AUDIO_ZONE)).isTrue();
+        assertThat(zones.contains(SECONDARY_ZONE_ID)).isTrue();
     }
 
     @Test
@@ -173,9 +176,9 @@
         CarAudioZonesHelper cazh = new CarAudioZonesHelper(mCarAudioSettings, mInputStream,
                 mCarAudioOutputDeviceInfos, mInputAudioDeviceInfos);
 
-        CarAudioZone[] zones = cazh.loadAudioZones();
+        SparseArray<CarAudioZone> zones = cazh.loadAudioZones();
 
-        assertThat(zones.length).isEqualTo(2);
+        assertThat(zones.size()).isEqualTo(2);
 
         SparseIntArray audioZoneIdToOccupantZoneIdMapping =
                 cazh.getCarAudioZoneIdToOccupantZoneIdMapping();
@@ -190,9 +193,9 @@
         CarAudioZonesHelper cazh = new CarAudioZonesHelper(mCarAudioSettings, mInputStream,
                 mCarAudioOutputDeviceInfos, mInputAudioDeviceInfos);
 
-        CarAudioZone[] zones = cazh.loadAudioZones();
+        SparseArray<CarAudioZone> zones = cazh.loadAudioZones();
 
-        CarAudioZone primaryZone = zones[0];
+        CarAudioZone primaryZone = zones.get(0);
         assertThat(primaryZone.getName()).isEqualTo(PRIMARY_ZONE_NAME);
     }
 
@@ -201,12 +204,12 @@
         CarAudioZonesHelper cazh = new CarAudioZonesHelper(mCarAudioSettings, mInputStream,
                 mCarAudioOutputDeviceInfos, mInputAudioDeviceInfos);
 
-        CarAudioZone[] zones = cazh.loadAudioZones();
+        SparseArray<CarAudioZone> zones = cazh.loadAudioZones();
 
-        CarAudioZone primaryZone = zones[0];
+        CarAudioZone primaryZone = zones.get(0);
         assertThat(primaryZone.isPrimaryZone()).isTrue();
 
-        CarAudioZone rseZone = zones[1];
+        CarAudioZone rseZone = zones.get(2);
         assertThat(rseZone.isPrimaryZone()).isFalse();
     }
 
@@ -215,9 +218,9 @@
         CarAudioZonesHelper cazh = new CarAudioZonesHelper(mCarAudioSettings, mInputStream,
                 mCarAudioOutputDeviceInfos, mInputAudioDeviceInfos);
 
-        CarAudioZone[] zones = cazh.loadAudioZones();
+        SparseArray<CarAudioZone> zones = cazh.loadAudioZones();
 
-        CarAudioZone primaryZone = zones[0];
+        CarAudioZone primaryZone = zones.get(0);
         assertThat(primaryZone.getVolumeGroupCount()).isEqualTo(2);
     }
 
@@ -226,9 +229,9 @@
         CarAudioZonesHelper cazh = new CarAudioZonesHelper(mCarAudioSettings, mInputStream,
                 mCarAudioOutputDeviceInfos, mInputAudioDeviceInfos);
 
-        CarAudioZone[] zones = cazh.loadAudioZones();
+        SparseArray<CarAudioZone> zones = cazh.loadAudioZones();
 
-        CarAudioZone primaryZone = zones[0];
+        CarAudioZone primaryZone = zones.get(0);
         CarVolumeGroup volumeGroup = primaryZone.getVolumeGroups()[0];
         List<String> addresses = volumeGroup.getAddresses();
         assertThat(addresses).containsExactly(BUS_0_ADDRESS, BUS_3_ADDRESS);
@@ -239,14 +242,14 @@
         CarAudioZonesHelper cazh = new CarAudioZonesHelper(mCarAudioSettings, mInputStream,
                 mCarAudioOutputDeviceInfos, mInputAudioDeviceInfos);
 
-        CarAudioZone[] zones = cazh.loadAudioZones();
+        SparseArray<CarAudioZone> zones = cazh.loadAudioZones();
 
-        CarAudioZone primaryZone = zones[0];
+        CarAudioZone primaryZone = zones.get(0);
         CarVolumeGroup volumeGroup = primaryZone.getVolumeGroups()[0];
         assertThat(volumeGroup.getContextsForAddress(BUS_0_ADDRESS)).asList()
                 .containsExactly(CarAudioContext.MUSIC);
 
-        CarAudioZone rearSeatEntertainmentZone = zones[1];
+        CarAudioZone rearSeatEntertainmentZone = zones.get(2);
         CarVolumeGroup rseVolumeGroup = rearSeatEntertainmentZone.getVolumeGroups()[0];
         List<Integer> contextForBus100List =
                 Arrays.stream(rseVolumeGroup.getContextsForAddress(BUS_100_ADDRESS))
@@ -264,9 +267,9 @@
         CarAudioZonesHelper cazh = new CarAudioZonesHelper(mCarAudioSettings, versionOneStream,
                 mCarAudioOutputDeviceInfos, mInputAudioDeviceInfos);
 
-        CarAudioZone[] zones = cazh.loadAudioZones();
+        SparseArray<CarAudioZone> zones = cazh.loadAudioZones();
 
-        CarAudioZone defaultZone = zones[0];
+        CarAudioZone defaultZone = zones.get(0);
         CarVolumeGroup volumeGroup = defaultZone.getVolumeGroups()[0];
         List<Integer> audioContexts = Arrays.stream(volumeGroup.getContexts()).boxed()
                 .collect(Collectors.toList());
@@ -299,12 +302,11 @@
                     new CarAudioZonesHelper(mCarAudioSettings, missingAudioZoneIdStream,
                             mCarAudioOutputDeviceInfos, mInputAudioDeviceInfos);
 
-            CarAudioZone[] zones = cazh.loadAudioZones();
+            SparseArray<CarAudioZone> zones = cazh.loadAudioZones();
 
-            List<Integer> zoneIds = getListOfZoneIds(zones);
-            assertThat(zoneIds.size()).isEqualTo(2);
-            assertThat(zoneIds).contains(CarAudioManager.PRIMARY_AUDIO_ZONE);
-            assertThat(zoneIds).contains(SECONDARY_ZONE_ID);
+            assertThat(zones.size()).isEqualTo(2);
+            assertThat(zones.contains(CarAudioManager.PRIMARY_AUDIO_ZONE)).isTrue();
+            assertThat(zones.contains(SECONDARY_ZONE_ID)).isTrue();
         }
     }
 
@@ -344,9 +346,9 @@
                     new CarAudioZonesHelper(mCarAudioSettings, inputDevicesStream,
                             mCarAudioOutputDeviceInfos, mInputAudioDeviceInfos);
 
-            CarAudioZone[] zones = cazh.loadAudioZones();
+            SparseArray<CarAudioZone> zones = cazh.loadAudioZones();
 
-            CarAudioZone primaryZone = zones[0];
+            CarAudioZone primaryZone = zones.get(0);
             List<AudioDeviceAttributes> primaryZoneInputDevices =
                     primaryZone.getInputAudioDevices();
             assertThat(primaryZoneInputDevices).hasSize(2);
@@ -357,7 +359,7 @@
             assertThat(primaryZoneInputAddresses).containsExactly(PRIMARY_ZONE_FM_TUNER_ADDRESS,
                     PRIMARY_ZONE_MICROPHONE_ADDRESS).inOrder();
 
-            CarAudioZone secondaryZone = zones[1];
+            CarAudioZone secondaryZone = zones.get(1);
             List<AudioDeviceAttributes> secondaryZoneInputDevices =
                     secondaryZone.getInputAudioDevices();
             List<String> secondaryZoneInputAddresses =
@@ -570,7 +572,11 @@
         }
     }
 
-    private List<Integer> getListOfZoneIds(CarAudioZone[] zones) {
-        return Arrays.stream(zones).map(CarAudioZone::getId).collect(Collectors.toList());
+    private List<Integer> getListOfZoneIds(SparseArray<CarAudioZone> zones) {
+        List<Integer> zoneIds = new ArrayList<>();
+        for (int i = 0; i < zones.size(); i++) {
+            zoneIds.add(zones.keyAt(i));
+        }
+        return zoneIds;
     }
 }
diff --git a/tests/carservice_test/src/com/android/car/audio/CarAudioZonesValidatorTest.java b/tests/carservice_test/src/com/android/car/audio/CarAudioZonesValidatorTest.java
index c171321..9c32893 100644
--- a/tests/carservice_test/src/com/android/car/audio/CarAudioZonesValidatorTest.java
+++ b/tests/carservice_test/src/com/android/car/audio/CarAudioZonesValidatorTest.java
@@ -17,9 +17,10 @@
 
 import static org.mockito.Mockito.when;
 
-import androidx.test.ext.junit.runners.AndroidJUnit4;
+import android.car.media.CarAudioManager;
+import android.util.SparseArray;
 
-import com.google.common.collect.Lists;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -27,6 +28,8 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
 
+import java.util.List;
+
 @RunWith(AndroidJUnit4.class)
 public class CarAudioZonesValidatorTest {
     @Rule
@@ -37,52 +40,102 @@
         thrown.expect(RuntimeException.class);
         thrown.expectMessage("At least one zone should be defined");
 
-        CarAudioZonesValidator.validate(new CarAudioZone[0]);
+        CarAudioZonesValidator.validate(new SparseArray<CarAudioZone>());
     }
 
     @Test
     public void validate_volumeGroupsForEachZone() {
-        CarAudioZone primaryZone = Mockito.mock(CarAudioZone.class);
-        when(primaryZone.validateVolumeGroups()).thenReturn(true);
-        CarAudioZone zoneOne = Mockito.mock(CarAudioZone.class);
-        when(zoneOne.validateVolumeGroups()).thenReturn(false);
-        when(zoneOne.getId()).thenReturn(1);
+        SparseArray<CarAudioZone> zones = generateAudioZonesWithPrimary();
+        CarAudioZone zoneOne = new MockBuilder()
+                .withInvalidVolumeGroups()
+                .withZoneId(1)
+                .build();
+        zones.put(zoneOne.getId(), zoneOne);
 
         thrown.expect(RuntimeException.class);
         thrown.expectMessage("Invalid volume groups configuration for zone " + 1);
 
-        CarAudioZonesValidator.validate(new CarAudioZone[]{primaryZone, zoneOne});
+        CarAudioZonesValidator.validate(zones);
     }
 
     @Test
     public void validate_eachAddressAppearsInOnlyOneZone() {
-        CarAudioZone primaryZone = Mockito.mock(CarAudioZone.class);
-        CarVolumeGroup mockVolumeGroup = Mockito.mock(CarVolumeGroup.class);
-        when(mockVolumeGroup.getAddresses()).thenReturn(Lists.newArrayList("one", "two", "three"));
-        when(primaryZone.getVolumeGroups()).thenReturn(new CarVolumeGroup[]{mockVolumeGroup});
-        when(primaryZone.validateVolumeGroups()).thenReturn(true);
+        CarVolumeGroup mockVolumeGroup = generateVolumeGroup(List.of("one", "two", "three"));
 
-        CarAudioZone secondaryZone = Mockito.mock(CarAudioZone.class);
-        CarVolumeGroup mockSecondaryVolmeGroup = Mockito.mock(CarVolumeGroup.class);
-        when(mockSecondaryVolmeGroup.getAddresses()).thenReturn(
-                Lists.newArrayList("three", "four", "five"));
-        when(secondaryZone.getVolumeGroups()).thenReturn(
-                new CarVolumeGroup[]{mockSecondaryVolmeGroup});
-        when(secondaryZone.validateVolumeGroups()).thenReturn(true);
+        CarAudioZone primaryZone = new MockBuilder()
+                .withVolumeGroups(new CarVolumeGroup[]{mockVolumeGroup})
+                .build();
+
+        CarVolumeGroup mockSecondaryVolumeGroup = generateVolumeGroup(
+                List.of("three", "four", "five"));
+
+        CarAudioZone secondaryZone = new MockBuilder()
+                .withZoneId(1)
+                .withVolumeGroups(new CarVolumeGroup[]{mockSecondaryVolumeGroup})
+                .build();
+        SparseArray<CarAudioZone> zones = new SparseArray<>();
+        zones.put(primaryZone.getId(), primaryZone);
+        zones.put(secondaryZone.getId(), secondaryZone);
+
 
         thrown.expect(RuntimeException.class);
         thrown.expectMessage(
                 "Device with address three appears in multiple volume groups or audio zones");
 
-        CarAudioZonesValidator.validate(new CarAudioZone[]{primaryZone, secondaryZone});
+        CarAudioZonesValidator.validate(zones);
     }
 
     @Test
     public void validate_passesWithoutExceptionForValidZoneConfiguration() {
-        CarAudioZone primaryZone = Mockito.mock(CarAudioZone.class);
-        when(primaryZone.validateVolumeGroups()).thenReturn(true);
-        when(primaryZone.getVolumeGroups()).thenReturn(new CarVolumeGroup[0]);
+        SparseArray<CarAudioZone> zones = generateAudioZonesWithPrimary();
 
-        CarAudioZonesValidator.validate(new CarAudioZone[]{primaryZone});
+        CarAudioZonesValidator.validate(zones);
     }
-}
+
+    private SparseArray<CarAudioZone> generateAudioZonesWithPrimary() {
+        CarAudioZone zone = new MockBuilder().build();
+        SparseArray<CarAudioZone> zones = new SparseArray<>();
+        zones.put(zone.getId(), zone);
+        return zones;
+    }
+
+    private CarVolumeGroup generateVolumeGroup(List<String> deviceAddresses) {
+        CarVolumeGroup mockVolumeGroup = Mockito.mock(CarVolumeGroup.class);
+        when(mockVolumeGroup.getAddresses()).thenReturn(deviceAddresses);
+        return mockVolumeGroup;
+    }
+
+    private CarAudioZone getMockPrimaryZone() {
+        CarAudioZone zoneMock = Mockito.mock(CarAudioZone.class);
+        when(zoneMock.getId()).thenReturn(CarAudioManager.PRIMARY_AUDIO_ZONE);
+        return zoneMock;
+    }
+    private static class MockBuilder {
+        private boolean mHasValidVolumeGroups = true;
+        private int mZoneId = 0;
+        private CarVolumeGroup[] mVolumeGroups = new CarVolumeGroup[0];
+
+        CarAudioZone build() {
+            CarAudioZone zoneMock = Mockito.mock(CarAudioZone.class);
+            when(zoneMock.getId()).thenReturn(mZoneId);
+            when(zoneMock.validateVolumeGroups()).thenReturn(mHasValidVolumeGroups);
+            when(zoneMock.getVolumeGroups()).thenReturn(mVolumeGroups);
+            return zoneMock;
+        }
+
+        MockBuilder withInvalidVolumeGroups() {
+            mHasValidVolumeGroups = false;
+            return this;
+        }
+
+        MockBuilder withZoneId(int zoneId) {
+            mZoneId = zoneId;
+            return this;
+        }
+
+        MockBuilder withVolumeGroups(CarVolumeGroup[] volumeGroups) {
+            mVolumeGroups = volumeGroups;
+            return this;
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/carservice_test/src/com/android/car/audio/CarZonesAudioFocusTest.java b/tests/carservice_test/src/com/android/car/audio/CarZonesAudioFocusTest.java
index 7a3f813..984d9e0 100644
--- a/tests/carservice_test/src/com/android/car/audio/CarZonesAudioFocusTest.java
+++ b/tests/carservice_test/src/com/android/car/audio/CarZonesAudioFocusTest.java
@@ -27,6 +27,7 @@
 
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -40,10 +41,10 @@
 import android.media.audiopolicy.AudioPolicy;
 import android.os.Build;
 import android.os.Bundle;
+import android.util.SparseArray;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -71,27 +72,14 @@
     @Mock
     private AudioManager mMockAudioManager;
     @Mock
-    private PackageManager mMockPackageManager;
-    @Mock
     private AudioPolicy mAudioPolicy;
     @Mock
-    private CarAudioZone mPrimaryAudioZone;
-    @Mock
-    private CarAudioZone mSecondaryAudioZone;
-    @Mock
     private CarAudioService mCarAudioService;
     @Mock
     private ContentResolver mContentResolver;
     @Mock
     private CarAudioSettings mCarAudioSettings;
 
-    private CarAudioZone[] mMockAudioZones;
-
-    @Before
-    public void setUp() {
-        mMockAudioZones = generateAudioZones();
-    }
-
     @Test
     public void onAudioFocusRequest_withNoCurrentFocusHolder_requestGranted() {
         CarZonesAudioFocus carZonesAudioFocus = getCarZonesAudioFocus(false);
@@ -303,18 +291,22 @@
                 .setFocusRequestResult(audioFocusClient, expectedAudioFocusResults, mAudioPolicy);
     }
 
-    private CarAudioZone[] generateAudioZones() {
-        mPrimaryAudioZone = new CarAudioZone(PRIMARY_ZONE_ID, "Primary zone");
-        mSecondaryAudioZone = new CarAudioZone(SECONDARY_ZONE_ID, "Secondary zone");
-        CarAudioZone[] zones = {mPrimaryAudioZone, mSecondaryAudioZone};
+    private SparseArray<CarAudioZone> generateAudioZones() {
+        SparseArray<CarAudioZone> zones = new SparseArray<>();
+        zones.put(PRIMARY_ZONE_ID, new CarAudioZone(PRIMARY_ZONE_ID, "Primary zone"));
+        zones.put(SECONDARY_ZONE_ID, new CarAudioZone(SECONDARY_ZONE_ID, "Secondary zone"));
         return zones;
     }
 
     private CarZonesAudioFocus getCarZonesAudioFocus(boolean enableDelayedFocus) {
+        SparseArray<CarAudioZone> zones = generateAudioZones();
+        PackageManager mockPackageManager = mock(PackageManager.class);
         CarZonesAudioFocus carZonesAudioFocus =
-                new CarZonesAudioFocus(mMockAudioManager, mMockPackageManager,
-                        mMockAudioZones, mCarAudioSettings, enableDelayedFocus);
+                new CarZonesAudioFocus(mMockAudioManager, mockPackageManager, zones,
+                        mCarAudioSettings, enableDelayedFocus);
         carZonesAudioFocus.setOwningPolicy(mCarAudioService, mAudioPolicy);
+
+
         return carZonesAudioFocus;
     }
 
diff --git a/tests/carservice_test/src/com/android/car/pm/CarPackageManagerServiceTest.java b/tests/carservice_test/src/com/android/car/pm/CarPackageManagerServiceTest.java
index 8a29b1a..c814c69 100644
--- a/tests/carservice_test/src/com/android/car/pm/CarPackageManagerServiceTest.java
+++ b/tests/carservice_test/src/com/android/car/pm/CarPackageManagerServiceTest.java
@@ -26,7 +26,6 @@
 
 import com.android.car.CarUxRestrictionsManagerService;
 import com.android.car.SystemActivityMonitoringService;
-import com.android.car.user.CarUserService;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -55,15 +54,12 @@
     private CarUxRestrictionsManagerService mMockUxrService;
     @Mock
     private SystemActivityMonitoringService mMockSamService;
-    @Mock
-    private CarUserService mMockUserService;
 
     @Before
     public void setUp() {
         mContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
 
-        mService = new CarPackageManagerService(mContext, mMockUxrService, mMockSamService,
-                mMockUserService);
+        mService = new CarPackageManagerService(mContext, mMockUxrService, mMockSamService);
     }
 
     @Test
diff --git a/tests/carservice_unit_test/src/android/car/BinderInterfaceContainerTest.java b/tests/carservice_unit_test/src/android/car/BinderInterfaceContainerTest.java
new file mode 100644
index 0000000..6c7aa99
--- /dev/null
+++ b/tests/carservice_unit_test/src/android/car/BinderInterfaceContainerTest.java
@@ -0,0 +1,62 @@
+/*
+ * 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.car;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.os.IBinder;
+import android.os.IInterface;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.car.BinderInterfaceContainer;
+import com.android.car.BinderInterfaceContainer.BinderInterface;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public final class BinderInterfaceContainerTest {
+    @Test
+    public void getInterfaces_returnsCopy() {
+        BinderInterfaceContainer<IInterface> container = new BinderInterfaceContainer<>();
+        TestBinderInterface interfaceOne = new TestBinderInterface();
+        container.addBinder(interfaceOne);
+
+        Collection<BinderInterface<IInterface>> interfaces = container.getInterfaces();
+
+        TestBinderInterface interfaceTwo = new TestBinderInterface();
+        container.addBinder(interfaceTwo);
+
+        assertThat(interfaces).hasSize(1);
+        List<BinderInterface<IInterface>> interfaceList = new ArrayList<>(interfaces);
+        assertThat(interfaceList.get(0).binderInterface).isEqualTo(interfaceOne);
+
+        assertThat(container.getInterfaces()).hasSize(2);
+    }
+
+    private final class TestBinderInterface extends android.os.Binder implements IInterface {
+        @Override
+        public IBinder asBinder() {
+            return this;
+        }
+    }
+}
diff --git a/tests/carservice_unit_test/src/android/car/userlib/InitialUserSetterTest.java b/tests/carservice_unit_test/src/android/car/userlib/InitialUserSetterTest.java
index 785cbc4..9fbe5b3 100644
--- a/tests/carservice_unit_test/src/android/car/userlib/InitialUserSetterTest.java
+++ b/tests/carservice_unit_test/src/android/car/userlib/InitialUserSetterTest.java
@@ -338,6 +338,28 @@
     }
 
     @Test
+    public void testCanReplaceGuestUser_NotGuest() {
+        UserInfo user = expectUserExists(USER_ID);
+
+        assertThat(mSetter.canReplaceGuestUser(user)).isFalse();
+    }
+
+    @Test
+    public void testCanReplaceGuestUser_Guest() {
+        UserInfo user = expectGuestExists(USER_ID, /* isEphemeral */true);
+
+        assertThat(mSetter.canReplaceGuestUser(user)).isTrue();
+    }
+
+    @Test
+    public void testCanReplaceGuestUser_GuestLocked() {
+        UserInfo user = expectGuestExists(USER_ID, /* isEphemeral */true);
+        expectUserIsSecure(USER_ID);
+
+        assertThat(mSetter.canReplaceGuestUser(user)).isFalse();
+    }
+
+    @Test
     public void testCreateUser_ok_noflags() throws Exception {
         UserInfo newUser = expectCreateFullUser(USER_ID, "TheDude", NO_FLAGS);
         expectSwitchUser(USER_ID);
@@ -486,6 +508,51 @@
     }
 
     @Test
+    public void testReplaceUser_ok() throws Exception {
+        mockGetCurrentUser(CURRENT_USER_ID);
+        expectGuestExists(CURRENT_USER_ID, /* ephemeral */ true); // ephemeral doesn't matter
+        UserInfo newGuest = expectGuestExists(NEW_USER_ID, /* ephemeral */ true);
+        expectGuestReplaced(CURRENT_USER_ID, newGuest);
+        expectSwitchUser(NEW_USER_ID);
+
+        mSetter.set(new Builder(InitialUserSetter.TYPE_REPLACE_GUEST)
+                .build());
+
+        verifyUserSwitched(NEW_USER_ID);
+        verifyFallbackDefaultBehaviorNeverCalled();
+        verifySystemUserUnlocked();
+        verifyUserDeleted(CURRENT_USER_ID);
+        assertInitialUserSet(newGuest);
+    }
+
+    @Test
+    public void testReplaceUser_fail_cantCreate() throws Exception {
+        mockGetCurrentUser(CURRENT_USER_ID);
+        expectGuestExists(CURRENT_USER_ID, /* ephemeral */ true); // ephemeral doesn't matter
+        expectGuestReplaced(CURRENT_USER_ID, null);
+
+        mSetter.set(new Builder(InitialUserSetter.TYPE_REPLACE_GUEST)
+                .build());
+
+        verifyFallbackDefaultBehaviorCalledFromReaplceUser();
+    }
+
+    @Test
+    public void testReplaceUser_ok_sameUser() throws Exception {
+        mockGetCurrentUser(CURRENT_USER_ID);
+        UserInfo userInfo = expectGuestExists(CURRENT_USER_ID, /* ephemeral */ true);
+        expectGuestReplaced(CURRENT_USER_ID, userInfo);
+
+        mSetter.set(new Builder(InitialUserSetter.TYPE_REPLACE_GUEST)
+                .build());
+
+        verifyUserNeverSwitched();
+        verifyFallbackDefaultBehaviorNeverCalled();
+        verifySystemUserUnlocked();
+        assertInitialUserSet(userInfo);
+    }
+
+    @Test
     public void testDefaultBehavior_firstBoot_ok() throws Exception {
         // no need to mock hasInitialUser(), it will return false by default
         UserInfo newUser = expectCreateFullUser(USER_ID, OWNER_NAME, UserInfo.FLAG_ADMIN);
@@ -858,6 +925,11 @@
         assertInitialUserSet(null);
     }
 
+    private void verifyFallbackDefaultBehaviorCalledFromReaplceUser() {
+        verify(mSetter).fallbackDefaultBehavior(isInitialInfo(false), eq(true), anyString());
+        assertInitialUserSet(null);
+    }
+
     private void verifyFallbackDefaultBehaviorNeverCalled() {
         verifyFallbackDefaultBehaviorNeverCalled(/* supportsOverrideUserIdProperty= */ false);
     }
diff --git a/tests/carservice_unit_test/src/android/car/userlib/UserHelperTest.java b/tests/carservice_unit_test/src/android/car/userlib/UserHelperTest.java
index c372a28..6a94c71 100644
--- a/tests/carservice_unit_test/src/android/car/userlib/UserHelperTest.java
+++ b/tests/carservice_unit_test/src/android/car/userlib/UserHelperTest.java
@@ -16,21 +16,48 @@
 
 package android.car.userlib;
 
+import static android.car.test.util.UserTestingHelper.newUser;
+
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertThrows;
+
 import android.car.test.mocks.AbstractExtendedMockitoTestCase;
+import android.content.Context;
+import android.content.pm.UserInfo;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
 import android.os.UserHandle;
 import android.os.UserManager;
 
+import androidx.test.InstrumentationRegistry;
+
+import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mock;
 
 public final class UserHelperTest extends AbstractExtendedMockitoTestCase {
 
+    @Mock private Context mContext;
+    @Mock private UserManager mUserManager;
+
+    // Not worth to mock because it would need to mock a Drawable used by UserIcons.
+    private final Resources mResources = InstrumentationRegistry.getTargetContext().getResources();
+
     @Override
     protected void onSessionBuilder(CustomMockitoSessionBuilder session) {
         session.spyStatic(UserManager.class);
     }
 
+    @Before
+    public void setUp() {
+        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+        when(mContext.getApplicationContext()).thenReturn(mContext);
+        when(mContext.getResources()).thenReturn(mResources);
+    }
+
     @Test
     public void testSafeName() {
         assertThat(UserHelper.safeName(null)).isNull();
@@ -63,4 +90,57 @@
         mockIsHeadlessSystemUserMode(false);
         assertThat(UserHelper.isHeadlessSystemUser(10)).isFalse();
     }
+
+    @Test
+    public void testDefaultNonAdminRestrictions() {
+        int userId = 20;
+        UserInfo newNonAdmin = newUser(userId);
+
+        UserHelper.setDefaultNonAdminRestrictions(mContext, newNonAdmin, /* enable= */ true);
+
+        verify(mUserManager).setUserRestriction(
+                UserManager.DISALLOW_FACTORY_RESET, /* enable= */ true, UserHandle.of(userId));
+    }
+
+    @Test
+    public void testDefaultNonAdminRestrictions_nullContext_throwsException() {
+        int userId = 20;
+        UserInfo newNonAdmin = newUser(userId);
+
+        assertThrows(IllegalArgumentException.class,
+                () -> UserHelper.setDefaultNonAdminRestrictions(/* context= */ null,
+                        newNonAdmin, /* enable= */ true));
+    }
+
+    @Test
+    public void testDefaultNonAdminRestrictions_nullUser_throwsException() {
+        assertThrows(IllegalArgumentException.class,
+                () -> UserHelper.setDefaultNonAdminRestrictions(mContext, /* user= */
+                        null, /* enable= */ true));
+    }
+
+    @Test
+    public void testAssignDefaultIcon() {
+        int userId = 20;
+        UserInfo newNonAdmin = newUser(userId);
+
+        Bitmap bitmap = UserHelper.assignDefaultIcon(mContext, newNonAdmin);
+
+        verify(mUserManager).setUserIcon(userId, bitmap);
+    }
+
+    @Test
+    public void testAssignDefaultIcon_nullContext_throwsException() {
+        int userId = 20;
+        UserInfo newNonAdmin = newUser(userId);
+
+        assertThrows(IllegalArgumentException.class,
+                () -> UserHelper.assignDefaultIcon(/* context= */ null, newNonAdmin));
+    }
+
+    @Test
+    public void testAssignDefaultIcon_nullUser_throwsException() {
+        assertThrows(IllegalArgumentException.class,
+                () -> UserHelper.assignDefaultIcon(mContext, /* user= */ null));
+    }
 }
diff --git a/tests/carservice_unit_test/src/com/android/car/CarInputServiceTest.java b/tests/carservice_unit_test/src/com/android/car/CarInputServiceTest.java
index cabab88..b038cb6 100644
--- a/tests/carservice_unit_test/src/com/android/car/CarInputServiceTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/CarInputServiceTest.java
@@ -85,6 +85,7 @@
 import org.mockito.junit.MockitoJUnitRunner;
 
 import java.util.BitSet;
+import java.util.function.BooleanSupplier;
 import java.util.function.IntSupplier;
 import java.util.function.Supplier;
 
@@ -100,6 +101,7 @@
     @Mock CarInputService.KeyEventListener mDefaultMainListener;
     @Mock Supplier<String> mLastCallSupplier;
     @Mock IntSupplier mLongPressDelaySupplier;
+    @Mock BooleanSupplier mShouldCallButtonEndOngoingCallSupplier;
 
     @Spy Context mContext = ApplicationProvider.getApplicationContext();
     @Spy Handler mHandler = new Handler(Looper.getMainLooper());
@@ -152,13 +154,16 @@
         mCarUserService = mock(CarUserService.class);
         mCarInputService = new CarInputService(mContext, mInputHalService, mCarUserService,
                 mHandler, mTelecomManager, mAssistUtils, mDefaultMainListener, mLastCallSupplier,
-                /* customInputServiceComponent= */ null, mLongPressDelaySupplier);
+                /* customInputServiceComponent= */ null, mLongPressDelaySupplier,
+                mShouldCallButtonEndOngoingCallSupplier);
 
         when(mInputHalService.isKeyInputSupported()).thenReturn(true);
         mCarInputService.init();
 
         // Delay Handler callbacks until flushHandler() is called.
         doReturn(true).when(mHandler).sendMessageAtTime(any(), anyLong());
+
+        when(mShouldCallButtonEndOngoingCallSupplier.getAsBoolean()).thenReturn(false);
     }
 
     @Test
@@ -446,6 +451,27 @@
     }
 
     @Test
+    public void callKey_shortPress_duringCall_endCallViaCallButtonOn_endsCall() {
+        when(mShouldCallButtonEndOngoingCallSupplier.getAsBoolean()).thenReturn(true);
+        when(mTelecomManager.isInCall()).thenReturn(true);
+
+        send(Key.DOWN, KeyEvent.KEYCODE_CALL, Display.MAIN);
+        send(Key.UP, KeyEvent.KEYCODE_CALL, Display.MAIN);
+
+        verify(mTelecomManager).endCall();
+    }
+
+    @Test
+    public void callKey_shortPress_duringCall_endCallViaCallButtonOff_doesNotEndCall() {
+        when(mTelecomManager.isInCall()).thenReturn(true);
+
+        send(Key.DOWN, KeyEvent.KEYCODE_CALL, Display.MAIN);
+        send(Key.UP, KeyEvent.KEYCODE_CALL, Display.MAIN);
+
+        verify(mTelecomManager, never()).endCall();
+    }
+
+    @Test
     public void callKey_longPress_withoutEventHandler_redialsLastCall() {
         ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
 
@@ -524,6 +550,27 @@
     }
 
     @Test
+    public void callKey_longPress_duringCall_endCallViaCallButtonOn_endsCall() {
+        when(mShouldCallButtonEndOngoingCallSupplier.getAsBoolean()).thenReturn(true);
+        when(mTelecomManager.isInCall()).thenReturn(true);
+
+        send(Key.DOWN, KeyEvent.KEYCODE_CALL, Display.MAIN);
+        flushHandler();
+
+        verify(mTelecomManager).endCall();
+    }
+
+    @Test
+    public void callKey_longPress_duringCall_endCallViaCallButtonOff_doesNotEndCall() {
+        when(mTelecomManager.isInCall()).thenReturn(true);
+
+        send(Key.DOWN, KeyEvent.KEYCODE_CALL, Display.MAIN);
+        flushHandler();
+
+        verify(mTelecomManager, never()).endCall();
+    }
+
+    @Test
     public void callKey_keyDown_withEventHandler_triggersEventHandler() {
         CarProjectionManager.ProjectionKeyEventHandler eventHandler =
                 registerProjectionKeyEventHandler(
@@ -608,7 +655,8 @@
 
         mCarInputService = new CarInputService(mMockContext, mInputHalService, mCarUserService,
                 mHandler, mTelecomManager, mAssistUtils, mDefaultMainListener, mLastCallSupplier,
-                /* customInputServiceComponent= */ null, mLongPressDelaySupplier);
+                /* customInputServiceComponent= */ null, mLongPressDelaySupplier,
+                mShouldCallButtonEndOngoingCallSupplier);
         mCarInputService.init();
     }
 
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 3cbfffc..df2d9bf 100644
--- a/tests/carservice_unit_test/src/com/android/car/CarPowerManagementServiceTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/CarPowerManagementServiceTest.java
@@ -16,9 +16,6 @@
 
 package com.android.car;
 
-import static android.car.test.mocks.CarArgumentMatchers.isUserInfo;
-import static android.car.test.util.UserTestingHelper.newGuestUser;
-
 import static com.android.dx.mockito.inline.extended.ExtendedMockito.doAnswer;
 import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;
 import static com.android.dx.mockito.inline.extended.ExtendedMockito.verify;
@@ -352,33 +349,21 @@
     @Test
     public void testUserSwitchingOnResume_disabledByOEM_nonGuest() throws Exception {
         UserInfo currentUser = setCurrentUser(CURRENT_USER_ID, /* isGuest= */ false);
-        expectNewGuestCreated(CURRENT_USER_ID, currentUser);
+        expectCurrentGuestCanBeReplaced(false);
 
         suspendAndResumeForUserSwitchingTestsWhileDisabledByOem();
 
-        verifyUserNotSwitched();
+        verifyNoSetCall();
     }
 
     @Test
     public void testUserSwitchingOnResume_disabledByOEM_guest() throws Exception {
         setCurrentUser(CURRENT_GUEST_ID, /* isGuest= */ true);
-        UserInfo newGuest = newGuestUser(NEW_GUEST_ID, /* ephemeral= */ true);
-        expectNewGuestCreated(CURRENT_GUEST_ID, newGuest);
+        expectCurrentGuestCanBeReplaced(true);
 
         suspendAndResumeForUserSwitchingTestsWhileDisabledByOem();
 
-        verifyUserSwitched(NEW_GUEST_ID);
-    }
-
-    @Test
-    public void testUserSwitchingOnResume_disabledByOEM_guestReplacementFails() throws Exception {
-        setCurrentUser(CURRENT_GUEST_ID, /* isGuest= */ true);
-        expectNewGuestCreated(CURRENT_GUEST_ID, /* newGuest= */ null);
-
-        suspendAndResumeForUserSwitchingTestsWhileDisabledByOem();
-
-        verifyUserNotSwitched();
-        verifyDefaultInitialUserBehaviorCalled();
+        verifyUserReplaced();
     }
 
     @Test
@@ -622,9 +607,8 @@
         }));
     }
 
-    private void expectNewGuestCreated(int existingGuestId, UserInfo newGuest) {
-        when(mInitialUserSetter.replaceGuestIfNeeded(isUserInfo(existingGuestId)))
-                .thenReturn(newGuest);
+    private void expectCurrentGuestCanBeReplaced(boolean result) {
+        when(mInitialUserSetter.canReplaceGuestUser(notNull())).thenReturn(result);
     }
 
     private void verifyDefaultInitialUserBehaviorCalled() {
@@ -649,6 +633,16 @@
         }));
     }
 
+    private void verifyUserReplaced() {
+        verify(mInitialUserSetter).set(argThat((info) -> {
+            return info.type == InitialUserSetter.TYPE_REPLACE_GUEST;
+        }));
+    }
+
+    private void verifyNoSetCall() {
+        verify(mInitialUserSetter, never()).set(notNull());
+    }
+
     private static final class MockDisplayInterface implements DisplayInterface {
         private boolean mDisplayOn = true;
         private final Semaphore mDisplayStateWait = new Semaphore(0);
diff --git a/tests/carservice_unit_test/src/com/android/car/am/FixedActivityServiceTest.java b/tests/carservice_unit_test/src/com/android/car/am/FixedActivityServiceTest.java
index 6d1cc76..c3f57ad 100644
--- a/tests/carservice_unit_test/src/com/android/car/am/FixedActivityServiceTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/am/FixedActivityServiceTest.java
@@ -23,6 +23,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -33,6 +34,7 @@
 import android.app.ActivityManager.StackInfo;
 import android.app.ActivityOptions;
 import android.app.IActivityManager;
+import android.app.IActivityTaskManager;
 import android.app.TaskStackListener;
 import android.car.hardware.power.CarPowerManager;
 import android.car.test.mocks.AbstractExtendedMockitoTestCase;
@@ -78,6 +80,8 @@
     @Mock
     private IActivityManager mActivityManager;
     @Mock
+    private IActivityTaskManager mActivityTaskManager;
+    @Mock
     private UserManager mUserManager;
     @Mock
     private DisplayManager mDisplayManager;
@@ -102,8 +106,8 @@
         when(mContext.getPackageManager()).thenReturn(mPackageManager);
         doReturn(mCarUserService).when(() -> CarLocalServices.getService(CarUserService.class));
         doReturn(mCarPowerManager).when(() -> CarLocalServices.createCarPowerManager(mContext));
-        mFixedActivityService = new FixedActivityService(mContext, mActivityManager, mUserManager,
-                mDisplayManager);
+        mFixedActivityService = new FixedActivityService(mContext, mActivityManager,
+                mActivityTaskManager, mUserManager, mDisplayManager);
     }
 
     @After
@@ -142,7 +146,7 @@
         mockAmGetCurrentUser(userId);
         expectActivityStackInfo(
                 createEmptyStackInfo(),
-                createStackInfo(intent, userIds, mValidDisplayId, taskIds)
+                createStackInfoList(intent, userIds, mValidDisplayId, taskIds)
         );
 
         // No running activities
@@ -172,7 +176,7 @@
         mockAmGetCurrentUser(userId);
         expectActivityStackInfo(
                 createEmptyStackInfo(),
-                createStackInfo(intent, userIds, mValidDisplayId, taskIds)
+                createStackInfoList(intent, userIds, mValidDisplayId, taskIds)
         );
 
         // No running activities
@@ -202,7 +206,7 @@
         mockAmGetCurrentUser(userId);
         expectActivityStackInfo(
                 createEmptyStackInfo(),
-                createStackInfo(intent, userIds, mValidDisplayId, taskIds)
+                createStackInfoList(intent, userIds, mValidDisplayId, taskIds)
         );
 
         // No running activities
@@ -219,7 +223,7 @@
         int appId = 987;
         BroadcastReceiver receiver = receiverCaptor.getValue();
         Intent packageIntent = new Intent(Intent.ACTION_PACKAGE_CHANGED);
-        packageIntent.setData(new Uri.Builder().path(packageName).build());
+        packageIntent.setData(new Uri.Builder().path("Any package").build());
         packageIntent.putExtra(Intent.EXTRA_UID, UserHandle.getUid(userId, appId));
         receiver.onReceive(mContext, packageIntent);
         verify(mContext).startActivityAsUser(eq(intent), any(Bundle.class),
@@ -323,6 +327,88 @@
         verify(mActivityManager, never()).unregisterTaskStackListener(any(TaskStackListener.class));
     }
 
+    @Test
+    public void testHandleTaskFocusChanged_returnForcusBack() throws Exception {
+        int userId = 10;
+        int testTaskId = 1234;
+        int[] userIds = new int[]{userId};
+        int[] taskIds = new int[]{testTaskId};
+        ActivityOptions options = new ActivityOptions(new Bundle());
+        Intent intent = expectComponentAvailable("test_package", "com.test.dude", userId);
+        mockAmGetCurrentUser(userId);
+        expectActivityStackInfo(createStackInfoList(intent, userIds, mValidDisplayId, taskIds));
+
+        // Make FixedActivityService to update the taskIds.
+        boolean ret = mFixedActivityService.startFixedActivityModeForDisplayAndUser(intent,
+                options, mValidDisplayId, userId);
+        assertThat(ret).isTrue();
+
+        Intent homeIntent = expectComponentAvailable("home", "homeActivity", userId);
+        int homeTaskId = 4567;
+        when(mActivityTaskManager.getAllStackInfosOnDisplay(Display.DEFAULT_DISPLAY)).thenReturn(
+                createStackInfoList(
+                        homeIntent, userIds, Display.DEFAULT_DISPLAY, new int[]{homeTaskId}));
+
+        mFixedActivityService.handleTaskFocusChanged(testTaskId, true);
+
+        verify(mActivityTaskManager).setFocusedTask(homeTaskId);
+    }
+
+    // If there are two tasks in one display id, then there is a bug to invalidate
+    // RunningActivityInfo.taskId examining 2nd task and it prevents from checking FixedActivity
+    // in handleTaskFocusChanged(). This test makes sure if the bug doesn't exist.
+    @Test
+    public void testHandleTaskFocusChanged_returnForcusBackInTwoStackInfos() throws Exception {
+        int userId = 10;
+        int testTaskId = 1234;
+        int[] userIds = new int[]{userId};
+        int[] taskIds = new int[]{testTaskId};
+        int[] taskIds2 = new int[]{testTaskId + 1111};
+        ActivityOptions options = new ActivityOptions(new Bundle());
+        Intent intent = expectComponentAvailable("test_package", "com.test.dude", userId);
+        Intent intent2 = expectComponentAvailable("test_package2", "com.test.others", userId);
+        mockAmGetCurrentUser(userId);
+        expectActivityStackInfo(Arrays.asList(
+                createStackInfo(intent, userIds, mValidDisplayId, taskIds),
+                createStackInfo(intent2, userIds, mValidDisplayId, taskIds2)));
+
+        // Make FixedActivityService to update the taskIds.
+        boolean ret = mFixedActivityService.startFixedActivityModeForDisplayAndUser(intent,
+                options, mValidDisplayId, userId);
+        assertThat(ret).isTrue();
+
+        Intent homeIntent = expectComponentAvailable("home", "homeActivity", userId);
+        int homeTaskId = 4567;
+        when(mActivityTaskManager.getAllStackInfosOnDisplay(Display.DEFAULT_DISPLAY)).thenReturn(
+                createStackInfoList(
+                        homeIntent, userIds, Display.DEFAULT_DISPLAY, new int[]{homeTaskId}));
+
+        mFixedActivityService.handleTaskFocusChanged(testTaskId, true);
+
+        verify(mActivityTaskManager).setFocusedTask(homeTaskId);
+    }
+
+    @Test
+    public void testHandleTaskFocusChanged_noForcusBack() throws Exception {
+        int userId = 10;
+        int testTaskId = 1234;
+        int[] userIds = new int[]{userId};
+        int[] taskIds = new int[]{testTaskId};
+        ActivityOptions options = new ActivityOptions(new Bundle());
+        Intent intent = expectComponentAvailable("test_package", "com.test.dude", userId);
+        mockAmGetCurrentUser(userId);
+        expectActivityStackInfo(createStackInfoList(intent, userIds, mValidDisplayId, taskIds));
+
+        // Make FixedActivityService to update the taskIds.
+        boolean ret = mFixedActivityService.startFixedActivityModeForDisplayAndUser(intent,
+                options, mValidDisplayId, userId);
+        assertThat(ret).isTrue();
+
+        mFixedActivityService.handleTaskFocusChanged(testTaskId + 1, true);
+
+        verify(mActivityTaskManager, never()).setFocusedTask(anyInt());
+    }
+
     private void expectNoProfileUser(@UserIdInt int userId) {
         when(mUserManager.getEnabledProfileIds(userId)).thenReturn(new int[0]);
     }
@@ -371,7 +457,7 @@
         return new ArrayList<StackInfo>();
     }
 
-    private List<StackInfo> createStackInfo(Intent intent, @UserIdInt int[] userIds, int displayId,
+    private StackInfo createStackInfo(Intent intent, @UserIdInt int[] userIds, int displayId,
             int[] taskIds) {
         StackInfo stackInfo = new StackInfo();
         stackInfo.taskUserIds = userIds;
@@ -379,6 +465,11 @@
         stackInfo.visible = true;
         stackInfo.displayId = displayId;
         stackInfo.taskIds = taskIds;
-        return Arrays.asList(stackInfo);
+        return stackInfo;
+    }
+
+    private List<StackInfo> createStackInfoList(Intent intent, @UserIdInt int[] userIds,
+            int displayId, int[] taskIds) {
+        return Arrays.asList(createStackInfo(intent, userIds, displayId, taskIds));
     }
 }
diff --git a/tests/carservice_unit_test/src/com/android/car/user/CarUserServiceTest.java b/tests/carservice_unit_test/src/com/android/car/user/CarUserServiceTest.java
index b339c9a..76b7344 100644
--- a/tests/carservice_unit_test/src/com/android/car/user/CarUserServiceTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/user/CarUserServiceTest.java
@@ -710,14 +710,22 @@
     }
 
     @Test
-    public void testRemoveUser_lastAdminUser() throws Exception {
-        mockCurrentUser(mRegularUser);
-        mockExistingUsers(mExistingUsers);
+    public void testRemoveUser_LastAdminUser_success() throws Exception {
+        List<UserInfo> existingUsers =
+                new ArrayList<UserInfo>(Arrays.asList(mAdminUser, mGuestUser, mRegularUser));
+        UserInfo currentUser = mRegularUser;
+        mockExistingUsersAndCurrentUser(existingUsers, currentUser);
+        UserInfo removeUser = mAdminUser;
+        doAnswer((invocation) -> {
+            existingUsers.remove(removeUser);
+            return true;
+        }).when(mMockedUserManager).removeUser(eq(removeUser.id));
 
         UserRemovalResult result = mCarUserService.removeUser(mAdminUser.id);
 
         assertThat(result.getStatus())
-                .isEqualTo(UserRemovalResult.STATUS_TARGET_USER_IS_LAST_ADMIN_USER);
+                .isEqualTo(UserRemovalResult.STATUS_SUCCESSFUL_LAST_ADMIN_REMOVED);
+        assertHalRemove(currentUser, removeUser, existingUsers);
     }
 
     @Test
diff --git a/tests/carservice_unit_test/src/com/android/car/watchdog/CarWatchdogManagerUnitTest.java b/tests/carservice_unit_test/src/com/android/car/watchdog/CarWatchdogManagerUnitTest.java
index ce51364..e6b6ca4 100644
--- a/tests/carservice_unit_test/src/com/android/car/watchdog/CarWatchdogManagerUnitTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/watchdog/CarWatchdogManagerUnitTest.java
@@ -25,9 +25,9 @@
 import static org.mockito.Mockito.when;
 import static org.testng.Assert.assertThrows;
 
-import android.automotive.watchdog.ICarWatchdogClient;
 import android.car.Car;
 import android.car.watchdog.CarWatchdogManager;
+import android.car.watchdog.ICarWatchdogServiceCallback;
 import android.content.Context;
 import android.os.Handler;
 import android.os.IBinder;
@@ -70,11 +70,11 @@
     @Test
     public void testRegisterClient() throws Exception {
         TestClient client = new TestClient();
-        ICarWatchdogClient clientImpl = registerClient(client);
+        ICarWatchdogServiceCallback clientImpl = registerClient(client);
         mCarWatchdogManager.unregisterClient(client);
         verify(mService).unregisterClient(clientImpl);
 
-        clientImpl.checkIfAlive(123456, TIMEOUT_CRITICAL);
+        clientImpl.onCheckHealthStatus(123456, TIMEOUT_CRITICAL);
         verify(mService, never()).tellClientAlive(clientImpl, 123456);
     }
 
@@ -111,10 +111,11 @@
         testClientResponse(new ReturnAndPongClient());
     }
 
-    private ICarWatchdogClient registerClient(CarWatchdogManager.CarWatchdogClientCallback client) {
+    private ICarWatchdogServiceCallback registerClient(
+            CarWatchdogManager.CarWatchdogClientCallback client) {
         mCarWatchdogManager.registerClient(mExecutor, client, TIMEOUT_CRITICAL);
-        ArgumentCaptor<ICarWatchdogClient> clientImplCaptor =
-                ArgumentCaptor.forClass(ICarWatchdogClient.class);
+        ArgumentCaptor<ICarWatchdogServiceCallback> clientImplCaptor =
+                ArgumentCaptor.forClass(ICarWatchdogServiceCallback.class);
 
         verify(mService).registerClient(clientImplCaptor.capture(), eq(TIMEOUT_CRITICAL));
         return clientImplCaptor.getValue();
@@ -122,8 +123,8 @@
 
     private void testClientResponse(CarWatchdogManager.CarWatchdogClientCallback client)
             throws Exception {
-        ICarWatchdogClient clientImpl = registerClient(client);
-        clientImpl.checkIfAlive(123456, TIMEOUT_CRITICAL);
+        ICarWatchdogServiceCallback clientImpl = registerClient(client);
+        clientImpl.onCheckHealthStatus(123456, TIMEOUT_CRITICAL);
         verify(mService, timeout(MAX_WAIT_TIME_MS)).tellClientAlive(clientImpl, 123456);
     }
 
diff --git a/tests/carservice_unit_test/src/com/android/car/watchdog/CarWatchdogServiceUnitTest.java b/tests/carservice_unit_test/src/com/android/car/watchdog/CarWatchdogServiceUnitTest.java
index 99b6011..b1b04bb 100644
--- a/tests/carservice_unit_test/src/com/android/car/watchdog/CarWatchdogServiceUnitTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/watchdog/CarWatchdogServiceUnitTest.java
@@ -33,6 +33,7 @@
 import android.automotive.watchdog.ICarWatchdog;
 import android.automotive.watchdog.ICarWatchdogClient;
 import android.car.test.mocks.AbstractExtendedMockitoTestCase;
+import android.car.watchdog.ICarWatchdogServiceCallback;
 import android.content.Context;
 import android.content.pm.UserInfo;
 import android.os.IBinder;
@@ -159,27 +160,17 @@
         assertThat(notRespondingClients.getValue().length).isEqualTo(badClientCount);
     }
 
-    private class TestClient extends ICarWatchdogClient.Stub {
+    private class TestClient extends ICarWatchdogServiceCallback.Stub {
         protected int mLastSessionId = INVALID_SESSION_ID;
 
         @Override
-        public void checkIfAlive(int sessionId, int timeout) {
+        public void onCheckHealthStatus(int sessionId, int timeout) {
             mLastSessionId = sessionId;
             mCarWatchdogService.tellClientAlive(this, sessionId);
         }
 
         @Override
-        public void prepareProcessTermination() {}
-
-        @Override
-        public int getInterfaceVersion() {
-            return this.VERSION;
-        }
-
-        @Override
-        public String getInterfaceHash() {
-            return this.HASH;
-        }
+        public void onPrepareProcessTermination() {}
 
         public int getLastSessionId() {
             return mLastSessionId;
@@ -188,7 +179,7 @@
 
     private final class BadTestClient extends TestClient {
         @Override
-        public void checkIfAlive(int sessionId, int timeout) {
+        public void onCheckHealthStatus(int sessionId, int timeout) {
             mLastSessionId = sessionId;
             // This client doesn't respond to CarWatchdogService.
         }
diff --git a/tools/emulator/README.md b/tools/emulator/README.md
new file mode 100644
index 0000000..45708f8
--- /dev/null
+++ b/tools/emulator/README.md
@@ -0,0 +1,84 @@
+# VHAL Host Emulator
+This is a collection of python modules as tools for VHAL development.
+
+[TOC]
+
+## vhal_emulator.py
+This allow you to create script to interate with the Vehicle HAL in an AAOS
+device from a host.
+
+*   It sends and receives messages to/from the Vehicle HAL via port forwarding
+over ADB to communicate with the AAOS device.
+*   On the device side, VHAL module VehicleService creates VehicleEmulator to
+setup SocketComm to serve the requests.
+    *   hardware/interfaces/automotive/vehicle/2.0/default/VehicleService.cpp
+    *   hardware/interfaces/automotive/vehicle/2.0/default/impl/vhal_v2_0/VehicleEmulator.cpp
+    *   hardware/interfaces/automotive/vehicle/2.0/default/impl/vhal_v2_0/SocketComm.cpp
+*   vhal_emulator_test.py tests the Vehicle HAL via adb socket.
+    * Note: This may outdated becuase there is no dedicated resrouce. Contribution is welcome.
+
+## vhal_const_generate.py
+This generates vhal_consts_2_0.py to update definitions for property ID, value
+type, zone, etc. from the types.hal. Run this script whenever types.hal is
+changed.
+
+*   Must re-generate when the types.hal file changes.
+
+```
+packages/services/Car/tools/emulator/vhal_const_generate.py
+```
+
+*   hardware/interfaces/automotive/vehicle/2.0/types.hal
+
+## VehicleHalProto_pb2.py
+This defines message interface to VHAL Emulator from VehicleHalProto.proto.
+
+*   Must re-generate whenever the proto file changes.
+*   Generated from hardware/interfaces/automotive/vehicle/2.0/default/impl/vhal_v2_0/proto/VehicleHalProto.proto
+
+```
+protoDir=$ANDROID_BUILD_TOP/hardware/interfaces/automotive/vehicle/2.0/default/impl/vhal_v2_0/proto
+outDir=$ANDROID_BUILD_TOP/packages/services/Car/tools/emulator
+# or protoc if perferred
+aprotoc -I=$protoDir --python_out=$outDir $protoDir/VehicleHalProto.proto
+
+```
+
+*    It requires Protocol Buffers. You may build one from Android, e.g.
+
+```
+. build/envsetup.sh
+lunch sdk_gcar_x86-userdebug
+m aprotoc -j16
+```
+
+
+## OBD2 Diagnostic Injector
+These scripts are useful for testing the Diagnostics API
+
+### diagnostic_builder.py
+
+*   Helper class used by diagnostic_injector.py
+*   Stores diagnostic sensor values and bitmasks
+*   VehiclePropValue-compatible
+
+### diagnostic_injector.py
+
+*   Deserializes JSON into diagnostic events
+*   Sends over HAL Emulator Interface
+*   Diagnostic JSON Format example: diagjson.example
+
+```
+./diagnostic_injector.py ./diagjson.example
+```
+
+## Python GUI Example
+gui.py is an example to create an GUI to set the property.
+
+*   packages/services/Car/tools/emulator/gui.py
+*   GUI runs on host machine (PyQt4-based widgets)
+*   Drives VHAL on target
+    *   Works only with default VHAL
+    *   Interactions generate SET messages
+*   Supports bench testing of apps
+*   Easy to add support for more properties
diff --git a/tools/emulator/vhal_consts_2_0.py b/tools/emulator/vhal_consts_2_0.py
index d4e3b61..12857b9 100644
--- a/tools/emulator/vhal_consts_2_0.py
+++ b/tools/emulator/vhal_consts_2_0.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 The Android Open Source Project
+# 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.
@@ -15,283 +15,6 @@
 # DO NOT EDIT MANUALLY
 # This file was autogenerated by vhal_const_generate.py
 
-# VehicleUnit
-VEHICLEUNIT_SHOULD_NOT_USE = 0x0
-VEHICLEUNIT_METER_PER_SEC = 0x1
-VEHICLEUNIT_RPM = 0x2
-VEHICLEUNIT_HERTZ = 0x3
-VEHICLEUNIT_PERCENTILE = 0x10
-VEHICLEUNIT_MILLIMETER = 0x20
-VEHICLEUNIT_METER = 0x21
-VEHICLEUNIT_KILOMETER = 0x23
-VEHICLEUNIT_MILE = 0x24
-VEHICLEUNIT_CELSIUS = 0x30
-VEHICLEUNIT_FAHRENHEIT = 0x31
-VEHICLEUNIT_KELVIN = 0x32
-VEHICLEUNIT_MILLILITER = 0x40
-VEHICLEUNIT_LITER = 0x41
-VEHICLEUNIT_GALLON = 0x42
-VEHICLEUNIT_US_GALLON = 0x42
-VEHICLEUNIT_IMPERIAL_GALLON = 0x43
-VEHICLEUNIT_NANO_SECS = 0x50
-VEHICLEUNIT_SECS = 0x53
-VEHICLEUNIT_YEAR = 0x59
-VEHICLEUNIT_WATT_HOUR = 0x60
-VEHICLEUNIT_MILLIAMPERE = 0x61
-VEHICLEUNIT_MILLIVOLT = 0x62
-VEHICLEUNIT_MILLIWATTS = 0x63
-VEHICLEUNIT_AMPERE_HOURS = 0x64
-VEHICLEUNIT_KILOWATT_HOUR = 0x65
-VEHICLEUNIT_KILOPASCAL = 0x70
-VEHICLEUNIT_PSI = 0x71
-VEHICLEUNIT_BAR = 0x72
-VEHICLEUNIT_DEGREES = 0x80
-VEHICLEUNIT_MILES_PER_HOUR = 0x90
-VEHICLEUNIT_KILOMETERS_PER_HOUR = 0x91
-
-# VehicleLightSwitch
-VEHICLELIGHTSWITCH_OFF = 0x0
-VEHICLELIGHTSWITCH_ON = 0x1
-VEHICLELIGHTSWITCH_DAYTIME_RUNNING = 0x2
-VEHICLELIGHTSWITCH_AUTOMATIC = 0x100
-
-# VmsMessageWithLayerIntegerValuesIndex
-VMSMESSAGEWITHLAYERINTEGERVALUESINDEX_LAYER_TYPE = 0x1
-VMSMESSAGEWITHLAYERINTEGERVALUESINDEX_LAYER_SUBTYPE = 0x2
-VMSMESSAGEWITHLAYERINTEGERVALUESINDEX_LAYER_VERSION = 0x3
-
-# VehiclePropertyGroup
-VEHICLEPROPERTYGROUP_SYSTEM = 0x10000000
-VEHICLEPROPERTYGROUP_VENDOR = 0x20000000
-VEHICLEPROPERTYGROUP_MASK = 0xf0000000
-
-# VehicleApPowerStateShutdownParam
-VEHICLEAPPOWERSTATESHUTDOWNPARAM_SHUTDOWN_IMMEDIATELY = 0x1
-VEHICLEAPPOWERSTATESHUTDOWNPARAM_CAN_SLEEP = 0x2
-VEHICLEAPPOWERSTATESHUTDOWNPARAM_SHUTDOWN_ONLY = 0x3
-
-# Obd2CommonIgnitionMonitors
-OBD2COMMONIGNITIONMONITORS_COMPONENTS_AVAILABLE = 0x1
-OBD2COMMONIGNITIONMONITORS_COMPONENTS_INCOMPLETE = 0x2
-OBD2COMMONIGNITIONMONITORS_FUEL_SYSTEM_AVAILABLE = 0x4
-OBD2COMMONIGNITIONMONITORS_FUEL_SYSTEM_INCOMPLETE = 0x8
-OBD2COMMONIGNITIONMONITORS_MISFIRE_AVAILABLE = 0x10
-OBD2COMMONIGNITIONMONITORS_MISFIRE_INCOMPLETE = 0x20
-
-# PortLocationType
-PORTLOCATIONTYPE_UNKNOWN = 0x0
-PORTLOCATIONTYPE_FRONT_LEFT = 0x1
-PORTLOCATIONTYPE_FRONT_RIGHT = 0x2
-PORTLOCATIONTYPE_REAR_RIGHT = 0x3
-PORTLOCATIONTYPE_REAR_LEFT = 0x4
-PORTLOCATIONTYPE_FRONT = 0x5
-PORTLOCATIONTYPE_REAR = 0x6
-
-# Obd2SparkIgnitionMonitors
-OBD2SPARKIGNITIONMONITORS_EGR_AVAILABLE = 0x40
-OBD2SPARKIGNITIONMONITORS_EGR_INCOMPLETE = 0x80
-OBD2SPARKIGNITIONMONITORS_OXYGEN_SENSOR_HEATER_AVAILABLE = 0x100
-OBD2SPARKIGNITIONMONITORS_OXYGEN_SENSOR_HEATER_INCOMPLETE = 0x200
-OBD2SPARKIGNITIONMONITORS_OXYGEN_SENSOR_AVAILABLE = 0x400
-OBD2SPARKIGNITIONMONITORS_OXYGEN_SENSOR_INCOMPLETE = 0x800
-OBD2SPARKIGNITIONMONITORS_AC_REFRIGERANT_AVAILABLE = 0x1000
-OBD2SPARKIGNITIONMONITORS_AC_REFRIGERANT_INCOMPLETE = 0x2000
-OBD2SPARKIGNITIONMONITORS_SECONDARY_AIR_SYSTEM_AVAILABLE = 0x4000
-OBD2SPARKIGNITIONMONITORS_SECONDARY_AIR_SYSTEM_INCOMPLETE = 0x8000
-OBD2SPARKIGNITIONMONITORS_EVAPORATIVE_SYSTEM_AVAILABLE = 0x10000
-OBD2SPARKIGNITIONMONITORS_EVAPORATIVE_SYSTEM_INCOMPLETE = 0x20000
-OBD2SPARKIGNITIONMONITORS_HEATED_CATALYST_AVAILABLE = 0x40000
-OBD2SPARKIGNITIONMONITORS_HEATED_CATALYST_INCOMPLETE = 0x80000
-OBD2SPARKIGNITIONMONITORS_CATALYST_AVAILABLE = 0x100000
-OBD2SPARKIGNITIONMONITORS_CATALYST_INCOMPLETE = 0x200000
-
-# VmsSubscriptionsStateIntegerValuesIndex
-VMSSUBSCRIPTIONSSTATEINTEGERVALUESINDEX_SEQUENCE_NUMBER = 0x1
-VMSSUBSCRIPTIONSSTATEINTEGERVALUESINDEX_NUMBER_OF_LAYERS = 0x2
-VMSSUBSCRIPTIONSSTATEINTEGERVALUESINDEX_NUMBER_OF_ASSOCIATED_LAYERS = 0x3
-VMSSUBSCRIPTIONSSTATEINTEGERVALUESINDEX_SUBSCRIPTIONS_START = 0x4
-
-# VehicleApPowerStateReq
-VEHICLEAPPOWERSTATEREQ_ON = 0x0
-VEHICLEAPPOWERSTATEREQ_SHUTDOWN_PREPARE = 0x1
-VEHICLEAPPOWERSTATEREQ_CANCEL_SHUTDOWN = 0x2
-VEHICLEAPPOWERSTATEREQ_FINISHED = 0x3
-
-# VehicleApPowerStateReqIndex
-VEHICLEAPPOWERSTATEREQINDEX_STATE = 0x0
-VEHICLEAPPOWERSTATEREQINDEX_ADDITIONAL = 0x1
-
-# Obd2IgnitionMonitorKind
-OBD2IGNITIONMONITORKIND_SPARK = 0x0
-OBD2IGNITIONMONITORKIND_COMPRESSION = 0x1
-
-# VehiclePropertyAccess
-VEHICLEPROPERTYACCESS_NONE = 0x0
-VEHICLEPROPERTYACCESS_READ = 0x1
-VEHICLEPROPERTYACCESS_WRITE = 0x2
-VEHICLEPROPERTYACCESS_READ_WRITE = 0x3
-
-# VehicleOilLevel
-VEHICLEOILLEVEL_CRITICALLY_LOW = 0x0
-VEHICLEOILLEVEL_LOW = 0x1
-VEHICLEOILLEVEL_NORMAL = 0x2
-VEHICLEOILLEVEL_HIGH = 0x3
-VEHICLEOILLEVEL_ERROR = 0x4
-
-# VmsBaseMessageIntegerValuesIndex
-VMSBASEMESSAGEINTEGERVALUESINDEX_MESSAGE_TYPE = 0x0
-
-# StatusCode
-STATUSCODE_OK = 0x0
-STATUSCODE_TRY_AGAIN = 0x1
-STATUSCODE_INVALID_ARG = 0x2
-STATUSCODE_NOT_AVAILABLE = 0x3
-STATUSCODE_ACCESS_DENIED = 0x4
-STATUSCODE_INTERNAL_ERROR = 0x5
-
-# VehicleLightState
-VEHICLELIGHTSTATE_OFF = 0x0
-VEHICLELIGHTSTATE_ON = 0x1
-VEHICLELIGHTSTATE_DAYTIME_RUNNING = 0x2
-
-# VmsStartSessionMessageIntegerValuesIndex
-VMSSTARTSESSIONMESSAGEINTEGERVALUESINDEX_SERVICE_ID = 0x1
-VMSSTARTSESSIONMESSAGEINTEGERVALUESINDEX_CLIENT_ID = 0x2
-
-# VmsPublisherInformationIntegerValuesIndex
-VMSPUBLISHERINFORMATIONINTEGERVALUESINDEX_PUBLISHER_ID = 0x1
-
-# VehiclePropertyChangeMode
-VEHICLEPROPERTYCHANGEMODE_STATIC = 0x0
-VEHICLEPROPERTYCHANGEMODE_ON_CHANGE = 0x1
-VEHICLEPROPERTYCHANGEMODE_CONTINUOUS = 0x2
-
-# VmsMessageType
-VMSMESSAGETYPE_SUBSCRIBE = 0x1
-VMSMESSAGETYPE_SUBSCRIBE_TO_PUBLISHER = 0x2
-VMSMESSAGETYPE_UNSUBSCRIBE = 0x3
-VMSMESSAGETYPE_UNSUBSCRIBE_TO_PUBLISHER = 0x4
-VMSMESSAGETYPE_OFFERING = 0x5
-VMSMESSAGETYPE_AVAILABILITY_REQUEST = 0x6
-VMSMESSAGETYPE_SUBSCRIPTIONS_REQUEST = 0x7
-VMSMESSAGETYPE_AVAILABILITY_RESPONSE = 0x8
-VMSMESSAGETYPE_AVAILABILITY_CHANGE = 0x9
-VMSMESSAGETYPE_SUBSCRIPTIONS_RESPONSE = 0xa
-VMSMESSAGETYPE_SUBSCRIPTIONS_CHANGE = 0xb
-VMSMESSAGETYPE_DATA = 0xc
-VMSMESSAGETYPE_PUBLISHER_ID_REQUEST = 0xd
-VMSMESSAGETYPE_PUBLISHER_ID_RESPONSE = 0xe
-VMSMESSAGETYPE_PUBLISHER_INFORMATION_REQUEST = 0xf
-VMSMESSAGETYPE_PUBLISHER_INFORMATION_RESPONSE = 0x10
-VMSMESSAGETYPE_START_SESSION = 0x11
-VMSMESSAGETYPE_LAST_VMS_MESSAGE_TYPE = 0x11
-
-# DiagnosticIntegerSensorIndex
-DIAGNOSTICINTEGERSENSORINDEX_FUEL_SYSTEM_STATUS = 0x0
-DIAGNOSTICINTEGERSENSORINDEX_MALFUNCTION_INDICATOR_LIGHT_ON = 0x1
-DIAGNOSTICINTEGERSENSORINDEX_IGNITION_MONITORS_SUPPORTED = 0x2
-DIAGNOSTICINTEGERSENSORINDEX_IGNITION_SPECIFIC_MONITORS = 0x3
-DIAGNOSTICINTEGERSENSORINDEX_INTAKE_AIR_TEMPERATURE = 0x4
-DIAGNOSTICINTEGERSENSORINDEX_COMMANDED_SECONDARY_AIR_STATUS = 0x5
-DIAGNOSTICINTEGERSENSORINDEX_NUM_OXYGEN_SENSORS_PRESENT = 0x6
-DIAGNOSTICINTEGERSENSORINDEX_RUNTIME_SINCE_ENGINE_START = 0x7
-DIAGNOSTICINTEGERSENSORINDEX_DISTANCE_TRAVELED_WITH_MALFUNCTION_INDICATOR_LIGHT_ON = 0x8
-DIAGNOSTICINTEGERSENSORINDEX_WARMUPS_SINCE_CODES_CLEARED = 0x9
-DIAGNOSTICINTEGERSENSORINDEX_DISTANCE_TRAVELED_SINCE_CODES_CLEARED = 0xa
-DIAGNOSTICINTEGERSENSORINDEX_ABSOLUTE_BAROMETRIC_PRESSURE = 0xb
-DIAGNOSTICINTEGERSENSORINDEX_CONTROL_MODULE_VOLTAGE = 0xc
-DIAGNOSTICINTEGERSENSORINDEX_AMBIENT_AIR_TEMPERATURE = 0xd
-DIAGNOSTICINTEGERSENSORINDEX_TIME_WITH_MALFUNCTION_LIGHT_ON = 0xe
-DIAGNOSTICINTEGERSENSORINDEX_TIME_SINCE_TROUBLE_CODES_CLEARED = 0xf
-DIAGNOSTICINTEGERSENSORINDEX_MAX_FUEL_AIR_EQUIVALENCE_RATIO = 0x10
-DIAGNOSTICINTEGERSENSORINDEX_MAX_OXYGEN_SENSOR_VOLTAGE = 0x11
-DIAGNOSTICINTEGERSENSORINDEX_MAX_OXYGEN_SENSOR_CURRENT = 0x12
-DIAGNOSTICINTEGERSENSORINDEX_MAX_INTAKE_MANIFOLD_ABSOLUTE_PRESSURE = 0x13
-DIAGNOSTICINTEGERSENSORINDEX_MAX_AIR_FLOW_RATE_FROM_MASS_AIR_FLOW_SENSOR = 0x14
-DIAGNOSTICINTEGERSENSORINDEX_FUEL_TYPE = 0x15
-DIAGNOSTICINTEGERSENSORINDEX_FUEL_RAIL_ABSOLUTE_PRESSURE = 0x16
-DIAGNOSTICINTEGERSENSORINDEX_ENGINE_OIL_TEMPERATURE = 0x17
-DIAGNOSTICINTEGERSENSORINDEX_DRIVER_DEMAND_PERCENT_TORQUE = 0x18
-DIAGNOSTICINTEGERSENSORINDEX_ENGINE_ACTUAL_PERCENT_TORQUE = 0x19
-DIAGNOSTICINTEGERSENSORINDEX_ENGINE_REFERENCE_PERCENT_TORQUE = 0x1a
-DIAGNOSTICINTEGERSENSORINDEX_ENGINE_PERCENT_TORQUE_DATA_IDLE = 0x1b
-DIAGNOSTICINTEGERSENSORINDEX_ENGINE_PERCENT_TORQUE_DATA_POINT1 = 0x1c
-DIAGNOSTICINTEGERSENSORINDEX_ENGINE_PERCENT_TORQUE_DATA_POINT2 = 0x1d
-DIAGNOSTICINTEGERSENSORINDEX_ENGINE_PERCENT_TORQUE_DATA_POINT3 = 0x1e
-DIAGNOSTICINTEGERSENSORINDEX_ENGINE_PERCENT_TORQUE_DATA_POINT4 = 0x1f
-DIAGNOSTICINTEGERSENSORINDEX_LAST_SYSTEM_INDEX = 0x1f
-
-# VmsMessageWithLayerAndPublisherIdIntegerValuesIndex
-VMSMESSAGEWITHLAYERANDPUBLISHERIDINTEGERVALUESINDEX_PUBLISHER_ID = 0x4
-
-# VmsOfferingMessageIntegerValuesIndex
-VMSOFFERINGMESSAGEINTEGERVALUESINDEX_PUBLISHER_ID = 0x1
-VMSOFFERINGMESSAGEINTEGERVALUESINDEX_NUMBER_OF_OFFERS = 0x2
-VMSOFFERINGMESSAGEINTEGERVALUESINDEX_OFFERING_START = 0x3
-
-# VehicleApPowerStateConfigFlag
-VEHICLEAPPOWERSTATECONFIGFLAG_ENABLE_DEEP_SLEEP_FLAG = 0x1
-VEHICLEAPPOWERSTATECONFIGFLAG_CONFIG_SUPPORT_TIMER_POWER_ON_FLAG = 0x2
-
-# FuelType
-FUELTYPE_FUEL_TYPE_UNKNOWN = 0x0
-FUELTYPE_FUEL_TYPE_UNLEADED = 0x1
-FUELTYPE_FUEL_TYPE_LEADED = 0x2
-FUELTYPE_FUEL_TYPE_DIESEL_1 = 0x3
-FUELTYPE_FUEL_TYPE_DIESEL_2 = 0x4
-FUELTYPE_FUEL_TYPE_BIODIESEL = 0x5
-FUELTYPE_FUEL_TYPE_E85 = 0x6
-FUELTYPE_FUEL_TYPE_LPG = 0x7
-FUELTYPE_FUEL_TYPE_CNG = 0x8
-FUELTYPE_FUEL_TYPE_LNG = 0x9
-FUELTYPE_FUEL_TYPE_ELECTRIC = 0xa
-FUELTYPE_FUEL_TYPE_HYDROGEN = 0xb
-FUELTYPE_FUEL_TYPE_OTHER = 0xc
-
-# VehicleSeatOccupancyState
-VEHICLESEATOCCUPANCYSTATE_UNKNOWN = 0x0
-VEHICLESEATOCCUPANCYSTATE_VACANT = 0x1
-VEHICLESEATOCCUPANCYSTATE_OCCUPIED = 0x2
-
-# VehicleIgnitionState
-VEHICLEIGNITIONSTATE_UNDEFINED = 0x0
-VEHICLEIGNITIONSTATE_LOCK = 0x1
-VEHICLEIGNITIONSTATE_OFF = 0x2
-VEHICLEIGNITIONSTATE_ACC = 0x3
-VEHICLEIGNITIONSTATE_ON = 0x4
-VEHICLEIGNITIONSTATE_START = 0x5
-
-# VehicleAreaSeat
-VEHICLEAREASEAT_ROW_1_LEFT = 0x1
-VEHICLEAREASEAT_ROW_1_CENTER = 0x2
-VEHICLEAREASEAT_ROW_1_RIGHT = 0x4
-VEHICLEAREASEAT_ROW_2_LEFT = 0x10
-VEHICLEAREASEAT_ROW_2_CENTER = 0x20
-VEHICLEAREASEAT_ROW_2_RIGHT = 0x40
-VEHICLEAREASEAT_ROW_3_LEFT = 0x100
-VEHICLEAREASEAT_ROW_3_CENTER = 0x200
-VEHICLEAREASEAT_ROW_3_RIGHT = 0x400
-
-# VehicleTurnSignal
-VEHICLETURNSIGNAL_NONE = 0x0
-VEHICLETURNSIGNAL_RIGHT = 0x1
-VEHICLETURNSIGNAL_LEFT = 0x2
-
-# EvConnectorType
-EVCONNECTORTYPE_UNKNOWN = 0x0
-EVCONNECTORTYPE_IEC_TYPE_1_AC = 0x1
-EVCONNECTORTYPE_IEC_TYPE_2_AC = 0x2
-EVCONNECTORTYPE_IEC_TYPE_3_AC = 0x3
-EVCONNECTORTYPE_IEC_TYPE_4_DC = 0x4
-EVCONNECTORTYPE_IEC_TYPE_1_CCS_DC = 0x5
-EVCONNECTORTYPE_IEC_TYPE_2_CCS_DC = 0x6
-EVCONNECTORTYPE_TESLA_ROADSTER = 0x7
-EVCONNECTORTYPE_TESLA_HPWC = 0x8
-EVCONNECTORTYPE_TESLA_SUPERCHARGER = 0x9
-EVCONNECTORTYPE_GBT_AC = 0xa
-EVCONNECTORTYPE_GBT_DC = 0xb
-EVCONNECTORTYPE_OTHER = 0x65
-
 # VehiclePropertyType
 VEHICLEPROPERTYTYPE_STRING = 0x100000
 VEHICLEPROPERTYTYPE_BOOLEAN = 0x200000
@@ -305,102 +28,19 @@
 VEHICLEPROPERTYTYPE_MIXED = 0xe00000
 VEHICLEPROPERTYTYPE_MASK = 0xff0000
 
-# VehicleAreaMirror
-VEHICLEAREAMIRROR_DRIVER_LEFT = 0x1
-VEHICLEAREAMIRROR_DRIVER_RIGHT = 0x2
-VEHICLEAREAMIRROR_DRIVER_CENTER = 0x4
+# VehicleArea
+VEHICLEAREA_GLOBAL = 0x1000000
+VEHICLEAREA_WINDOW = 0x3000000
+VEHICLEAREA_MIRROR = 0x4000000
+VEHICLEAREA_SEAT = 0x5000000
+VEHICLEAREA_DOOR = 0x6000000
+VEHICLEAREA_WHEEL = 0x7000000
+VEHICLEAREA_MASK = 0xf000000
 
-# Obd2FuelSystemStatus
-OBD2FUELSYSTEMSTATUS_OPEN_INSUFFICIENT_ENGINE_TEMPERATURE = 0x1
-OBD2FUELSYSTEMSTATUS_CLOSED_LOOP = 0x2
-OBD2FUELSYSTEMSTATUS_OPEN_ENGINE_LOAD_OR_DECELERATION = 0x4
-OBD2FUELSYSTEMSTATUS_OPEN_SYSTEM_FAILURE = 0x8
-OBD2FUELSYSTEMSTATUS_CLOSED_LOOP_BUT_FEEDBACK_FAULT = 0x10
-
-# Obd2SecondaryAirStatus
-OBD2SECONDARYAIRSTATUS_UPSTREAM = 0x1
-OBD2SECONDARYAIRSTATUS_DOWNSTREAM_OF_CATALYCIC_CONVERTER = 0x2
-OBD2SECONDARYAIRSTATUS_FROM_OUTSIDE_OR_OFF = 0x4
-OBD2SECONDARYAIRSTATUS_PUMP_ON_FOR_DIAGNOSTICS = 0x8
-
-# VehicleAreaWheel
-VEHICLEAREAWHEEL_UNKNOWN = 0x0
-VEHICLEAREAWHEEL_LEFT_FRONT = 0x1
-VEHICLEAREAWHEEL_RIGHT_FRONT = 0x2
-VEHICLEAREAWHEEL_LEFT_REAR = 0x4
-VEHICLEAREAWHEEL_RIGHT_REAR = 0x8
-
-# VehicleGear
-VEHICLEGEAR_GEAR_NEUTRAL = 0x1
-VEHICLEGEAR_GEAR_REVERSE = 0x2
-VEHICLEGEAR_GEAR_PARK = 0x4
-VEHICLEGEAR_GEAR_DRIVE = 0x8
-VEHICLEGEAR_GEAR_1 = 0x10
-VEHICLEGEAR_GEAR_2 = 0x20
-VEHICLEGEAR_GEAR_3 = 0x40
-VEHICLEGEAR_GEAR_4 = 0x80
-VEHICLEGEAR_GEAR_5 = 0x100
-VEHICLEGEAR_GEAR_6 = 0x200
-VEHICLEGEAR_GEAR_7 = 0x400
-VEHICLEGEAR_GEAR_8 = 0x800
-VEHICLEGEAR_GEAR_9 = 0x1000
-
-# VmsAvailabilityStateIntegerValuesIndex
-VMSAVAILABILITYSTATEINTEGERVALUESINDEX_SEQUENCE_NUMBER = 0x1
-VMSAVAILABILITYSTATEINTEGERVALUESINDEX_NUMBER_OF_ASSOCIATED_LAYERS = 0x2
-VMSAVAILABILITYSTATEINTEGERVALUESINDEX_LAYERS_START = 0x3
-
-# VehicleHwKeyInputAction
-VEHICLEHWKEYINPUTACTION_ACTION_DOWN = 0x0
-VEHICLEHWKEYINPUTACTION_ACTION_UP = 0x1
-
-# VehicleApPowerStateReport
-VEHICLEAPPOWERSTATEREPORT_WAIT_FOR_VHAL = 0x1
-VEHICLEAPPOWERSTATEREPORT_DEEP_SLEEP_ENTRY = 0x2
-VEHICLEAPPOWERSTATEREPORT_DEEP_SLEEP_EXIT = 0x3
-VEHICLEAPPOWERSTATEREPORT_SHUTDOWN_POSTPONE = 0x4
-VEHICLEAPPOWERSTATEREPORT_SHUTDOWN_START = 0x5
-VEHICLEAPPOWERSTATEREPORT_ON = 0x6
-VEHICLEAPPOWERSTATEREPORT_SHUTDOWN_PREPARE = 0x7
-VEHICLEAPPOWERSTATEREPORT_SHUTDOWN_CANCELLED = 0x8
-
-# VehicleDisplay
-VEHICLEDISPLAY_MAIN = 0x0
-VEHICLEDISPLAY_INSTRUMENT_CLUSTER = 0x1
-
-# Obd2CompressionIgnitionMonitors
-OBD2COMPRESSIONIGNITIONMONITORS_EGR_OR_VVT_AVAILABLE = 0x40
-OBD2COMPRESSIONIGNITIONMONITORS_EGR_OR_VVT_INCOMPLETE = 0x80
-OBD2COMPRESSIONIGNITIONMONITORS_PM_FILTER_AVAILABLE = 0x100
-OBD2COMPRESSIONIGNITIONMONITORS_PM_FILTER_INCOMPLETE = 0x200
-OBD2COMPRESSIONIGNITIONMONITORS_EXHAUST_GAS_SENSOR_AVAILABLE = 0x400
-OBD2COMPRESSIONIGNITIONMONITORS_EXHAUST_GAS_SENSOR_INCOMPLETE = 0x800
-OBD2COMPRESSIONIGNITIONMONITORS_BOOST_PRESSURE_AVAILABLE = 0x1000
-OBD2COMPRESSIONIGNITIONMONITORS_BOOST_PRESSURE_INCOMPLETE = 0x2000
-OBD2COMPRESSIONIGNITIONMONITORS_NOx_SCR_AVAILABLE = 0x4000
-OBD2COMPRESSIONIGNITIONMONITORS_NOx_SCR_INCOMPLETE = 0x8000
-OBD2COMPRESSIONIGNITIONMONITORS_NMHC_CATALYST_AVAILABLE = 0x10000
-OBD2COMPRESSIONIGNITIONMONITORS_NMHC_CATALYST_INCOMPLETE = 0x20000
-
-# VehicleHvacFanDirection
-VEHICLEHVACFANDIRECTION_FACE = 0x1
-VEHICLEHVACFANDIRECTION_FLOOR = 0x2
-VEHICLEHVACFANDIRECTION_DEFROST = 0x4
-
-# VehicleAreaDoor
-VEHICLEAREADOOR_ROW_1_LEFT = 0x1
-VEHICLEAREADOOR_ROW_1_RIGHT = 0x4
-VEHICLEAREADOOR_ROW_2_LEFT = 0x10
-VEHICLEAREADOOR_ROW_2_RIGHT = 0x40
-VEHICLEAREADOOR_ROW_3_LEFT = 0x100
-VEHICLEAREADOOR_ROW_3_RIGHT = 0x400
-VEHICLEAREADOOR_HOOD = 0x10000000
-VEHICLEAREADOOR_REAR = 0x20000000
-
-# SubscribeFlags
-SUBSCRIBEFLAGS_UNDEFINED = 0x0
-SUBSCRIBEFLAGS_EVENTS_FROM_CAR = 0x1
-SUBSCRIBEFLAGS_EVENTS_FROM_ANDROID = 0x2
+# VehiclePropertyGroup
+VEHICLEPROPERTYGROUP_SYSTEM = 0x10000000
+VEHICLEPROPERTYGROUP_VENDOR = 0x20000000
+VEHICLEPROPERTYGROUP_MASK = 0xf0000000
 
 # VehicleProperty
 VEHICLEPROPERTY_INVALID = 0x0
@@ -415,10 +55,13 @@
 VEHICLEPROPERTY_INFO_FUEL_DOOR_LOCATION = 0x11400108
 VEHICLEPROPERTY_INFO_EV_PORT_LOCATION = 0x11400109
 VEHICLEPROPERTY_INFO_DRIVER_SEAT = 0x1540010a
+VEHICLEPROPERTY_INFO_EXTERIOR_DIMENSIONS = 0x1141010b
+VEHICLEPROPERTY_INFO_MULTI_EV_PORT_LOCATIONS = 0x1141010c
 VEHICLEPROPERTY_PERF_ODOMETER = 0x11600204
 VEHICLEPROPERTY_PERF_VEHICLE_SPEED = 0x11600207
 VEHICLEPROPERTY_PERF_VEHICLE_SPEED_DISPLAY = 0x11600208
 VEHICLEPROPERTY_PERF_STEERING_ANGLE = 0x11600209
+VEHICLEPROPERTY_PERF_REAR_STEERING_ANGLE = 0x11600210
 VEHICLEPROPERTY_ENGINE_COOLANT_TEMP = 0x11600301
 VEHICLEPROPERTY_ENGINE_OIL_LEVEL = 0x11400303
 VEHICLEPROPERTY_ENGINE_OIL_TEMP = 0x11600304
@@ -462,6 +105,7 @@
 VEHICLEPROPERTY_HVAC_FAN_DIRECTION_AVAILABLE = 0x15410511
 VEHICLEPROPERTY_HVAC_AUTO_RECIRC_ON = 0x15200512
 VEHICLEPROPERTY_HVAC_SEAT_VENTILATION = 0x15400513
+VEHICLEPROPERTY_HVAC_ELECTRIC_DEFROSTER_ON = 0x13200514
 VEHICLEPROPERTY_DISTANCE_DISPLAY_UNITS = 0x11400600
 VEHICLEPROPERTY_FUEL_VOLUME_DISPLAY_UNITS = 0x11400601
 VEHICLEPROPERTY_TIRE_PRESSURE_DISPLAY_UNITS = 0x11400602
@@ -474,6 +118,7 @@
 VEHICLEPROPERTY_AP_POWER_BOOTUP_REASON = 0x11400a02
 VEHICLEPROPERTY_DISPLAY_BRIGHTNESS = 0x11400a03
 VEHICLEPROPERTY_HW_KEY_INPUT = 0x11410a10
+VEHICLEPROPERTY_HW_ROTARY_INPUT = 0x11410a20
 VEHICLEPROPERTY_DOOR_POS = 0x16400b00
 VEHICLEPROPERTY_DOOR_MOVE = 0x16400b01
 VEHICLEPROPERTY_DOOR_LOCK = 0x16200b02
@@ -531,6 +176,355 @@
 VEHICLEPROPERTY_CABIN_LIGHTS_SWITCH = 0x11400f02
 VEHICLEPROPERTY_READING_LIGHTS_STATE = 0x15400f03
 VEHICLEPROPERTY_READING_LIGHTS_SWITCH = 0x15400f04
+VEHICLEPROPERTY_SUPPORT_CUSTOMIZE_VENDOR_PERMISSION = 0x11200f05
+VEHICLEPROPERTY_DISABLED_OPTIONAL_FEATURES = 0x11100f06
+VEHICLEPROPERTY_INITIAL_USER_INFO = 0x11e00f07
+VEHICLEPROPERTY_SWITCH_USER = 0x11e00f08
+VEHICLEPROPERTY_CREATE_USER = 0x11e00f09
+VEHICLEPROPERTY_REMOVE_USER = 0x11e00f0a
+VEHICLEPROPERTY_USER_IDENTIFICATION_ASSOCIATION = 0x11e00f0b
+
+# VehicleVendorPermission
+VEHICLEVENDORPERMISSION_PERMISSION_DEFAULT = 0x0
+VEHICLEVENDORPERMISSION_PERMISSION_SET_VENDOR_CATEGORY_WINDOW = 0x1
+VEHICLEVENDORPERMISSION_PERMISSION_GET_VENDOR_CATEGORY_WINDOW = 0x2
+VEHICLEVENDORPERMISSION_PERMISSION_SET_VENDOR_CATEGORY_DOOR = 0x3
+VEHICLEVENDORPERMISSION_PERMISSION_GET_VENDOR_CATEGORY_DOOR = 0x4
+VEHICLEVENDORPERMISSION_PERMISSION_SET_VENDOR_CATEGORY_SEAT = 0x5
+VEHICLEVENDORPERMISSION_PERMISSION_GET_VENDOR_CATEGORY_SEAT = 0x6
+VEHICLEVENDORPERMISSION_PERMISSION_SET_VENDOR_CATEGORY_MIRROR = 0x7
+VEHICLEVENDORPERMISSION_PERMISSION_GET_VENDOR_CATEGORY_MIRROR = 0x8
+VEHICLEVENDORPERMISSION_PERMISSION_SET_VENDOR_CATEGORY_INFO = 0x9
+VEHICLEVENDORPERMISSION_PERMISSION_GET_VENDOR_CATEGORY_INFO = 0xa
+VEHICLEVENDORPERMISSION_PERMISSION_SET_VENDOR_CATEGORY_ENGINE = 0xb
+VEHICLEVENDORPERMISSION_PERMISSION_GET_VENDOR_CATEGORY_ENGINE = 0xc
+VEHICLEVENDORPERMISSION_PERMISSION_SET_VENDOR_CATEGORY_HVAC = 0xd
+VEHICLEVENDORPERMISSION_PERMISSION_GET_VENDOR_CATEGORY_HVAC = 0xe
+VEHICLEVENDORPERMISSION_PERMISSION_SET_VENDOR_CATEGORY_LIGHT = 0xf
+VEHICLEVENDORPERMISSION_PERMISSION_GET_VENDOR_CATEGORY_LIGHT = 0x10
+VEHICLEVENDORPERMISSION_PERMISSION_SET_VENDOR_CATEGORY_1 = 0x10000
+VEHICLEVENDORPERMISSION_PERMISSION_GET_VENDOR_CATEGORY_1 = 0x11000
+VEHICLEVENDORPERMISSION_PERMISSION_SET_VENDOR_CATEGORY_2 = 0x20000
+VEHICLEVENDORPERMISSION_PERMISSION_GET_VENDOR_CATEGORY_2 = 0x21000
+VEHICLEVENDORPERMISSION_PERMISSION_SET_VENDOR_CATEGORY_3 = 0x30000
+VEHICLEVENDORPERMISSION_PERMISSION_GET_VENDOR_CATEGORY_3 = 0x31000
+VEHICLEVENDORPERMISSION_PERMISSION_SET_VENDOR_CATEGORY_4 = 0x40000
+VEHICLEVENDORPERMISSION_PERMISSION_GET_VENDOR_CATEGORY_4 = 0x41000
+VEHICLEVENDORPERMISSION_PERMISSION_SET_VENDOR_CATEGORY_5 = 0x50000
+VEHICLEVENDORPERMISSION_PERMISSION_GET_VENDOR_CATEGORY_5 = 0x51000
+VEHICLEVENDORPERMISSION_PERMISSION_SET_VENDOR_CATEGORY_6 = 0x60000
+VEHICLEVENDORPERMISSION_PERMISSION_GET_VENDOR_CATEGORY_6 = 0x61000
+VEHICLEVENDORPERMISSION_PERMISSION_SET_VENDOR_CATEGORY_7 = 0x70000
+VEHICLEVENDORPERMISSION_PERMISSION_GET_VENDOR_CATEGORY_7 = 0x71000
+VEHICLEVENDORPERMISSION_PERMISSION_SET_VENDOR_CATEGORY_8 = 0x80000
+VEHICLEVENDORPERMISSION_PERMISSION_GET_VENDOR_CATEGORY_8 = 0x81000
+VEHICLEVENDORPERMISSION_PERMISSION_SET_VENDOR_CATEGORY_9 = 0x90000
+VEHICLEVENDORPERMISSION_PERMISSION_GET_VENDOR_CATEGORY_9 = 0x91000
+VEHICLEVENDORPERMISSION_PERMISSION_SET_VENDOR_CATEGORY_10 = 0xa0000
+VEHICLEVENDORPERMISSION_PERMISSION_GET_VENDOR_CATEGORY_10 = 0xa1000
+VEHICLEVENDORPERMISSION_PERMISSION_NOT_ACCESSIBLE = 0xf0000000
+
+# VehicleSeatOccupancyState
+VEHICLESEATOCCUPANCYSTATE_UNKNOWN = 0x0
+VEHICLESEATOCCUPANCYSTATE_VACANT = 0x1
+VEHICLESEATOCCUPANCYSTATE_OCCUPIED = 0x2
+
+# VehicleLightState
+VEHICLELIGHTSTATE_OFF = 0x0
+VEHICLELIGHTSTATE_ON = 0x1
+VEHICLELIGHTSTATE_DAYTIME_RUNNING = 0x2
+
+# VehicleLightSwitch
+VEHICLELIGHTSWITCH_OFF = 0x0
+VEHICLELIGHTSWITCH_ON = 0x1
+VEHICLELIGHTSWITCH_DAYTIME_RUNNING = 0x2
+VEHICLELIGHTSWITCH_AUTOMATIC = 0x100
+
+# EvConnectorType
+EVCONNECTORTYPE_UNKNOWN = 0x0
+EVCONNECTORTYPE_IEC_TYPE_1_AC = 0x1
+EVCONNECTORTYPE_IEC_TYPE_2_AC = 0x2
+EVCONNECTORTYPE_IEC_TYPE_3_AC = 0x3
+EVCONNECTORTYPE_IEC_TYPE_4_DC = 0x4
+EVCONNECTORTYPE_IEC_TYPE_1_CCS_DC = 0x5
+EVCONNECTORTYPE_IEC_TYPE_2_CCS_DC = 0x6
+EVCONNECTORTYPE_TESLA_ROADSTER = 0x7
+EVCONNECTORTYPE_TESLA_HPWC = 0x8
+EVCONNECTORTYPE_TESLA_SUPERCHARGER = 0x9
+EVCONNECTORTYPE_GBT_AC = 0xa
+EVCONNECTORTYPE_GBT_DC = 0xb
+EVCONNECTORTYPE_OTHER = 0x65
+
+# PortLocationType
+PORTLOCATIONTYPE_UNKNOWN = 0x0
+PORTLOCATIONTYPE_FRONT_LEFT = 0x1
+PORTLOCATIONTYPE_FRONT_RIGHT = 0x2
+PORTLOCATIONTYPE_REAR_RIGHT = 0x3
+PORTLOCATIONTYPE_REAR_LEFT = 0x4
+PORTLOCATIONTYPE_FRONT = 0x5
+PORTLOCATIONTYPE_REAR = 0x6
+
+# FuelType
+FUELTYPE_FUEL_TYPE_UNKNOWN = 0x0
+FUELTYPE_FUEL_TYPE_UNLEADED = 0x1
+FUELTYPE_FUEL_TYPE_LEADED = 0x2
+FUELTYPE_FUEL_TYPE_DIESEL_1 = 0x3
+FUELTYPE_FUEL_TYPE_DIESEL_2 = 0x4
+FUELTYPE_FUEL_TYPE_BIODIESEL = 0x5
+FUELTYPE_FUEL_TYPE_E85 = 0x6
+FUELTYPE_FUEL_TYPE_LPG = 0x7
+FUELTYPE_FUEL_TYPE_CNG = 0x8
+FUELTYPE_FUEL_TYPE_LNG = 0x9
+FUELTYPE_FUEL_TYPE_ELECTRIC = 0xa
+FUELTYPE_FUEL_TYPE_HYDROGEN = 0xb
+FUELTYPE_FUEL_TYPE_OTHER = 0xc
+
+# VehicleHvacFanDirection
+VEHICLEHVACFANDIRECTION_UNKNOWN = 0x0
+VEHICLEHVACFANDIRECTION_FACE = 0x1
+VEHICLEHVACFANDIRECTION_FLOOR = 0x2
+VEHICLEHVACFANDIRECTION_FACE_AND_FLOOR = 0x3
+VEHICLEHVACFANDIRECTION_DEFROST = 0x4
+VEHICLEHVACFANDIRECTION_DEFROST_AND_FLOOR = 0x6
+
+# VehicleOilLevel
+VEHICLEOILLEVEL_CRITICALLY_LOW = 0x0
+VEHICLEOILLEVEL_LOW = 0x1
+VEHICLEOILLEVEL_NORMAL = 0x2
+VEHICLEOILLEVEL_HIGH = 0x3
+VEHICLEOILLEVEL_ERROR = 0x4
+
+# VehicleApPowerStateConfigFlag
+VEHICLEAPPOWERSTATECONFIGFLAG_ENABLE_DEEP_SLEEP_FLAG = 0x1
+VEHICLEAPPOWERSTATECONFIGFLAG_CONFIG_SUPPORT_TIMER_POWER_ON_FLAG = 0x2
+
+# VehicleApPowerStateReq
+VEHICLEAPPOWERSTATEREQ_ON = 0x0
+VEHICLEAPPOWERSTATEREQ_SHUTDOWN_PREPARE = 0x1
+VEHICLEAPPOWERSTATEREQ_CANCEL_SHUTDOWN = 0x2
+VEHICLEAPPOWERSTATEREQ_FINISHED = 0x3
+
+# VehicleApPowerStateReqIndex
+VEHICLEAPPOWERSTATEREQINDEX_STATE = 0x0
+VEHICLEAPPOWERSTATEREQINDEX_ADDITIONAL = 0x1
+
+# VehicleApPowerStateShutdownParam
+VEHICLEAPPOWERSTATESHUTDOWNPARAM_SHUTDOWN_IMMEDIATELY = 0x1
+VEHICLEAPPOWERSTATESHUTDOWNPARAM_CAN_SLEEP = 0x2
+VEHICLEAPPOWERSTATESHUTDOWNPARAM_SHUTDOWN_ONLY = 0x3
+VEHICLEAPPOWERSTATESHUTDOWNPARAM_SLEEP_IMMEDIATELY = 0x4
+
+# VehicleApPowerStateReport
+VEHICLEAPPOWERSTATEREPORT_WAIT_FOR_VHAL = 0x1
+VEHICLEAPPOWERSTATEREPORT_DEEP_SLEEP_ENTRY = 0x2
+VEHICLEAPPOWERSTATEREPORT_DEEP_SLEEP_EXIT = 0x3
+VEHICLEAPPOWERSTATEREPORT_SHUTDOWN_POSTPONE = 0x4
+VEHICLEAPPOWERSTATEREPORT_SHUTDOWN_START = 0x5
+VEHICLEAPPOWERSTATEREPORT_ON = 0x6
+VEHICLEAPPOWERSTATEREPORT_SHUTDOWN_PREPARE = 0x7
+VEHICLEAPPOWERSTATEREPORT_SHUTDOWN_CANCELLED = 0x8
+
+# VehicleHwKeyInputAction
+VEHICLEHWKEYINPUTACTION_ACTION_DOWN = 0x0
+VEHICLEHWKEYINPUTACTION_ACTION_UP = 0x1
+
+# VehicleDisplay
+VEHICLEDISPLAY_MAIN = 0x0
+VEHICLEDISPLAY_INSTRUMENT_CLUSTER = 0x1
+
+# VehicleUnit
+VEHICLEUNIT_SHOULD_NOT_USE = 0x0
+VEHICLEUNIT_METER_PER_SEC = 0x1
+VEHICLEUNIT_RPM = 0x2
+VEHICLEUNIT_HERTZ = 0x3
+VEHICLEUNIT_PERCENTILE = 0x10
+VEHICLEUNIT_MILLIMETER = 0x20
+VEHICLEUNIT_METER = 0x21
+VEHICLEUNIT_KILOMETER = 0x23
+VEHICLEUNIT_MILE = 0x24
+VEHICLEUNIT_CELSIUS = 0x30
+VEHICLEUNIT_FAHRENHEIT = 0x31
+VEHICLEUNIT_KELVIN = 0x32
+VEHICLEUNIT_MILLILITER = 0x40
+VEHICLEUNIT_LITER = 0x41
+VEHICLEUNIT_GALLON = 0x42
+VEHICLEUNIT_US_GALLON = 0x42
+VEHICLEUNIT_IMPERIAL_GALLON = 0x43
+VEHICLEUNIT_NANO_SECS = 0x50
+VEHICLEUNIT_SECS = 0x53
+VEHICLEUNIT_YEAR = 0x59
+VEHICLEUNIT_WATT_HOUR = 0x60
+VEHICLEUNIT_MILLIAMPERE = 0x61
+VEHICLEUNIT_MILLIVOLT = 0x62
+VEHICLEUNIT_MILLIWATTS = 0x63
+VEHICLEUNIT_AMPERE_HOURS = 0x64
+VEHICLEUNIT_KILOWATT_HOUR = 0x65
+VEHICLEUNIT_KILOPASCAL = 0x70
+VEHICLEUNIT_PSI = 0x71
+VEHICLEUNIT_BAR = 0x72
+VEHICLEUNIT_DEGREES = 0x80
+VEHICLEUNIT_MILES_PER_HOUR = 0x90
+VEHICLEUNIT_KILOMETERS_PER_HOUR = 0x91
+
+# VehiclePropertyChangeMode
+VEHICLEPROPERTYCHANGEMODE_STATIC = 0x0
+VEHICLEPROPERTYCHANGEMODE_ON_CHANGE = 0x1
+VEHICLEPROPERTYCHANGEMODE_CONTINUOUS = 0x2
+
+# VehiclePropertyAccess
+VEHICLEPROPERTYACCESS_NONE = 0x0
+VEHICLEPROPERTYACCESS_READ = 0x1
+VEHICLEPROPERTYACCESS_WRITE = 0x2
+VEHICLEPROPERTYACCESS_READ_WRITE = 0x3
+
+# VehiclePropertyStatus
+VEHICLEPROPERTYSTATUS_AVAILABLE = 0x0
+VEHICLEPROPERTYSTATUS_UNAVAILABLE = 0x1
+VEHICLEPROPERTYSTATUS_ERROR = 0x2
+
+# VehicleGear
+VEHICLEGEAR_GEAR_UNKNOWN = 0x0
+VEHICLEGEAR_GEAR_NEUTRAL = 0x1
+VEHICLEGEAR_GEAR_REVERSE = 0x2
+VEHICLEGEAR_GEAR_PARK = 0x4
+VEHICLEGEAR_GEAR_DRIVE = 0x8
+VEHICLEGEAR_GEAR_1 = 0x10
+VEHICLEGEAR_GEAR_2 = 0x20
+VEHICLEGEAR_GEAR_3 = 0x40
+VEHICLEGEAR_GEAR_4 = 0x80
+VEHICLEGEAR_GEAR_5 = 0x100
+VEHICLEGEAR_GEAR_6 = 0x200
+VEHICLEGEAR_GEAR_7 = 0x400
+VEHICLEGEAR_GEAR_8 = 0x800
+VEHICLEGEAR_GEAR_9 = 0x1000
+
+# VehicleAreaSeat
+VEHICLEAREASEAT_ROW_1_LEFT = 0x1
+VEHICLEAREASEAT_ROW_1_CENTER = 0x2
+VEHICLEAREASEAT_ROW_1_RIGHT = 0x4
+VEHICLEAREASEAT_ROW_2_LEFT = 0x10
+VEHICLEAREASEAT_ROW_2_CENTER = 0x20
+VEHICLEAREASEAT_ROW_2_RIGHT = 0x40
+VEHICLEAREASEAT_ROW_3_LEFT = 0x100
+VEHICLEAREASEAT_ROW_3_CENTER = 0x200
+VEHICLEAREASEAT_ROW_3_RIGHT = 0x400
+
+# VehicleAreaWindow
+VEHICLEAREAWINDOW_FRONT_WINDSHIELD = 0x1
+VEHICLEAREAWINDOW_REAR_WINDSHIELD = 0x2
+VEHICLEAREAWINDOW_ROW_1_LEFT = 0x10
+VEHICLEAREAWINDOW_ROW_1_RIGHT = 0x40
+VEHICLEAREAWINDOW_ROW_2_LEFT = 0x100
+VEHICLEAREAWINDOW_ROW_2_RIGHT = 0x400
+VEHICLEAREAWINDOW_ROW_3_LEFT = 0x1000
+VEHICLEAREAWINDOW_ROW_3_RIGHT = 0x4000
+VEHICLEAREAWINDOW_ROOF_TOP_1 = 0x10000
+VEHICLEAREAWINDOW_ROOF_TOP_2 = 0x20000
+
+# VehicleAreaDoor
+VEHICLEAREADOOR_ROW_1_LEFT = 0x1
+VEHICLEAREADOOR_ROW_1_RIGHT = 0x4
+VEHICLEAREADOOR_ROW_2_LEFT = 0x10
+VEHICLEAREADOOR_ROW_2_RIGHT = 0x40
+VEHICLEAREADOOR_ROW_3_LEFT = 0x100
+VEHICLEAREADOOR_ROW_3_RIGHT = 0x400
+VEHICLEAREADOOR_HOOD = 0x10000000
+VEHICLEAREADOOR_REAR = 0x20000000
+
+# VehicleAreaMirror
+VEHICLEAREAMIRROR_DRIVER_LEFT = 0x1
+VEHICLEAREAMIRROR_DRIVER_RIGHT = 0x2
+VEHICLEAREAMIRROR_DRIVER_CENTER = 0x4
+
+# VehicleTurnSignal
+VEHICLETURNSIGNAL_NONE = 0x0
+VEHICLETURNSIGNAL_RIGHT = 0x1
+VEHICLETURNSIGNAL_LEFT = 0x2
+
+# VehicleIgnitionState
+VEHICLEIGNITIONSTATE_UNDEFINED = 0x0
+VEHICLEIGNITIONSTATE_LOCK = 0x1
+VEHICLEIGNITIONSTATE_OFF = 0x2
+VEHICLEIGNITIONSTATE_ACC = 0x3
+VEHICLEIGNITIONSTATE_ON = 0x4
+VEHICLEIGNITIONSTATE_START = 0x5
+
+# SubscribeFlags
+SUBSCRIBEFLAGS_UNDEFINED = 0x0
+SUBSCRIBEFLAGS_EVENTS_FROM_CAR = 0x1
+SUBSCRIBEFLAGS_EVENTS_FROM_ANDROID = 0x2
+
+# StatusCode
+STATUSCODE_OK = 0x0
+STATUSCODE_TRY_AGAIN = 0x1
+STATUSCODE_INVALID_ARG = 0x2
+STATUSCODE_NOT_AVAILABLE = 0x3
+STATUSCODE_ACCESS_DENIED = 0x4
+STATUSCODE_INTERNAL_ERROR = 0x5
+
+# VehicleAreaWheel
+VEHICLEAREAWHEEL_UNKNOWN = 0x0
+VEHICLEAREAWHEEL_LEFT_FRONT = 0x1
+VEHICLEAREAWHEEL_RIGHT_FRONT = 0x2
+VEHICLEAREAWHEEL_LEFT_REAR = 0x4
+VEHICLEAREAWHEEL_RIGHT_REAR = 0x8
+
+# Obd2FuelSystemStatus
+OBD2FUELSYSTEMSTATUS_OPEN_INSUFFICIENT_ENGINE_TEMPERATURE = 0x1
+OBD2FUELSYSTEMSTATUS_CLOSED_LOOP = 0x2
+OBD2FUELSYSTEMSTATUS_OPEN_ENGINE_LOAD_OR_DECELERATION = 0x4
+OBD2FUELSYSTEMSTATUS_OPEN_SYSTEM_FAILURE = 0x8
+OBD2FUELSYSTEMSTATUS_CLOSED_LOOP_BUT_FEEDBACK_FAULT = 0x10
+
+# Obd2IgnitionMonitorKind
+OBD2IGNITIONMONITORKIND_SPARK = 0x0
+OBD2IGNITIONMONITORKIND_COMPRESSION = 0x1
+
+# Obd2CommonIgnitionMonitors
+OBD2COMMONIGNITIONMONITORS_COMPONENTS_AVAILABLE = 0x1
+OBD2COMMONIGNITIONMONITORS_COMPONENTS_INCOMPLETE = 0x2
+OBD2COMMONIGNITIONMONITORS_FUEL_SYSTEM_AVAILABLE = 0x4
+OBD2COMMONIGNITIONMONITORS_FUEL_SYSTEM_INCOMPLETE = 0x8
+OBD2COMMONIGNITIONMONITORS_MISFIRE_AVAILABLE = 0x10
+OBD2COMMONIGNITIONMONITORS_MISFIRE_INCOMPLETE = 0x20
+
+# Obd2SparkIgnitionMonitors
+OBD2SPARKIGNITIONMONITORS_EGR_AVAILABLE = 0x40
+OBD2SPARKIGNITIONMONITORS_EGR_INCOMPLETE = 0x80
+OBD2SPARKIGNITIONMONITORS_OXYGEN_SENSOR_HEATER_AVAILABLE = 0x100
+OBD2SPARKIGNITIONMONITORS_OXYGEN_SENSOR_HEATER_INCOMPLETE = 0x200
+OBD2SPARKIGNITIONMONITORS_OXYGEN_SENSOR_AVAILABLE = 0x400
+OBD2SPARKIGNITIONMONITORS_OXYGEN_SENSOR_INCOMPLETE = 0x800
+OBD2SPARKIGNITIONMONITORS_AC_REFRIGERANT_AVAILABLE = 0x1000
+OBD2SPARKIGNITIONMONITORS_AC_REFRIGERANT_INCOMPLETE = 0x2000
+OBD2SPARKIGNITIONMONITORS_SECONDARY_AIR_SYSTEM_AVAILABLE = 0x4000
+OBD2SPARKIGNITIONMONITORS_SECONDARY_AIR_SYSTEM_INCOMPLETE = 0x8000
+OBD2SPARKIGNITIONMONITORS_EVAPORATIVE_SYSTEM_AVAILABLE = 0x10000
+OBD2SPARKIGNITIONMONITORS_EVAPORATIVE_SYSTEM_INCOMPLETE = 0x20000
+OBD2SPARKIGNITIONMONITORS_HEATED_CATALYST_AVAILABLE = 0x40000
+OBD2SPARKIGNITIONMONITORS_HEATED_CATALYST_INCOMPLETE = 0x80000
+OBD2SPARKIGNITIONMONITORS_CATALYST_AVAILABLE = 0x100000
+OBD2SPARKIGNITIONMONITORS_CATALYST_INCOMPLETE = 0x200000
+
+# Obd2CompressionIgnitionMonitors
+OBD2COMPRESSIONIGNITIONMONITORS_EGR_OR_VVT_AVAILABLE = 0x40
+OBD2COMPRESSIONIGNITIONMONITORS_EGR_OR_VVT_INCOMPLETE = 0x80
+OBD2COMPRESSIONIGNITIONMONITORS_PM_FILTER_AVAILABLE = 0x100
+OBD2COMPRESSIONIGNITIONMONITORS_PM_FILTER_INCOMPLETE = 0x200
+OBD2COMPRESSIONIGNITIONMONITORS_EXHAUST_GAS_SENSOR_AVAILABLE = 0x400
+OBD2COMPRESSIONIGNITIONMONITORS_EXHAUST_GAS_SENSOR_INCOMPLETE = 0x800
+OBD2COMPRESSIONIGNITIONMONITORS_BOOST_PRESSURE_AVAILABLE = 0x1000
+OBD2COMPRESSIONIGNITIONMONITORS_BOOST_PRESSURE_INCOMPLETE = 0x2000
+OBD2COMPRESSIONIGNITIONMONITORS_NOx_SCR_AVAILABLE = 0x4000
+OBD2COMPRESSIONIGNITIONMONITORS_NOx_SCR_INCOMPLETE = 0x8000
+OBD2COMPRESSIONIGNITIONMONITORS_NMHC_CATALYST_AVAILABLE = 0x10000
+OBD2COMPRESSIONIGNITIONMONITORS_NMHC_CATALYST_INCOMPLETE = 0x20000
+
+# Obd2SecondaryAirStatus
+OBD2SECONDARYAIRSTATUS_UPSTREAM = 0x1
+OBD2SECONDARYAIRSTATUS_DOWNSTREAM_OF_CATALYCIC_CONVERTER = 0x2
+OBD2SECONDARYAIRSTATUS_FROM_OUTSIDE_OR_OFF = 0x4
+OBD2SECONDARYAIRSTATUS_PUMP_ON_FOR_DIAGNOSTICS = 0x8
 
 # Obd2FuelType
 OBD2FUELTYPE_NOT_AVAILABLE = 0x0
@@ -558,17 +552,40 @@
 OBD2FUELTYPE_HYBRID_REGENERATIVE = 0x16
 OBD2FUELTYPE_BIFUEL_RUNNING_DIESEL = 0x17
 
-# VehicleAreaWindow
-VEHICLEAREAWINDOW_FRONT_WINDSHIELD = 0x1
-VEHICLEAREAWINDOW_REAR_WINDSHIELD = 0x2
-VEHICLEAREAWINDOW_ROW_1_LEFT = 0x10
-VEHICLEAREAWINDOW_ROW_1_RIGHT = 0x40
-VEHICLEAREAWINDOW_ROW_2_LEFT = 0x100
-VEHICLEAREAWINDOW_ROW_2_RIGHT = 0x400
-VEHICLEAREAWINDOW_ROW_3_LEFT = 0x1000
-VEHICLEAREAWINDOW_ROW_3_RIGHT = 0x4000
-VEHICLEAREAWINDOW_ROOF_TOP_1 = 0x10000
-VEHICLEAREAWINDOW_ROOF_TOP_2 = 0x20000
+# DiagnosticIntegerSensorIndex
+DIAGNOSTICINTEGERSENSORINDEX_FUEL_SYSTEM_STATUS = 0x0
+DIAGNOSTICINTEGERSENSORINDEX_MALFUNCTION_INDICATOR_LIGHT_ON = 0x1
+DIAGNOSTICINTEGERSENSORINDEX_IGNITION_MONITORS_SUPPORTED = 0x2
+DIAGNOSTICINTEGERSENSORINDEX_IGNITION_SPECIFIC_MONITORS = 0x3
+DIAGNOSTICINTEGERSENSORINDEX_INTAKE_AIR_TEMPERATURE = 0x4
+DIAGNOSTICINTEGERSENSORINDEX_COMMANDED_SECONDARY_AIR_STATUS = 0x5
+DIAGNOSTICINTEGERSENSORINDEX_NUM_OXYGEN_SENSORS_PRESENT = 0x6
+DIAGNOSTICINTEGERSENSORINDEX_RUNTIME_SINCE_ENGINE_START = 0x7
+DIAGNOSTICINTEGERSENSORINDEX_DISTANCE_TRAVELED_WITH_MALFUNCTION_INDICATOR_LIGHT_ON = 0x8
+DIAGNOSTICINTEGERSENSORINDEX_WARMUPS_SINCE_CODES_CLEARED = 0x9
+DIAGNOSTICINTEGERSENSORINDEX_DISTANCE_TRAVELED_SINCE_CODES_CLEARED = 0xa
+DIAGNOSTICINTEGERSENSORINDEX_ABSOLUTE_BAROMETRIC_PRESSURE = 0xb
+DIAGNOSTICINTEGERSENSORINDEX_CONTROL_MODULE_VOLTAGE = 0xc
+DIAGNOSTICINTEGERSENSORINDEX_AMBIENT_AIR_TEMPERATURE = 0xd
+DIAGNOSTICINTEGERSENSORINDEX_TIME_WITH_MALFUNCTION_LIGHT_ON = 0xe
+DIAGNOSTICINTEGERSENSORINDEX_TIME_SINCE_TROUBLE_CODES_CLEARED = 0xf
+DIAGNOSTICINTEGERSENSORINDEX_MAX_FUEL_AIR_EQUIVALENCE_RATIO = 0x10
+DIAGNOSTICINTEGERSENSORINDEX_MAX_OXYGEN_SENSOR_VOLTAGE = 0x11
+DIAGNOSTICINTEGERSENSORINDEX_MAX_OXYGEN_SENSOR_CURRENT = 0x12
+DIAGNOSTICINTEGERSENSORINDEX_MAX_INTAKE_MANIFOLD_ABSOLUTE_PRESSURE = 0x13
+DIAGNOSTICINTEGERSENSORINDEX_MAX_AIR_FLOW_RATE_FROM_MASS_AIR_FLOW_SENSOR = 0x14
+DIAGNOSTICINTEGERSENSORINDEX_FUEL_TYPE = 0x15
+DIAGNOSTICINTEGERSENSORINDEX_FUEL_RAIL_ABSOLUTE_PRESSURE = 0x16
+DIAGNOSTICINTEGERSENSORINDEX_ENGINE_OIL_TEMPERATURE = 0x17
+DIAGNOSTICINTEGERSENSORINDEX_DRIVER_DEMAND_PERCENT_TORQUE = 0x18
+DIAGNOSTICINTEGERSENSORINDEX_ENGINE_ACTUAL_PERCENT_TORQUE = 0x19
+DIAGNOSTICINTEGERSENSORINDEX_ENGINE_REFERENCE_PERCENT_TORQUE = 0x1a
+DIAGNOSTICINTEGERSENSORINDEX_ENGINE_PERCENT_TORQUE_DATA_IDLE = 0x1b
+DIAGNOSTICINTEGERSENSORINDEX_ENGINE_PERCENT_TORQUE_DATA_POINT1 = 0x1c
+DIAGNOSTICINTEGERSENSORINDEX_ENGINE_PERCENT_TORQUE_DATA_POINT2 = 0x1d
+DIAGNOSTICINTEGERSENSORINDEX_ENGINE_PERCENT_TORQUE_DATA_POINT3 = 0x1e
+DIAGNOSTICINTEGERSENSORINDEX_ENGINE_PERCENT_TORQUE_DATA_POINT4 = 0x1f
+DIAGNOSTICINTEGERSENSORINDEX_LAST_SYSTEM_INDEX = 0x1f
 
 # DiagnosticFloatSensorIndex
 DIAGNOSTICFLOATSENSORINDEX_CALCULATED_ENGINE_LOAD = 0x0
@@ -644,19 +661,116 @@
 DIAGNOSTICFLOATSENSORINDEX_ENGINE_FUEL_RATE = 0x46
 DIAGNOSTICFLOATSENSORINDEX_LAST_SYSTEM_INDEX = 0x46
 
-# VehicleArea
-VEHICLEAREA_GLOBAL = 0x1000000
-VEHICLEAREA_WINDOW = 0x3000000
-VEHICLEAREA_MIRROR = 0x4000000
-VEHICLEAREA_SEAT = 0x5000000
-VEHICLEAREA_DOOR = 0x6000000
-VEHICLEAREA_WHEEL = 0x7000000
-VEHICLEAREA_MASK = 0xf000000
+# VmsMessageType
+VMSMESSAGETYPE_SUBSCRIBE = 0x1
+VMSMESSAGETYPE_SUBSCRIBE_TO_PUBLISHER = 0x2
+VMSMESSAGETYPE_UNSUBSCRIBE = 0x3
+VMSMESSAGETYPE_UNSUBSCRIBE_TO_PUBLISHER = 0x4
+VMSMESSAGETYPE_OFFERING = 0x5
+VMSMESSAGETYPE_AVAILABILITY_REQUEST = 0x6
+VMSMESSAGETYPE_SUBSCRIPTIONS_REQUEST = 0x7
+VMSMESSAGETYPE_AVAILABILITY_RESPONSE = 0x8
+VMSMESSAGETYPE_AVAILABILITY_CHANGE = 0x9
+VMSMESSAGETYPE_SUBSCRIPTIONS_RESPONSE = 0xa
+VMSMESSAGETYPE_SUBSCRIPTIONS_CHANGE = 0xb
+VMSMESSAGETYPE_DATA = 0xc
+VMSMESSAGETYPE_PUBLISHER_ID_REQUEST = 0xd
+VMSMESSAGETYPE_PUBLISHER_ID_RESPONSE = 0xe
+VMSMESSAGETYPE_PUBLISHER_INFORMATION_REQUEST = 0xf
+VMSMESSAGETYPE_PUBLISHER_INFORMATION_RESPONSE = 0x10
+VMSMESSAGETYPE_START_SESSION = 0x11
+VMSMESSAGETYPE_LAST_VMS_MESSAGE_TYPE = 0x11
 
-# VehiclePropertyStatus
-VEHICLEPROPERTYSTATUS_AVAILABLE = 0x0
-VEHICLEPROPERTYSTATUS_UNAVAILABLE = 0x1
-VEHICLEPROPERTYSTATUS_ERROR = 0x2
+# VmsBaseMessageIntegerValuesIndex
+VMSBASEMESSAGEINTEGERVALUESINDEX_MESSAGE_TYPE = 0x0
+
+# VmsStartSessionMessageIntegerValuesIndex
+VMSSTARTSESSIONMESSAGEINTEGERVALUESINDEX_SERVICE_ID = 0x1
+VMSSTARTSESSIONMESSAGEINTEGERVALUESINDEX_CLIENT_ID = 0x2
+
+# VmsMessageWithLayerIntegerValuesIndex
+VMSMESSAGEWITHLAYERINTEGERVALUESINDEX_LAYER_TYPE = 0x1
+VMSMESSAGEWITHLAYERINTEGERVALUESINDEX_LAYER_SUBTYPE = 0x2
+VMSMESSAGEWITHLAYERINTEGERVALUESINDEX_LAYER_VERSION = 0x3
+
+# VmsMessageWithLayerAndPublisherIdIntegerValuesIndex
+VMSMESSAGEWITHLAYERANDPUBLISHERIDINTEGERVALUESINDEX_PUBLISHER_ID = 0x4
+
+# VmsOfferingMessageIntegerValuesIndex
+VMSOFFERINGMESSAGEINTEGERVALUESINDEX_PUBLISHER_ID = 0x1
+VMSOFFERINGMESSAGEINTEGERVALUESINDEX_NUMBER_OF_OFFERS = 0x2
+VMSOFFERINGMESSAGEINTEGERVALUESINDEX_OFFERING_START = 0x3
+
+# VmsSubscriptionsStateIntegerValuesIndex
+VMSSUBSCRIPTIONSSTATEINTEGERVALUESINDEX_SEQUENCE_NUMBER = 0x1
+VMSSUBSCRIPTIONSSTATEINTEGERVALUESINDEX_NUMBER_OF_LAYERS = 0x2
+VMSSUBSCRIPTIONSSTATEINTEGERVALUESINDEX_NUMBER_OF_ASSOCIATED_LAYERS = 0x3
+VMSSUBSCRIPTIONSSTATEINTEGERVALUESINDEX_SUBSCRIPTIONS_START = 0x4
+
+# VmsAvailabilityStateIntegerValuesIndex
+VMSAVAILABILITYSTATEINTEGERVALUESINDEX_SEQUENCE_NUMBER = 0x1
+VMSAVAILABILITYSTATEINTEGERVALUESINDEX_NUMBER_OF_ASSOCIATED_LAYERS = 0x2
+VMSAVAILABILITYSTATEINTEGERVALUESINDEX_LAYERS_START = 0x3
+
+# VmsPublisherInformationIntegerValuesIndex
+VMSPUBLISHERINFORMATIONINTEGERVALUESINDEX_PUBLISHER_ID = 0x1
+
+# UserFlags
+USERFLAGS_NONE = 0x0
+USERFLAGS_SYSTEM = 0x1
+USERFLAGS_GUEST = 0x2
+USERFLAGS_EPHEMERAL = 0x4
+USERFLAGS_ADMIN = 0x8
+USERFLAGS_DISABLED = 0x10
+USERFLAGS_PROFILE = 0x20
+
+# InitialUserInfoRequestType
+INITIALUSERINFOREQUESTTYPE_FIRST_BOOT = 0x1
+INITIALUSERINFOREQUESTTYPE_FIRST_BOOT_AFTER_OTA = 0x2
+INITIALUSERINFOREQUESTTYPE_COLD_BOOT = 0x3
+INITIALUSERINFOREQUESTTYPE_RESUME = 0x4
+
+# InitialUserInfoResponseAction
+INITIALUSERINFORESPONSEACTION_DEFAULT = 0x0
+INITIALUSERINFORESPONSEACTION_SWITCH = 0x1
+INITIALUSERINFORESPONSEACTION_CREATE = 0x2
+
+# SwitchUserMessageType
+SWITCHUSERMESSAGETYPE_LEGACY_ANDROID_SWITCH = 0x1
+SWITCHUSERMESSAGETYPE_ANDROID_SWITCH = 0x2
+SWITCHUSERMESSAGETYPE_VEHICLE_RESPONSE = 0x3
+SWITCHUSERMESSAGETYPE_VEHICLE_REQUEST = 0x4
+SWITCHUSERMESSAGETYPE_ANDROID_POST_SWITCH = 0x5
+
+# SwitchUserStatus
+SWITCHUSERSTATUS_SUCCESS = 0x1
+SWITCHUSERSTATUS_FAILURE = 0x2
+
+# CreateUserStatus
+CREATEUSERSTATUS_SUCCESS = 0x1
+CREATEUSERSTATUS_FAILURE = 0x2
+
+# UserIdentificationAssociationType
+USERIDENTIFICATIONASSOCIATIONTYPE_KEY_FOB = 0x1
+USERIDENTIFICATIONASSOCIATIONTYPE_CUSTOM_1 = 0x65
+USERIDENTIFICATIONASSOCIATIONTYPE_CUSTOM_2 = 0x66
+USERIDENTIFICATIONASSOCIATIONTYPE_CUSTOM_3 = 0x67
+USERIDENTIFICATIONASSOCIATIONTYPE_CUSTOM_4 = 0x68
+
+# UserIdentificationAssociationValue
+USERIDENTIFICATIONASSOCIATIONVALUE_UNKNOWN = 0x1
+USERIDENTIFICATIONASSOCIATIONVALUE_ASSOCIATED_CURRENT_USER = 0x2
+USERIDENTIFICATIONASSOCIATIONVALUE_ASSOCIATED_ANOTHER_USER = 0x3
+USERIDENTIFICATIONASSOCIATIONVALUE_NOT_ASSOCIATED_ANY_USER = 0x4
+
+# UserIdentificationAssociationSetValue
+USERIDENTIFICATIONASSOCIATIONSETVALUE_ASSOCIATE_CURRENT_USER = 0x1
+USERIDENTIFICATIONASSOCIATIONSETVALUE_DISASSOCIATE_CURRENT_USER = 0x2
+USERIDENTIFICATIONASSOCIATIONSETVALUE_DISASSOCIATE_ALL_USERS = 0x3
+
+# RotaryInputType
+ROTARYINPUTTYPE_ROTARY_INPUT_TYPE_SYSTEM_NAVIGATION = 0x0
+ROTARYINPUTTYPE_ROTARY_INPUT_TYPE_AUDIO_VOLUME = 0x1
 
 # Create a container of value_type constants to be used by vhal_emulator
 class vhal_types_2_0:
diff --git a/tools/emulator/vhal_emulator_test.py b/tools/emulator/vhal_emulator_test.py
index 6c56a1a..db17262 100755
--- a/tools/emulator/vhal_emulator_test.py
+++ b/tools/emulator/vhal_emulator_test.py
@@ -125,6 +125,12 @@
                     # Truncate float to 5 decimal places
                     value = "%.5f" % value
                     value = float(value)
+                elif valType in self._types.TYPE_MIXED:
+                    # Quick stub to unblock most tests
+                    # Todo: proper implement according to VehiclePropertyType in types.hal
+                    value = rxMsg.value[0].float_values[0]
+                    value = "%.5f" % value
+                    value = float(value)
                 else:
                     self._log.error("getValueFromMsg:  valType=0x%X is not handled", valType)
                     value = None
diff --git a/tools/hidl_parser/parser.py b/tools/hidl_parser/parser.py
index 6ef19d5..c660cdb 100644
--- a/tools/hidl_parser/parser.py
+++ b/tools/hidl_parser/parser.py
@@ -29,14 +29,14 @@
 
 import ply
 
-tokens = ('package', 'import', 'enum', 'struct',
+tokens = ('package', 'import', 'enum', 'struct', 'typedef',
     'COLON', 'IDENTIFIER', 'COMMENT', 'NUMBER', 'HEX', 'OR', 'EQUALS',
     'LPAREN', 'RPAREN', 'LBRACE', 'RBRACE', 'DOT', 'SEMICOLON', 'VERSION',
     'COMMA', 'SHIFT', 'LESSTHAN', 'GREATERTHAN')
 
 t_COLON = r':'
 t_NUMBER = r'[0-9]+'
-t_HEX = r'0x[0-9A-Fa-f]+'
+t_HEX = r'0[x|X][0-9A-Fa-f]+'
 t_OR = r'\|'
 t_EQUALS = r'='
 t_LPAREN = r'\('
@@ -67,6 +67,8 @@
         t.type = 'enum'
     elif t.value == 'struct':
         t.type = 'struct'
+    elif t.value == 'typedef':
+        t.type = 'typedef'
     return t
 
 def t_error(t):
@@ -111,6 +113,13 @@
     def __str__(self):
         return 'struct %s' % self.name
 
+class TypedefHeader(object):
+    def __init__(self, name):
+        self.name = name
+
+    def __str__(self):
+        return 'typedef %s' % self.name
+
 class EnumDecl(object):
     def __init__(self, header, cases):
         self.header = header
@@ -150,6 +159,18 @@
     def __repr__(self):
         return self.__str__()
 
+class TypedefDecl(object):
+    def __init__(self, header, name):
+        self.header = header
+        self.name = name
+
+    def __str__(self):
+        return '%s {\n%s\n}' % (self.header,
+            self.name)
+
+    def __repr__(self):
+        return self.__str__()
+
 class StructElement(object):
     pass
 
@@ -220,7 +241,7 @@
         return self.value
 
     def resolve(self, enum, document):
-        if self.value.startswith("0x"):
+        if self.value.lower().startswith("0x"):
             return int(self.value, 16)
         else:
             return int(self.value, 10)
@@ -284,6 +305,14 @@
         enum = document['enums'][self.where]
         return EnumValueLocalRef(self.ref).resolve(enum, document)
 
+class Typedef(object):
+    def __init__(self, header, name):
+        self.header = header
+        self.name = name
+
+    def __str__(self):
+        return 'typedef %s %s' % (self.typename, self.name)
+
 # Error rule for syntax errors
 def p_error(p):
     print("Syntax error in input: %s" % p)
@@ -297,13 +326,18 @@
     'document : header type_decls'
     enums = {}
     structs = {}
+    typedefs = {}
     for enum in t[2]:
         if not isinstance(enum, EnumDecl): continue
         enums[enum.header.name] = enum
     for struct in t[2]:
         if not isinstance(struct, StructDecl): continue
         structs[struct.header.name] = struct
-    t[0] = {'header' : t[1], 'enums' : enums, 'structs' : structs}
+    for typedef in t[2]:
+        if not isinstance(typedef, TypedefDecl): continue
+        typedefs[typedef.header.name] = typedef
+
+    t[0] = {'header' : t[1], 'enums' : enums, 'structs' : structs, 'typedefs' : typedef}
 
 def p_type_decls_1(t):
     'type_decls : type_decl'
@@ -318,6 +352,9 @@
 def p_type_decl_s(t):
     'type_decl : struct_decl'
     t[0] = t[1]
+def p_type_decl_t(t):
+    'type_decl : typedef_decl'
+    t[0] = t[1]
 
 def p_enum_cases_1(t):
     'enum_cases : enum_case'
@@ -340,6 +377,10 @@
     'enum_base : IDENTIFIER'
     t[0] = t[1]
 
+def p_typedef_name(t):
+    'typedef_name : IDENTIFIER'
+    t[0] = t[1]
+
 def p_struct_header(t):
     'struct_header : struct IDENTIFIER'
     t[0] = StructHeader(t[2])
@@ -351,6 +392,10 @@
     'enum_header : enum IDENTIFIER COLON enum_base'
     t[0] = EnumHeader(t[2], t[4])
 
+def p_typedef_header(t):
+    'typedef_header : typedef IDENTIFIER'
+    t[0] = TypedefHeader(t[2])
+
 def p_struct_decl(t):
     'struct_decl : struct_header LBRACE struct_elements RBRACE SEMICOLON'
     t[0] = StructDecl(t[1], t[3])
@@ -362,6 +407,10 @@
     'enum_decl : enum_header LBRACE enum_cases COMMA RBRACE SEMICOLON'
     t[0] = EnumDecl(t[1], t[3])
 
+def p_typedef_decl(t):
+    'typedef_decl : typedef_header typedef_name SEMICOLON'
+    t[0] = TypedefDecl(t[1], t[2])
+
 def p_enum_value_1(t):
     '''enum_value : NUMBER
                   | HEX'''
@@ -442,6 +491,8 @@
 class SilentLogger(object):
     def warning(*args):
         pass
+    def error(*args):
+        print(args)
 
 import ply.yacc as yacc
 parser = yacc.yacc(debug=False, write_tables=False, errorlog=SilentLogger())
diff --git a/user/car-user-lib/Android.bp b/user/car-user-lib/Android.bp
index 12bc950..5fc5efc 100644
--- a/user/car-user-lib/Android.bp
+++ b/user/car-user-lib/Android.bp
@@ -17,9 +17,9 @@
     srcs: [
         "src/**/*.java",
     ],
-    static_libs: [
-        "android.car.settings",
+    libs: [
         "android.hardware.automotive.vehicle-V2.0-java",
+        "android.car.settings",
     ],
     product_variables: {
         pdk: {
diff --git a/user/car-user-lib/src/android/car/userlib/InitialUserSetter.java b/user/car-user-lib/src/android/car/userlib/InitialUserSetter.java
index 10b642b..aea4f3d 100644
--- a/user/car-user-lib/src/android/car/userlib/InitialUserSetter.java
+++ b/user/car-user-lib/src/android/car/userlib/InitialUserSetter.java
@@ -89,10 +89,18 @@
      */
     public static final int TYPE_CREATE = 2;
 
+    /**
+     * Creates a new guest user and switches to it, if current user is unlocked guest user.
+     * Does not fallback if any of these steps fails. falling back to
+     * {@link #fallbackDefaultBehavior(String) if any of these steps fails
+     */
+    public static final int TYPE_REPLACE_GUEST = 3;
+
     @IntDef(prefix = { "TYPE_" }, value = {
             TYPE_DEFAULT_BEHAVIOR,
             TYPE_SWITCH,
             TYPE_CREATE,
+            TYPE_REPLACE_GUEST
     })
     @Retention(RetentionPolicy.SOURCE)
     public @interface InitialUserInfoType { }
@@ -153,12 +161,11 @@
          * Constructor for the given type.
          *
          * @param type {@link #TYPE_DEFAULT_BEHAVIOR}, {@link #TYPE_SWITCH},
-         * or {@link #TYPE_CREATE}.
+         * {@link #TYPE_CREATE} or {@link #TYPE_REPLACE_GUEST}.
          */
         public Builder(@InitialUserInfoType int type) {
-            Preconditions.checkArgument(
-                    type == TYPE_DEFAULT_BEHAVIOR || type == TYPE_SWITCH || type == TYPE_CREATE,
-                    "invalid builder type");
+            Preconditions.checkArgument(type == TYPE_DEFAULT_BEHAVIOR || type == TYPE_SWITCH
+                    || type == TYPE_CREATE || type == TYPE_REPLACE_GUEST, "invalid builder type");
             mType = type;
         }
 
@@ -289,11 +296,42 @@
                                     + e);
                 }
                 break;
+            case TYPE_REPLACE_GUEST:
+                try {
+                    replaceUser(info, /* fallback= */ true);
+                } catch (Exception e) {
+                    fallbackDefaultBehavior(info, /* fallback= */ true,
+                            "Exception replace guest user: " + e);
+                }
+                break;
             default:
                 throw new IllegalArgumentException("invalid InitialUserInfo type: " + info.type);
         }
     }
 
+    private void replaceUser(InitialUserInfo info, boolean fallback) {
+        int currentUserId = ActivityManager.getCurrentUser();
+        UserInfo currentUser = mUm.getUserInfo(currentUserId);
+
+        UserInfo newUser = replaceGuestIfNeeded(currentUser);
+        if (newUser == null) {
+            fallbackDefaultBehavior(info, fallback,
+                    "could not replace guest " + currentUser.toFullString());
+            return;
+        }
+
+        switchUser(new Builder(TYPE_SWITCH)
+                .setSwitchUserId(newUser.id)
+                .build(), fallback);
+
+        if (newUser.id != currentUser.id) {
+            Slog.i(TAG, "Removing old guest " + currentUser.id);
+            if (!mUm.removeUser(currentUser.id)) {
+                Slog.w(TAG, "Could not remove old guest " + currentUser.id);
+            }
+        }
+    }
+
     private void executeDefaultBehavior(@NonNull InitialUserInfo info, boolean fallback) {
         if (!mHelper.hasInitialUser()) {
             if (DBG) Log.d(TAG, "executeDefaultBehavior(): no initial user, creating it");
@@ -385,6 +423,23 @@
         }
     }
 
+    /**
+     * Check if the user is a guest and can be replaced.
+     */
+    public boolean canReplaceGuestUser(UserInfo user) {
+        if (!user.isGuest()) return false;
+
+        if (mLockPatternUtils.isSecure(user.id)) {
+            if (DBG) {
+                Log.d(TAG, "replaceGuestIfNeeded(), skipped, since user "
+                        + user.id + " has secure lock pattern");
+            }
+            return false;
+        }
+
+        return true;
+    }
+
     // TODO(b/151758646): move to CarUserManagerHelper
     /**
      * Replaces {@code user} by a new guest, if necessary.
@@ -394,17 +449,13 @@
      * <p>Otherwise, it marks the current guest for deletion, creates a new one, and returns the
      * new guest (or {@code null} if a new guest could not be created).
      */
+
+    @VisibleForTesting
     @Nullable
-    public UserInfo replaceGuestIfNeeded(@NonNull UserInfo user) {
+    UserInfo replaceGuestIfNeeded(@NonNull UserInfo user) {
         Preconditions.checkArgument(user != null, "user cannot be null");
 
-        if (!user.isGuest()) return user;
-
-        if (mLockPatternUtils.isSecure(user.id)) {
-            if (DBG) {
-                Log.d(TAG, "replaceGuestIfNeeded(), skipped, since user "
-                        + user.id + " has secure lock pattern");
-            }
+        if (!canReplaceGuestUser(user)) {
             return user;
         }
 
diff --git a/user/car-user-lib/src/android/car/userlib/UserHelper.java b/user/car-user-lib/src/android/car/userlib/UserHelper.java
index 9535ffb..ba3d679 100644
--- a/user/car-user-lib/src/android/car/userlib/UserHelper.java
+++ b/user/car-user-lib/src/android/car/userlib/UserHelper.java
@@ -15,16 +15,34 @@
  */
 package android.car.userlib;
 
+import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.annotation.UserIdInt;
+import android.content.Context;
+import android.content.pm.UserInfo;
+import android.graphics.Bitmap;
 import android.os.UserHandle;
 import android.os.UserManager;
 
+import com.android.internal.util.Preconditions;
+import com.android.internal.util.UserIcons;
+
+import com.google.android.collect.Sets;
+
+import java.util.Set;
+
 /**
  * Provides utility methods for generic user-related functionalities that don't require a manager.
  */
 public final class UserHelper {
 
+    /**
+     * Default set of restrictions for Non-Admin users.
+     */
+    private static final Set<String> DEFAULT_NON_ADMIN_RESTRICTIONS = Sets.newArraySet(
+            UserManager.DISALLOW_FACTORY_RESET
+    );
+
     private UserHelper() {
         throw new UnsupportedOperationException("contains only static methods");
     }
@@ -43,4 +61,41 @@
     public static boolean isHeadlessSystemUser(@UserIdInt int userId) {
         return userId == UserHandle.USER_SYSTEM && UserManager.isHeadlessSystemUserMode();
     }
+
+    /**
+     * Sets the values of default Non-Admin restrictions to the passed in value.
+     *
+     * @param context Current application context
+     * @param user User to set restrictions on.
+     * @param enable If true, restriction is ON, If false, restriction is OFF.
+     */
+    public static void setDefaultNonAdminRestrictions(@NonNull Context context,
+            @NonNull UserInfo user, boolean enable) {
+        Preconditions.checkArgument(context != null, "Context cannot be null");
+        Preconditions.checkArgument(user != null, "User cannot be null");
+
+        UserManager userManager = UserManager.get(context);
+        for (String restriction : DEFAULT_NON_ADMIN_RESTRICTIONS) {
+            userManager.setUserRestriction(restriction, enable, user.getUserHandle());
+        }
+    }
+
+    /**
+     * Assigns a default icon to a user according to the user's id.
+     *
+     * @param context Current application context
+     * @param user User whose avatar is set to default icon.
+     * @return Bitmap of the user icon.
+     */
+    @NonNull
+    public static Bitmap assignDefaultIcon(@NonNull Context context, @NonNull UserInfo user) {
+        Preconditions.checkArgument(context != null, "Context cannot be null");
+        Preconditions.checkArgument(user != null, "User cannot be null");
+
+        int idForIcon = user.isGuest() ? UserHandle.USER_NULL : user.id;
+        Bitmap bitmap = UserIcons.convertToBitmap(
+                UserIcons.getDefaultUserIcon(context.getResources(), idForIcon, false));
+        UserManager.get(context).setUserIcon(user.id, bitmap);
+        return bitmap;
+    }
 }
diff --git a/watchdog/server/src/IoPerfCollection.cpp b/watchdog/server/src/IoPerfCollection.cpp
index 2799417..bb7b04d 100644
--- a/watchdog/server/src/IoPerfCollection.cpp
+++ b/watchdog/server/src/IoPerfCollection.cpp
@@ -414,13 +414,9 @@
     return {};
 }
 
-Result<void> IoPerfCollection::dump(int fd, const Vector<String16>& args) {
+Result<void> IoPerfCollection::onCustomCollection(int fd, const Vector<String16>& args) {
     if (args.empty()) {
-        const auto& ret = dumpCollection(fd);
-        if (!ret) {
-            return ret;
-        }
-        return {};
+        return Error(BAD_VALUE) << "No I/O perf collection dump arguments";
     }
 
     if (args[0] == String16(kStartCustomCollectionFlag)) {
@@ -494,26 +490,7 @@
                             << kEndCustomCollectionFlag << " flags";
 }
 
-bool IoPerfCollection::dumpHelpText(int fd) {
-    long periodicCacheMinutes =
-            (std::chrono::duration_cast<std::chrono::seconds>(mPeriodicCollection.interval)
-                     .count() *
-             mPeriodicCollection.maxCacheSize) /
-            60;
-    return WriteStringToFd(StringPrintf(kHelpText, kStartCustomCollectionFlag, kIntervalFlag,
-                                        std::chrono::duration_cast<std::chrono::seconds>(
-                                                kCustomCollectionInterval)
-                                                .count(),
-                                        kMaxDurationFlag,
-                                        std::chrono::duration_cast<std::chrono::minutes>(
-                                                kCustomCollectionDuration)
-                                                .count(),
-                                        kFilterPackagesFlag, mTopNStatsPerCategory,
-                                        kEndCustomCollectionFlag, periodicCacheMinutes),
-                           fd);
-}
-
-Result<void> IoPerfCollection::dumpCollection(int fd) {
+Result<void> IoPerfCollection::onDump(int fd) {
     Mutex::Autolock lock(mMutex);
     if (mCurrCollectionEvent == CollectionEvent::TERMINATED) {
         ALOGW("I/O performance data collection not active. Dumping cached data");
@@ -545,6 +522,25 @@
     return {};
 }
 
+bool IoPerfCollection::dumpHelpText(int fd) {
+    long periodicCacheMinutes =
+            (std::chrono::duration_cast<std::chrono::seconds>(mPeriodicCollection.interval)
+                     .count() *
+             mPeriodicCollection.maxCacheSize) /
+            60;
+    return WriteStringToFd(StringPrintf(kHelpText, kStartCustomCollectionFlag, kIntervalFlag,
+                                        std::chrono::duration_cast<std::chrono::seconds>(
+                                                kCustomCollectionInterval)
+                                                .count(),
+                                        kMaxDurationFlag,
+                                        std::chrono::duration_cast<std::chrono::minutes>(
+                                                kCustomCollectionDuration)
+                                                .count(),
+                                        kFilterPackagesFlag, mTopNStatsPerCategory,
+                                        kEndCustomCollectionFlag, periodicCacheMinutes),
+                           fd);
+}
+
 Result<void> IoPerfCollection::dumpCollectorsStatusLocked(int fd) {
     if (!mUidIoStats->enabled() &&
         !WriteStringToFd(StringPrintf("UidIoStats collector failed to access the file %s",
diff --git a/watchdog/server/src/IoPerfCollection.h b/watchdog/server/src/IoPerfCollection.h
index 4cccb05..d516216 100644
--- a/watchdog/server/src/IoPerfCollection.h
+++ b/watchdog/server/src/IoPerfCollection.h
@@ -184,19 +184,18 @@
     virtual android::base::Result<void> onBootFinished();
 
     // Depending the arguments, it either:
-    // 1. Generates a dump from the boot-time and periodic collection events.
-    // 2. Starts custom collection.
-    // 3. Ends custom collection and dumps the collected data.
+    // 1. Starts custom collection.
+    // 2. Ends custom collection and dumps the collected data.
     // Returns any error observed during the dump generation.
-    virtual android::base::Result<void> dump(int fd, const Vector<String16>& args);
+    virtual android::base::Result<void> onCustomCollection(int fd, const Vector<String16>& args);
+
+    // Generates a dump from the boot-time and periodic collection events.
+    virtual android::base::Result<void> onDump(int fd);
 
     // Dumps the help text.
     bool dumpHelpText(int fd);
 
 private:
-    // Generates a dump from the boot-time and periodic collection events.
-    android::base::Result<void> dumpCollection(int fd);
-
     // Dumps the collectors' status when they are disabled.
     android::base::Result<void> dumpCollectorsStatusLocked(int fd);
 
diff --git a/watchdog/server/src/WatchdogBinderMediator.cpp b/watchdog/server/src/WatchdogBinderMediator.cpp
index 0a482fd..fd0dd8e 100644
--- a/watchdog/server/src/WatchdogBinderMediator.cpp
+++ b/watchdog/server/src/WatchdogBinderMediator.cpp
@@ -21,6 +21,7 @@
 #include <android-base/file.h>
 #include <android-base/parseint.h>
 #include <android-base/stringprintf.h>
+#include <android-base/strings.h>
 #include <android/automotive/watchdog/BootPhase.h>
 #include <android/automotive/watchdog/PowerCycle.h>
 #include <android/automotive/watchdog/UserState.h>
@@ -36,6 +37,7 @@
 
 using android::defaultServiceManager;
 using android::base::Error;
+using android::base::Join;
 using android::base::ParseUint;
 using android::base::Result;
 using android::base::StringPrintf;
@@ -52,7 +54,7 @@
         "%s or %s: Displays this help text.\n"
         "When no options are specified, carwatchdog report is generated.\n";
 
-Status checkSystemPermission() {
+Status checkSystemUser() {
     if (IPCThreadState::self()->getCallingUid() != AID_SYSTEM) {
         return Status::fromExceptionCode(Status::EX_SECURITY,
                                          "Calling process does not have proper privilege");
@@ -91,31 +93,18 @@
 }
 
 status_t WatchdogBinderMediator::dump(int fd, const Vector<String16>& args) {
-    if (args.empty()) {
-        auto ret = mWatchdogProcessService->dump(fd, args);
-        if (!ret.ok()) {
-            ALOGW("Failed to dump carwatchdog process service: %s", ret.error().message().c_str());
-            return ret.error().code();
-        }
-        ret = mIoPerfCollection->dump(fd, args);
-        if (!ret.ok()) {
-            ALOGW("Failed to dump I/O perf collection: %s", ret.error().message().c_str());
-            return ret.error().code();
-        }
-        return OK;
-    }
-
-    if (args[0] == String16(kHelpFlag) || args[0] == String16(kHelpShortFlag)) {
+    int numArgs = args.size();
+    if (numArgs == 1 && (args[0] == String16(kHelpFlag) || args[0] == String16(kHelpShortFlag))) {
         if (!dumpHelpText(fd, "")) {
             ALOGW("Failed to write help text to fd");
             return FAILED_TRANSACTION;
         }
         return OK;
     }
-
-    if (args[0] == String16(kStartCustomCollectionFlag) ||
-        args[0] == String16(kEndCustomCollectionFlag)) {
-        auto ret = mIoPerfCollection->dump(fd, args);
+    if (numArgs >= 1 &&
+        (args[0] == String16(kStartCustomCollectionFlag) ||
+         args[0] == String16(kEndCustomCollectionFlag))) {
+        auto ret = mIoPerfCollection->onCustomCollection(fd, args);
         if (!ret.ok()) {
             std::string mode = args[0] == String16(kStartCustomCollectionFlag) ? "start" : "end";
             std::string errorMsg = StringPrintf("Failed to %s custom I/O perf collection: %s",
@@ -129,8 +118,23 @@
         }
         return OK;
     }
-    dumpHelpText(fd, "Invalid dump arguments");
-    return INVALID_OPERATION;
+
+    if (numArgs > 0) {
+        ALOGW("Car watchdog cannot recognize the given option(%s). Dumping the current state...",
+              Join(args, " ").c_str());
+    }
+
+    auto ret = mWatchdogProcessService->dump(fd, args);
+    if (!ret.ok()) {
+        ALOGW("Failed to dump carwatchdog process service: %s", ret.error().message().c_str());
+        return ret.error().code();
+    }
+    ret = mIoPerfCollection->onDump(fd);
+    if (!ret.ok()) {
+        ALOGW("Failed to dump I/O perf collection: %s", ret.error().message().c_str());
+        return ret.error().code();
+    }
+    return OK;
 }
 
 bool WatchdogBinderMediator::dumpHelpText(int fd, std::string errorMsg) {
@@ -147,7 +151,7 @@
 }
 
 Status WatchdogBinderMediator::registerMediator(const sp<ICarWatchdogClient>& mediator) {
-    Status status = checkSystemPermission();
+    Status status = checkSystemUser();
     if (!status.isOk()) {
         return status;
     }
@@ -155,29 +159,47 @@
 }
 
 Status WatchdogBinderMediator::unregisterMediator(const sp<ICarWatchdogClient>& mediator) {
-    Status status = checkSystemPermission();
+    Status status = checkSystemUser();
     if (!status.isOk()) {
         return status;
     }
     return mWatchdogProcessService->unregisterMediator(mediator);
 }
 Status WatchdogBinderMediator::registerMonitor(const sp<ICarWatchdogMonitor>& monitor) {
-    Status status = checkSystemPermission();
+    Status status = checkSystemUser();
     if (!status.isOk()) {
         return status;
     }
     return mWatchdogProcessService->registerMonitor(monitor);
 }
 Status WatchdogBinderMediator::unregisterMonitor(const sp<ICarWatchdogMonitor>& monitor) {
-    Status status = checkSystemPermission();
+    Status status = checkSystemUser();
     if (!status.isOk()) {
         return status;
     }
     return mWatchdogProcessService->unregisterMonitor(monitor);
 }
 
+Status WatchdogBinderMediator::tellMediatorAlive(const sp<ICarWatchdogClient>& mediator,
+                                                 const std::vector<int32_t>& clientsNotResponding,
+                                                 int32_t sessionId) {
+    Status status = checkSystemUser();
+    if (!status.isOk()) {
+        return status;
+    }
+    return mWatchdogProcessService->tellMediatorAlive(mediator, clientsNotResponding, sessionId);
+}
+Status WatchdogBinderMediator::tellDumpFinished(const android::sp<ICarWatchdogMonitor>& monitor,
+                                                int32_t pid) {
+    Status status = checkSystemUser();
+    if (!status.isOk()) {
+        return status;
+    }
+    return mWatchdogProcessService->tellDumpFinished(monitor, pid);
+}
+
 Status WatchdogBinderMediator::notifySystemStateChange(StateType type, int32_t arg1, int32_t arg2) {
-    Status status = checkSystemPermission();
+    Status status = checkSystemUser();
     if (!status.isOk()) {
         return status;
     }
diff --git a/watchdog/server/src/WatchdogBinderMediator.h b/watchdog/server/src/WatchdogBinderMediator.h
index 530659b..dbc26a3 100644
--- a/watchdog/server/src/WatchdogBinderMediator.h
+++ b/watchdog/server/src/WatchdogBinderMediator.h
@@ -61,14 +61,9 @@
     }
     binder::Status tellMediatorAlive(const sp<ICarWatchdogClient>& mediator,
                                      const std::vector<int32_t>& clientsNotResponding,
-                                     int32_t sessionId) override {
-        return mWatchdogProcessService->tellMediatorAlive(mediator, clientsNotResponding,
-                                                          sessionId);
-    }
+                                     int32_t sessionId) override;
     binder::Status tellDumpFinished(const android::sp<ICarWatchdogMonitor>& monitor,
-                                    int32_t pid) override {
-        return mWatchdogProcessService->tellDumpFinished(monitor, pid);
-    }
+                                    int32_t pid) override;
     binder::Status notifySystemStateChange(StateType type, int32_t arg1, int32_t arg2) override;
 
 protected:
diff --git a/watchdog/server/tests/IoPerfCollectionTest.cpp b/watchdog/server/tests/IoPerfCollectionTest.cpp
index 82287bf..9b46e0d 100644
--- a/watchdog/server/tests/IoPerfCollectionTest.cpp
+++ b/watchdog/server/tests/IoPerfCollectionTest.cpp
@@ -556,7 +556,7 @@
     args.push_back(String16(kMaxDurationFlag));
     args.push_back(String16(std::to_string(kTestCustomCollectionDuration.count()).c_str()));
 
-    ret = collector->dump(-1, args);
+    ret = collector->onCustomCollection(-1, args);
     ASSERT_TRUE(ret.ok()) << ret.error().message();
     uidIoStatsStub->push({
             {1009, {.uid = 1009, .ios = {0, 13000, 0, 15000, 0, 100}}},
@@ -691,7 +691,7 @@
     args.clear();
     args.push_back(String16(kEndCustomCollectionFlag));
     TemporaryFile customDump;
-    ret = collector->dump(customDump.fd, args);
+    ret = collector->onCustomCollection(customDump.fd, args);
     ASSERT_TRUE(ret.ok()) << ret.error().message();
     ret = looperStub->pollCache();
     ASSERT_TRUE(ret) << ret.error().message();
@@ -773,7 +773,7 @@
             << "Boot-time records not persisted until collector termination";
 
     TemporaryFile bugreportDump;
-    ret = collector->dump(bugreportDump.fd, {});
+    ret = collector->onDump(bugreportDump.fd);
     ASSERT_TRUE(ret.ok()) << ret.error().message();
 
     collector->terminate();
@@ -869,7 +869,7 @@
     args.push_back(String16(kFilterPackagesFlag));
     args.push_back(String16("android.car.cts,system_server"));
 
-    ret = collector->dump(-1, args);
+    ret = collector->onCustomCollection(-1, args);
     ASSERT_TRUE(ret.ok()) << ret.error().message();
 
     // Custom collection
@@ -1028,7 +1028,7 @@
     args.push_back(String16(kMaxDurationFlag));
     args.push_back(String16(std::to_string(kTestCustomCollectionDuration.count()).c_str()));
 
-    ret = collector->dump(-1, args);
+    ret = collector->onCustomCollection(-1, args);
     ASSERT_TRUE(ret.ok()) << ret.error().message();
     // Maximum custom collection iterations during |kTestCustomCollectionDuration|.
     int maxIterations =
@@ -1493,29 +1493,29 @@
     args.push_back(String16(kStartCustomCollectionFlag));
     args.push_back(String16("Invalid flag"));
     args.push_back(String16("Invalid value"));
-    ASSERT_FALSE(collector->dump(-1, args).ok());
+    ASSERT_FALSE(collector->onCustomCollection(-1, args).ok());
 
     args.clear();
     args.push_back(String16(kStartCustomCollectionFlag));
     args.push_back(String16(kIntervalFlag));
     args.push_back(String16("Invalid interval"));
-    ASSERT_FALSE(collector->dump(-1, args).ok());
+    ASSERT_FALSE(collector->onCustomCollection(-1, args).ok());
 
     args.clear();
     args.push_back(String16(kStartCustomCollectionFlag));
     args.push_back(String16(kMaxDurationFlag));
     args.push_back(String16("Invalid duration"));
-    ASSERT_FALSE(collector->dump(-1, args).ok());
+    ASSERT_FALSE(collector->onCustomCollection(-1, args).ok());
 
     args.clear();
     args.push_back(String16(kEndCustomCollectionFlag));
     args.push_back(String16(kMaxDurationFlag));
     args.push_back(String16(std::to_string(kTestCustomCollectionDuration.count()).c_str()));
-    ASSERT_FALSE(collector->dump(-1, args).ok());
+    ASSERT_FALSE(collector->onCustomCollection(-1, args).ok());
 
     args.clear();
     args.push_back(String16("Invalid flag"));
-    ASSERT_FALSE(collector->dump(-1, args).ok());
+    ASSERT_FALSE(collector->onCustomCollection(-1, args).ok());
     collector->terminate();
 }
 
diff --git a/watchdog/server/tests/WatchdogBinderMediatorTest.cpp b/watchdog/server/tests/WatchdogBinderMediatorTest.cpp
index 0d1cf05..7e44893 100644
--- a/watchdog/server/tests/WatchdogBinderMediatorTest.cpp
+++ b/watchdog/server/tests/WatchdogBinderMediatorTest.cpp
@@ -69,7 +69,9 @@
 public:
     MockIoPerfCollection() {}
     MOCK_METHOD(Result<void>, onBootFinished, (), (override));
-    MOCK_METHOD(Result<void>, dump, (int fd, const Vector<String16>& args), (override));
+    MOCK_METHOD(Result<void>, onCustomCollection, (int fd, const Vector<String16>& args),
+                (override));
+    MOCK_METHOD(Result<void>, onDump, (int fd), (override));
 };
 
 class MockICarWatchdogClient : public ICarWatchdogClient {
@@ -153,12 +155,12 @@
 
 TEST_F(WatchdogBinderMediatorTest, TestHandlesEmptyDumpArgs) {
     EXPECT_CALL(*mMockWatchdogProcessService, dump(-1, _)).WillOnce(Return(Result<void>()));
-    EXPECT_CALL(*mMockIoPerfCollection, dump(-1, _)).WillOnce(Return(Result<void>()));
+    EXPECT_CALL(*mMockIoPerfCollection, onDump(-1)).WillOnce(Return(Result<void>()));
     mWatchdogBinderMediator->dump(-1, Vector<String16>());
 }
 
 TEST_F(WatchdogBinderMediatorTest, TestHandlesStartCustomIoPerfCollection) {
-    EXPECT_CALL(*mMockIoPerfCollection, dump(-1, _)).WillOnce(Return(Result<void>()));
+    EXPECT_CALL(*mMockIoPerfCollection, onCustomCollection(-1, _)).WillOnce(Return(Result<void>()));
 
     Vector<String16> args;
     args.push_back(String16(kStartCustomCollectionFlag));
@@ -166,7 +168,7 @@
 }
 
 TEST_F(WatchdogBinderMediatorTest, TestHandlesStopCustomIoPerfCollection) {
-    EXPECT_CALL(*mMockIoPerfCollection, dump(-1, _)).WillOnce(Return(Result<void>()));
+    EXPECT_CALL(*mMockIoPerfCollection, onCustomCollection(-1, _)).WillOnce(Return(Result<void>()));
 
     Vector<String16> args;
     args.push_back(String16(kEndCustomCollectionFlag));
@@ -176,7 +178,7 @@
 TEST_F(WatchdogBinderMediatorTest, TestErrorOnInvalidDumpArgs) {
     Vector<String16> args;
     args.push_back(String16("--invalid_option"));
-    ASSERT_NE(mWatchdogBinderMediator->dump(-1, args), OK) << "No error on invalid args";
+    ASSERT_EQ(mWatchdogBinderMediator->dump(-1, args), OK) << "Error returned on invalid args";
 }
 
 TEST_F(WatchdogBinderMediatorTest, TestRegisterClient) {
@@ -268,7 +270,16 @@
     ASSERT_TRUE(status.isOk()) << status;
 }
 
+TEST_F(WatchdogBinderMediatorTest, TestErrorOnTellMediatorAliveWithNonSystemCallingUid) {
+    sp<ICarWatchdogClient> mediator = new MockICarWatchdogClient();
+    std::vector clientsNotResponding = {123};
+    EXPECT_CALL(*mMockWatchdogProcessService, tellMediatorAlive(_, _, _)).Times(0);
+    Status status = mWatchdogBinderMediator->tellMediatorAlive(mediator, clientsNotResponding, 456);
+    ASSERT_FALSE(status.isOk()) << status;
+}
+
 TEST_F(WatchdogBinderMediatorTest, TestTellMediatorAlive) {
+    setSystemCallingUid();
     sp<ICarWatchdogClient> mediator = new MockICarWatchdogClient();
     std::vector clientsNotResponding = {123};
     EXPECT_CALL(*mMockWatchdogProcessService,
@@ -278,7 +289,15 @@
     ASSERT_TRUE(status.isOk()) << status;
 }
 
+TEST_F(WatchdogBinderMediatorTest, TestErrorOnTellDumpFinishedWithNonSystemCallingUid) {
+    sp<ICarWatchdogMonitor> monitor = new MockICarWatchdogMonitor();
+    EXPECT_CALL(*mMockWatchdogProcessService, tellDumpFinished(_, _)).Times(0);
+    Status status = mWatchdogBinderMediator->tellDumpFinished(monitor, 456);
+    ASSERT_FALSE(status.isOk()) << status;
+}
+
 TEST_F(WatchdogBinderMediatorTest, TestTellDumpFinished) {
+    setSystemCallingUid();
     sp<ICarWatchdogMonitor> monitor = new MockICarWatchdogMonitor();
     EXPECT_CALL(*mMockWatchdogProcessService, tellDumpFinished(monitor, 456))
             .WillOnce(Return(Status::ok()));