Merge Android 24Q1 Release (ab/11220357)temp_319669529

Bug: 319669529 Merged-In: I607934bed6772c768c202dadd3eecd8d703404f9 Change-Id: I5e274fb7c443e96b9dcb0365e047395324dd76cc
author: Xin Li <delphij@google.com> 2024-01-17 22:14:18 -0800
committer: Xin Li <delphij@google.com> 2024-01-17 22:14:18 -0800
commit: 9c1df7c5e05084db1ec6905b2f591e43aa71cc38 (patch)
tree: 1b7f4d125385de806a0f0e3f7a65c3faa8bd2c37
parent: b23abcfd5fb50e8f1ef216f9242ce21c0244f347 (diff)
parent: fce271ecc889073fcae7a7352ad11c8273c00b99 (diff)
download: SystemUI-9c1df7c5e05084db1ec6905b2f591e43aa71cc38.tar.gz
345 files changed, 8401 insertions, 4682 deletions
diff --git a/Android.bp b/Android.bp
index a2ede9e8..f1e6ae4c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,6 +41,8 @@ android_library {
         "car-helper-lib",
         "car-ui-lib-no-overlayable",
         "car-qc-lib",
+        "car-resource-common",
+        "com_android_systemui_car_flags_lib",
         "androidx.legacy_legacy-support-v4",
         "androidx.recyclerview_recyclerview",
         "androidx.preference_preference",
@@ -59,6 +61,7 @@ android_library {
         "dagger2",
         "//external/kotlinc:kotlin-annotations",
         "animationlib",
+        "CarDockLib",
     ],
 
     libs: [
@@ -69,6 +72,8 @@ android_library {
         "--no-resource-deduping",
     ],
 
+    javacflags: ["-Adagger.fastInit=enabled"],
+
     manifest: "AndroidManifest.xml",
 
     plugins: ["dagger2-compiler"],
@@ -113,6 +118,8 @@ android_library {
         "car-helper-lib",
         "car-ui-lib-no-overlayable",
         "car-qc-lib",
+        "car-resource-common",
+        "com_android_systemui_car_flags_lib",
         "SystemUI-tags",
         "SystemUI-proto",
         "metrics-helper-lib",
@@ -124,6 +131,7 @@ android_library {
         "testng",
         "dagger2",
         "//external/kotlinc:kotlin-annotations",
+        "CarDockLib",
     ],
     libs: [
         "android.test.runner",
@@ -138,6 +146,10 @@ android_library {
 
     plugins: ["dagger2-compiler"],
 
+    lint: {
+        test: true,
+    },
+
     // TODO(b/218518451) re-enable errorprone.
     errorprone: {
         enabled: false,
@@ -173,6 +185,10 @@ android_app {
             "proguard.flags",
         ],
     },
+    // TODO(b/301283770): Compiling CarSystemUI should not require -J-Xmx8192M
+    javacflags: [
+        "-J-Xmx8192M",
+    ],
     dxflags: ["--multi-dex"],
 
     aaptflags: [
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bc30d247..c64717da 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -51,8 +51,15 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
     <!-- This permission is required to register the car system ui proxy -->
     <uses-permission android:name="android.car.permission.REGISTER_CAR_SYSTEM_UI_PROXY"/>
+    <!-- This permission is required to create a CarTaskViewController -->
+    <uses-permission android:name="android.car.permission.MANAGE_CAR_SYSTEM_UI"/>
     <!-- use for ActivityBlockingActivity to tell whether it's on driver or passenger display -->
     <uses-permission android:name="android.car.permission.ACCESS_PRIVATE_DISPLAY_ID"/>
+    <!-- use for querying DisplayCompat packages -->
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
+    <uses-permission android:name="android.car.permission.QUERY_DISPLAY_COMPATIBILITY"/>
+    <!-- Permission to allow receiving broadcast events for the dock -->
+    <uses-permission android:name="com.android.car.docklib.permission.BROADCAST_RECEIVER" />
 
     <application
         tools:replace="android:name,android:appComponentFactory"
diff --git a/aconfig/Android.bp b/aconfig/Android.bp
new file mode 100644
index 00000000..82e95d11
--- /dev/null
+++ b/aconfig/Android.bp
@@ -0,0 +1,32 @@
+//
+// Copyright (C) 2023 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+aconfig_declarations {
+    name: "com_android_systemui_car_flags",
+    package: "com.android.systemui.car",
+    srcs: [
+        "*.aconfig",
+    ],
+}
+
+java_aconfig_library {
+    name: "com_android_systemui_car_flags_lib",
+    aconfig_declarations: "com_android_systemui_car_flags",
+}
diff --git a/aconfig/carsystemui.aconfig b/aconfig/carsystemui.aconfig
new file mode 100644
index 00000000..a495b824
--- /dev/null
+++ b/aconfig/carsystemui.aconfig
@@ -0,0 +1,8 @@
+package: "com.android.systemui.car"
+
+flag {
+    name: "example_flag"
+    namespace: "systemui_car"
+    description: "An Example Flag"
+    bug: "304307370"
+}
diff --git a/proguard.flags b/proguard.flags
index a853277f..381959ea 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -1,3 +1,5 @@
+-include ../../../../frameworks/base/packages/SystemUI/proguard_common.flags
+
 -keep class com.android.systemui.CarSystemUIInitializer
 -keep class com.android.car.notification.headsup.animationhelper.**
 
@@ -10,4 +12,3 @@
 -keep class com.android.systemui.car.qc.ProfileSwitcher { *; }
 -keep class com.android.systemui.car.qc.DriveModeQcPanel { *; }
 
--include ../../../../frameworks/base/packages/SystemUI/proguard.flags
diff --git a/res/color/car_nav_icon_fill_color_selected.xml b/res/color/car_nav_icon_fill_color_selected.xml
new file mode 100644
index 00000000..9878ecd2
--- /dev/null
+++ b/res/color/car_nav_icon_fill_color_selected.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT 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:color="@color/car_on_primary"  android:state_selected="true"/>
+    <item android:color="@color/car_primary_100"/>
+</selector>
diff --git a/res/color/system_bar_text_unavailable_color.xml b/res/color/system_bar_text_unavailable_color.xml
new file mode 100644
index 00000000..293ff01d
--- /dev/null
+++ b/res/color/system_bar_text_unavailable_color.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT 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:alpha="?android:attr/disabledAlpha"
+        android:color="@color/system_bar_text_color"/>
+</selector>
diff --git a/res/drawable/ac_master_switch_off.xml b/res/drawable/ac_master_switch_off.xml
index 0292eee6..538a751f 100644
--- a/res/drawable/ac_master_switch_off.xml
+++ b/res/drawable/ac_master_switch_off.xml
@@ -14,82 +14,11 @@
   -->
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="48"
-    android:viewportHeight="48"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
     android:width="@dimen/hvac_power_icon_drawable_width"
     android:height="@dimen/hvac_power_icon_drawable_height">
     <path
-        android:pathData="M16 6L20 6L20 14L28 14L28 6L32 6L32 14.5L33.5 15L36 18.5L36 29L34.5 29L16 10.5L16 6Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M7.5 9L41 41.5L38.5 43L29 35L29 42L19 42L19 35.5L12 28.5L12 18.5L13 17.5L6 10.5L7.5 9Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M7.5 8L6.5 10L7.5 8Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.5372549"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.5372549"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M6.5 11L11.5 17L6.5 11Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.5372549"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.5372549"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M15.5 15L31.5 32L15.5 15Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.5372549"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.5372549"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M29.5 35L39 43.5L30.5 36L29.5 35Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.5372549"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.5372549"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M8.5 8L14.5 15L8.5 8Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.454902"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.454902"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M16.5 11L36 29.5L34.5 30L16.5 11Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.454902"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.454902"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M12.5 29L17.5 35L12.5 29Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.454902"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.454902"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M32.5 32L39.5 40L32.5 32Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.454902"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.454902"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M40.5 42L39.5 44L40.5 42Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.454902"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.454902"
-        android:strokeWidth="1" />
+        android:pathData="M380,840L380,720L240,580L240,360Q240,336 251,315Q262,294 283,283L360,360L320,360Q320,360 320,360Q320,360 320,360L320,546L460,686L460,760L500,760L500,686L537,649L56,168L112,112L848,848L792,904L594,706L580,720L580,840L380,840ZM686,572L640,526L640,360Q640,360 640,360Q640,360 640,360L474,360L320,206L320,120L400,120L400,280L400,280L560,280L560,120L640,120L640,320L600,280L640,280Q673,280 696.5,303.5Q720,327 720,360L720,538L686,572ZM558,444L558,444Q558,444 558,444Q558,444 558,444L558,444L558,444ZM428,541L428,541L428,541L428,541L428,541L428,541L428,541L428,541Z"
+        android:fillColor="@color/hvac_master_switch_color" />
 </vector>
 \ No newline at end of file
diff --git a/res/drawable/ac_master_switch_on.xml b/res/drawable/ac_master_switch_on.xml
index 6523e0bb..97b7e21c 100644
--- a/res/drawable/ac_master_switch_on.xml
+++ b/res/drawable/ac_master_switch_on.xml
@@ -16,237 +16,11 @@
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:viewportWidth="48"
-    android:viewportHeight="48"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
     android:width="@dimen/hvac_power_icon_drawable_width"
     android:height="@dimen/hvac_power_icon_drawable_height">
     <path
-        android:pathData="M22 4L26 4L26 12.5L32.5 7L34 8.5L26 17.5L26 22L30.5 22L39.5 14L41 15.5L35.5 22L44 22L44 26L35 26.5L41 32.5L39.5 34L30.5 26L26 26L26 30.5L34 39.5L32.5 41L26 35.5L26 44L22 44L21.5 35L15.5 41L14 39.5L22 30.5L22 26L17.5 26L8.5 34L7 32.5L12.5 26L4 26L4 22L13 21.5L7 15.5L8.5 14L17.5 22L22 22L22 17.5L14 8.5L15.5 7L22 12.5L22 4Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M14.5 6L13.5 8L14.5 6Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.2039216"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.2039216"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M16.5 6L21.5 12L16.5 6Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.2039216"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.2039216"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M31.5 6L26.5 12L31.5 6Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.2039216"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.2039216"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M33.5 6L34.5 8L33.5 6Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.2039216"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.2039216"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M7.5 13L6.5 15L7.5 13Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.2039216"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.2039216"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M40.5 13L41.5 15L40.5 13Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.2039216"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.2039216"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M6.5 16L11.5 22L6.5 16Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.2039216"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.2039216"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M41.5 16L36.5 22L41.5 16Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.2039216"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.2039216"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M11.5 26L6.5 32L11.5 26Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.2039216"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.2039216"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M36.5 26L41.5 32L36.5 26Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.2039216"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.2039216"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M6.5 33L7.5 35L6.5 33Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.2039216"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.2039216"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M41.5 33L40.5 35L41.5 33Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.2039216"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.2039216"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M21.5 36L16.5 42L21.5 36Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.2039216"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.2039216"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M26.5 36L31.5 42L26.5 36Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.2039216"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.2039216"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M13.5 40L14.5 42L13.5 40Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.2039216"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.2039216"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M34.5 40L33.5 42L34.5 40Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.2039216"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.2039216"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M15.5 6L21.5 13L15.5 7L13 8.5L15.5 6Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.9294118"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.9294118"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M32.5 6L34.5 9L32.5 7L26 12.5L32.5 6Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.9294118"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.9294118"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M8.5 13L7 15.5L12.5 22L6 15.5L8.5 13Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.9294118"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.9294118"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M39.5 13L42 15.5L35.5 22L41 15.5L39.5 13Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.9294118"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.9294118"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M12.5 26L7 32.5L8.5 35L6 32.5L12.5 26Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.9294118"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.9294118"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M35.5 26L42 32.5L39.5 35L41 32.5L35.5 26Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.9294118"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.9294118"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M21.5 35L15.5 42L13.5 39L15.5 41L21.5 35Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.9294118"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.9294118"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M26.5 35L32.5 41L35 39.5L32.5 42L26.5 35Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.9294118"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.9294118"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M13.5 9L21.5 18L13.5 9Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.4980392"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.4980392"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M34.5 9L26.5 18L34.5 9Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.4980392"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.4980392"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M9.5 13L17.5 22L9.5 13Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.4980392"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.4980392"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M38.5 13L30.5 22L38.5 13Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.4980392"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.4980392"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M17.5 26L9.5 35L17.5 26Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.4980392"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.4980392"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M30.5 26L38.5 35L30.5 26Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.4980392"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.4980392"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M21.5 30L13.5 39L21.5 30Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.4980392"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.4980392"
-        android:strokeWidth="1" />
-    <path
-        android:pathData="M26.5 30L34.5 39L26.5 30Z"
-        android:fillColor="@color/hvac_master_switch_color"
-        android:fillAlpha="0.4980392"
-        android:strokeColor="@color/hvac_master_switch_color"
-        android:strokeAlpha="0.4980392"
-        android:strokeWidth="1" />
+        android:pathData="M460,760L500,760L500,686L640,546L640,360Q640,360 640,360Q640,360 640,360L320,360Q320,360 320,360Q320,360 320,360L320,546L460,686L460,760ZM380,840L380,720L240,580L240,360Q240,327 263.5,303.5Q287,280 320,280L360,280L320,320L320,120L400,120L400,280L560,280L560,120L640,120L640,320L600,280L640,280Q673,280 696.5,303.5Q720,327 720,360L720,580L580,720L580,840L380,840ZM480,560L480,560L480,560L480,560Q480,560 480,560Q480,560 480,560L480,560Q480,560 480,560Q480,560 480,560L480,560L480,560L480,560L480,560Z"
+        android:fillColor="@color/hvac_master_switch_color" />
 </vector>
 \ No newline at end of file
diff --git a/res/drawable/car_ic_apps.xml b/res/drawable/car_ic_apps.xml
index e028a0ed..df09ab50 100644
--- a/res/drawable/car_ic_apps.xml
+++ b/res/drawable/car_ic_apps.xml
@@ -17,9 +17,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="@dimen/system_bar_icon_drawing_size"
         android:height="@dimen/system_bar_icon_drawing_size"
-        android:viewportWidth="44"
-        android:viewportHeight="44">
+        android:viewportWidth="40"
+        android:viewportHeight="40">
     <path
-        android:pathData="M7.33333333 14.6666667L14.6666667 14.6666667L14.6666667 7.33333333L7.33333333 7.33333333L7.33333333 14.6666667ZM18.3333333 36.6666667L25.6666667 36.6666667L25.6666667 29.3333333L18.3333333 29.3333333L18.3333333 36.6666667ZM7.33333333 36.6666667L14.6666667 36.6666667L14.6666667 29.3333333L7.33333333 29.3333333L7.33333333 36.6666667ZM7.33333333 25.6666667L14.6666667 25.6666667L14.6666667 18.3333333L7.33333333 18.3333333L7.33333333 25.6666667ZM18.3333333 25.6666667L25.6666667 25.6666667L25.6666667 18.3333333L18.3333333 18.3333333L18.3333333 25.6666667ZM29.3333333 7.33333333L29.3333333 14.6666667L36.6666667 14.6666667L36.6666667 7.33333333L29.3333333 7.33333333ZM18.3333333 14.6666667L25.6666667 14.6666667L25.6666667 7.33333333L18.3333333 7.33333333L18.3333333 14.6666667ZM29.3333333 25.6666667L36.6666667 25.6666667L36.6666667 18.3333333L29.3333333 18.3333333L29.3333333 25.6666667ZM29.3333333 36.6666667L36.6666667 36.6666667L36.6666667 29.3333333L29.3333333 29.3333333L29.3333333 36.6666667Z"
+        android:pathData="M10.1819 13.4546C11.9819 13.4546 13.4546 11.9819 13.4546 10.1819C13.4546 8.38191 11.9819 6.90918 10.1819 6.90918C8.38191 6.90918 6.90918 8.38191 6.90918 10.1819C6.90918 11.9819 8.38191 13.4546 10.1819 13.4546ZM20.0001 33.091C21.8001 33.091 23.2728 31.6183 23.2728 29.8183C23.2728 28.0183 21.8001 26.5455 20.0001 26.5455C18.2001 26.5455 16.7274 28.0183 16.7274 29.8183C16.7274 31.6183 18.2001 33.091 20.0001 33.091ZM13.4546 29.8183C13.4546 31.6183 11.9819 33.091 10.1819 33.091C8.38191 33.091 6.90918 31.6183 6.90918 29.8183C6.90918 28.0183 8.38191 26.5455 10.1819 26.5455C11.9819 26.5455 13.4546 28.0183 13.4546 29.8183ZM10.1819 23.2728C11.9819 23.2728 13.4546 21.8001 13.4546 20.0001C13.4546 18.2001 11.9819 16.7274 10.1819 16.7274C8.38191 16.7274 6.90918 18.2001 6.90918 20.0001C6.90918 21.8001 8.38191 23.2728 10.1819 23.2728ZM23.2728 20.0001C23.2728 21.8001 21.8001 23.2728 20.0001 23.2728C18.2001 23.2728 16.7274 21.8001 16.7274 20.0001C16.7274 18.2001 18.2001 16.7274 20.0001 16.7274C21.8001 16.7274 23.2728 18.2001 23.2728 20.0001ZM26.5455 10.1819C26.5455 11.9819 28.0183 13.4546 29.8183 13.4546C31.6183 13.4546 33.091 11.9819 33.091 10.1819C33.091 8.38191 31.6183 6.90918 29.8183 6.90918C28.0183 6.90918 26.5455 8.38191 26.5455 10.1819ZM23.2728 10.1819C23.2728 11.9819 21.8001 13.4546 20.0001 13.4546C18.2001 13.4546 16.7274 11.9819 16.7274 10.1819C16.7274 8.38191 18.2001 6.90918 20.0001 6.90918C21.8001 6.90918 23.2728 8.38191 23.2728 10.1819ZM29.8183 23.2728C31.6183 23.2728 33.091 21.8001 33.091 20.0001C33.091 18.2001 31.6183 16.7274 29.8183 16.7274C28.0183 16.7274 26.5455 18.2001 26.5455 20.0001C26.5455 21.8001 28.0183 23.2728 29.8183 23.2728ZM33.091 29.8183C33.091 31.6183 31.6183 33.091 29.8183 33.091C28.0183 33.091 26.5455 31.6183 26.5455 29.8183C26.5455 28.0183 28.0183 26.5455 29.8183 26.5455C31.6183 26.5455 33.091 28.0183 33.091 29.8183Z"
+        android:fillType="evenOdd"
         android:fillColor="@color/car_nav_icon_fill_color" />
 </vector>
 \ No newline at end of file
diff --git a/res/drawable/car_ic_apps_selected.xml b/res/drawable/car_ic_apps_selected.xml
index 9504e61e..9c285879 100644
--- a/res/drawable/car_ic_apps_selected.xml
+++ b/res/drawable/car_ic_apps_selected.xml
@@ -17,9 +17,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="@dimen/system_bar_icon_drawing_size"
         android:height="@dimen/system_bar_icon_drawing_size"
-        android:viewportWidth="44"
-        android:viewportHeight="44">
+        android:viewportWidth="40"
+        android:viewportHeight="40">
     <path
-        android:pathData="M7.33333333 14.6666667L14.6666667 14.6666667L14.6666667 7.33333333L7.33333333 7.33333333L7.33333333 14.6666667ZM18.3333333 36.6666667L25.6666667 36.6666667L25.6666667 29.3333333L18.3333333 29.3333333L18.3333333 36.6666667ZM7.33333333 36.6666667L14.6666667 36.6666667L14.6666667 29.3333333L7.33333333 29.3333333L7.33333333 36.6666667ZM7.33333333 25.6666667L14.6666667 25.6666667L14.6666667 18.3333333L7.33333333 18.3333333L7.33333333 25.6666667ZM18.3333333 25.6666667L25.6666667 25.6666667L25.6666667 18.3333333L18.3333333 18.3333333L18.3333333 25.6666667ZM29.3333333 7.33333333L29.3333333 14.6666667L36.6666667 14.6666667L36.6666667 7.33333333L29.3333333 7.33333333ZM18.3333333 14.6666667L25.6666667 14.6666667L25.6666667 7.33333333L18.3333333 7.33333333L18.3333333 14.6666667ZM29.3333333 25.6666667L36.6666667 25.6666667L36.6666667 18.3333333L29.3333333 18.3333333L29.3333333 25.6666667ZM29.3333333 36.6666667L36.6666667 36.6666667L36.6666667 29.3333333L29.3333333 29.3333333L29.3333333 36.6666667Z"
+        android:pathData="M10.1819 13.4546C11.9819 13.4546 13.4546 11.9819 13.4546 10.1819C13.4546 8.38191 11.9819 6.90918 10.1819 6.90918C8.38191 6.90918 6.90918 8.38191 6.90918 10.1819C6.90918 11.9819 8.38191 13.4546 10.1819 13.4546ZM20.0001 33.091C21.8001 33.091 23.2728 31.6183 23.2728 29.8183C23.2728 28.0183 21.8001 26.5455 20.0001 26.5455C18.2001 26.5455 16.7274 28.0183 16.7274 29.8183C16.7274 31.6183 18.2001 33.091 20.0001 33.091ZM13.4546 29.8183C13.4546 31.6183 11.9819 33.091 10.1819 33.091C8.38191 33.091 6.90918 31.6183 6.90918 29.8183C6.90918 28.0183 8.38191 26.5455 10.1819 26.5455C11.9819 26.5455 13.4546 28.0183 13.4546 29.8183ZM10.1819 23.2728C11.9819 23.2728 13.4546 21.8001 13.4546 20.0001C13.4546 18.2001 11.9819 16.7274 10.1819 16.7274C8.38191 16.7274 6.90918 18.2001 6.90918 20.0001C6.90918 21.8001 8.38191 23.2728 10.1819 23.2728ZM23.2728 20.0001C23.2728 21.8001 21.8001 23.2728 20.0001 23.2728C18.2001 23.2728 16.7274 21.8001 16.7274 20.0001C16.7274 18.2001 18.2001 16.7274 20.0001 16.7274C21.8001 16.7274 23.2728 18.2001 23.2728 20.0001ZM26.5455 10.1819C26.5455 11.9819 28.0183 13.4546 29.8183 13.4546C31.6183 13.4546 33.091 11.9819 33.091 10.1819C33.091 8.38191 31.6183 6.90918 29.8183 6.90918C28.0183 6.90918 26.5455 8.38191 26.5455 10.1819ZM23.2728 10.1819C23.2728 11.9819 21.8001 13.4546 20.0001 13.4546C18.2001 13.4546 16.7274 11.9819 16.7274 10.1819C16.7274 8.38191 18.2001 6.90918 20.0001 6.90918C21.8001 6.90918 23.2728 8.38191 23.2728 10.1819ZM29.8183 23.2728C31.6183 23.2728 33.091 21.8001 33.091 20.0001C33.091 18.2001 31.6183 16.7274 29.8183 16.7274C28.0183 16.7274 26.5455 18.2001 26.5455 20.0001C26.5455 21.8001 28.0183 23.2728 29.8183 23.2728ZM33.091 29.8183C33.091 31.6183 31.6183 33.091 29.8183 33.091C28.0183 33.091 26.5455 31.6183 26.5455 29.8183C26.5455 28.0183 28.0183 26.5455 29.8183 26.5455C31.6183 26.5455 33.091 28.0183 33.091 29.8183Z"
+        android:fillType="evenOdd"
         android:fillColor="@color/car_nav_icon_fill_color_selected" />
 </vector>
 \ No newline at end of file
diff --git a/res/drawable/car_ic_brightness.xml b/res/drawable/car_ic_brightness.xml
index 1b4e3521..bd040db1 100644
--- a/res/drawable/car_ic_brightness.xml
+++ b/res/drawable/car_ic_brightness.xml
@@ -16,9 +16,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="@dimen/car_quick_controls_icon_drawable_width"
         android:height="@dimen/car_quick_controls_icon_drawable_height"
-        android:viewportWidth="36"
-        android:viewportHeight="36">
+        android:viewportWidth="32"
+        android:viewportHeight="32">
     <path
         android:fillColor="@color/car_quick_controls_icon_drawable_color"
-        android:pathData="M10.1325 7.26745L7.4475 4.57495L5.325 6.69745L8.0175 9.38995L10.1325 7.26745ZM6 15.75H1.5V18.75H6V15.75ZM19.5 0.824951H16.5V5.24995H19.5V0.824951ZM30.675 6.69745L28.5525 4.57495L25.86 7.26745L27.9825 9.38995L30.675 6.69745ZM25.8675 27.2325L28.56 29.925L30.6825 27.8025L27.99 25.11L25.8675 27.2325ZM30 15.75V18.75H34.5V15.75H30ZM18 8.24995C13.0275 8.24995 9 12.2775 9 17.25C9 22.2225 13.0275 26.25 18 26.25C22.9725 26.25 27 22.2225 27 17.25C27 12.2775 22.9725 8.24995 18 8.24995ZM16.5 33.675H19.5V29.25H16.5V33.675ZM5.325 27.8025L7.4475 29.925L10.14 27.2325L8.0175 25.11L5.325 27.8025Z" />
+        android:pathData="M16 31.0667L20.4667 26.6667H26.6667V20.4667L31.1 16L26.6667 11.5333V5.33333H20.4667L16 0.899998L11.5333 5.33333H5.33333V11.5333L0.9 16L5.33333 20.4667V26.6667H11.5333L16 31.0667ZM16 22.6C14.1778 22.6 12.6222 21.9556 11.3333 20.6667C10.0444 19.3778 9.4 17.8222 9.4 16C9.4 14.1556 10.0444 12.5889 11.3333 11.3C12.6222 10.0111 14.1778 9.36666 16 9.36666C17.8444 9.36666 19.4111 10.0111 20.7 11.3C21.9889 12.5889 22.6333 14.1556 22.6333 16C22.6333 17.8222 21.9889 19.3778 20.7 20.6667C19.4111 21.9556 17.8444 22.6 16 22.6ZM16 20.1667C14.8444 20.1667 13.8556 19.7667 13.0333 18.9667C12.2333 18.1444 11.8333 17.1556 11.8333 16C11.8333 14.8222 12.2333 13.8333 13.0333 13.0333C13.8556 12.2333 14.8444 11.8333 16 11.8333C17.1778 11.8333 18.1667 12.2333 18.9667 13.0333C19.7667 13.8333 20.1667 14.8222 20.1667 16C20.1667 17.1556 19.7667 18.1444 18.9667 18.9667C18.1667 19.7667 17.1778 20.1667 16 20.1667ZM16 27.6333L12.5667 24.2333H7.76667V19.4333L4.33333 16L7.76667 12.5667V7.76666H12.5667L16 4.33333L19.4333 7.76666H24.2333V12.5667L27.6667 16L24.2333 19.4333V24.2333H19.4333L16 27.6333ZM16 20.1667C14.8444 20.1667 13.8556 19.7667 13.0333 18.9667C12.2333 18.1444 11.8333 17.1556 11.8333 16C11.8333 14.8222 12.2333 13.8333 13.0333 13.0333C13.8556 12.2333 14.8444 11.8333 16 11.8333C17.1778 11.8333 18.1667 12.2333 18.9667 13.0333C19.7667 13.8333 20.1667 14.8222 20.1667 16C20.1667 17.1556 19.7667 18.1444 18.9667 18.9667C18.1667 19.7667 17.1778 20.1667 16 20.1667Z" />
 </vector>
diff --git a/res/drawable/car_ic_home.xml b/res/drawable/car_ic_home.xml
index c78f0edd..1e2228aa 100644
--- a/res/drawable/car_ic_home.xml
+++ b/res/drawable/car_ic_home.xml
@@ -17,9 +17,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="@dimen/system_bar_icon_drawing_size"
         android:height="@dimen/system_bar_icon_drawing_size"
-        android:viewportWidth="24"
-        android:viewportHeight="24">
+        android:viewportWidth="40"
+        android:viewportHeight="40">
     <path
-        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"
+        android:pathData="M6.90918 15.0906L20.0001 5.27246L33.091 15.0906V34.727H6.90918V15.0906ZM24.9092 31.4543H29.8183V16.727L20.0001 9.36337L10.1819 16.727V31.4543H15.091V21.6361H24.9092V31.4543Z"
+        android:fillType="evenOdd"
         android:fillColor="@color/car_nav_icon_fill_color" />
 </vector>
 \ No newline at end of file
diff --git a/res/drawable/car_ic_home_selected.xml b/res/drawable/car_ic_home_selected.xml
index 16192df8..a24c58ea 100644
--- a/res/drawable/car_ic_home_selected.xml
+++ b/res/drawable/car_ic_home_selected.xml
@@ -17,9 +17,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="@dimen/system_bar_icon_drawing_size"
         android:height="@dimen/system_bar_icon_drawing_size"
-        android:viewportWidth="24"
-        android:viewportHeight="24">
+        android:viewportWidth="40"
+        android:viewportHeight="40">
     <path
-        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"
+        android:pathData="M6.90918 15.0906L20.0001 5.27246L33.091 15.0906V34.727H6.90918V15.0906ZM24.9092 31.4543H29.8183V16.727L20.0001 9.36337L10.1819 16.727V31.4543H15.091V21.6361H24.9092V31.4543Z"
+        android:fillType="evenOdd"
         android:fillColor="@color/car_nav_icon_fill_color_selected" />
 </vector>
 \ No newline at end of file
diff --git a/res/drawable/car_ic_hvac.xml b/res/drawable/car_ic_hvac.xml
index 55c968ea..668d8099 100644
--- a/res/drawable/car_ic_hvac.xml
+++ b/res/drawable/car_ic_hvac.xml
@@ -17,9 +17,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="@dimen/system_bar_icon_drawing_size"
         android:height="@dimen/system_bar_icon_drawing_size"
-        android:viewportWidth="24"
-        android:viewportHeight="24">
+        android:viewportWidth="40"
+        android:viewportHeight="40">
     <path
-        android:pathData="M16.34,8.36l-2.29,0.82c-0.18,-0.13 -0.38,-0.25 -0.58,-0.34c0.17,-0.83 0.63,-1.58 1.36,-2.06C16.85,5.44 16.18,2 13.39,2C9,2 7.16,5.01 8.36,7.66l0.82,2.29c-0.13,0.18 -0.25,0.38 -0.34,0.58c-0.83,-0.17 -1.58,-0.63 -2.06,-1.36C5.44,7.15 2,7.82 2,10.61c0,4.4 3.01,6.24 5.66,5.03l2.29,-0.82c0.18,0.13 0.38,0.25 0.58,0.34c-0.17,0.83 -0.63,1.58 -1.36,2.06C7.15,18.56 7.82,22 10.61,22c4.4,0 6.24,-3.01 5.03,-5.66l-0.82,-2.29c0.13,-0.18 0.25,-0.38 0.34,-0.58c0.83,0.17 1.58,0.63 2.06,1.36c1.34,2.01 4.77,1.34 4.77,-1.45C22,9 18.99,7.16 16.34,8.36zM12,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5c0,-0.83 0.67,-1.5 1.5,-1.5c0.83,0 1.5,0.67 1.5,1.5C13.5,12.83 12.83,13.5 12,13.5zM10.24,5.22C10.74,4.44 11.89,4 13.39,4c0.79,0 0.71,0.86 0.34,1.11c-1.22,0.81 -2,2.06 -2.25,3.44c-0.21,0.03 -0.42,0.08 -0.62,0.15l-0.68,-1.88C10,6.42 9.86,5.81 10.24,5.22zM6.83,13.82c-0.4,0.18 -1.01,0.32 -1.61,-0.06C4.44,13.26 4,12.11 4,10.61c0,-0.79 0.86,-0.71 1.11,-0.34c0.81,1.22 2.06,2 3.44,2.25c0.03,0.21 0.08,0.42 0.15,0.62L6.83,13.82zM13.76,18.78c-0.5,0.77 -1.65,1.22 -3.15,1.22c-0.79,0 -0.71,-0.86 -0.34,-1.11c1.22,-0.81 2,-2.06 2.25,-3.44c0.21,-0.03 0.42,-0.08 0.62,-0.15l0.68,1.88C14,17.58 14.14,18.18 13.76,18.78zM18.89,13.73c-0.81,-1.22 -2.06,-2 -3.44,-2.25c-0.03,-0.21 -0.08,-0.42 -0.15,-0.62l1.88,-0.68c0.4,-0.18 1.01,-0.32 1.61,0.06c0.77,0.5 1.22,1.65 1.22,3.15C20,14.19 19.14,14.11 18.89,13.73z"
+        android:pathData="M27.1017 14.0435L23.3544 15.3853C23.0599 15.1726 22.7326 14.9762 22.4053 14.829C22.6835 13.4708 23.4362 12.2435 24.6308 11.458C27.9362 9.26532 26.8399 3.63623 22.2744 3.63623C15.0908 3.63623 12.0799 8.56168 14.0435 12.898L15.3853 16.6453C15.1726 16.9399 14.9762 17.2671 14.829 17.5944C13.4708 17.3162 12.2435 16.5635 11.458 15.369C9.26532 12.0635 3.63623 13.1599 3.63623 17.7253C3.63623 24.9253 8.56168 27.9362 12.898 25.9562L16.6453 24.6144C16.9399 24.8271 17.2671 25.0235 17.5944 25.1708C17.3162 26.529 16.5635 27.7562 15.369 28.5417C12.0635 30.7344 13.1599 36.3635 17.7253 36.3635C24.9253 36.3635 27.9362 31.438 25.9562 27.1017L24.6144 23.3544C24.8271 23.0599 25.0235 22.7326 25.1708 22.4053C26.529 22.6835 27.7562 23.4362 28.5417 24.6308C30.7344 27.9199 36.3471 26.8235 36.3471 22.258C36.3635 15.0908 31.438 12.0799 27.1017 14.0435ZM19.9999 22.4544C18.6417 22.4544 17.5453 21.358 17.5453 19.9999C17.5453 18.6417 18.6417 17.5453 19.9999 17.5453C21.358 17.5453 22.4544 18.6417 22.4544 19.9999C22.4544 21.358 21.358 22.4544 19.9999 22.4544ZM17.1199 8.90532C17.938 7.62896 19.8199 6.90896 22.2744 6.90896C23.5671 6.90896 23.4362 8.31623 22.8308 8.72532C20.8344 10.0508 19.558 12.0962 19.149 14.3544C18.8053 14.4035 18.4617 14.4853 18.1344 14.5999L17.0217 11.5235C16.7271 10.869 16.498 9.87078 17.1199 8.90532ZM11.5399 22.978C10.8853 23.2726 9.88714 23.5017 8.90532 22.8799C7.62896 22.0617 6.90896 20.1799 6.90896 17.7253C6.90896 16.4326 8.31623 16.5635 8.72532 17.169C10.0508 19.1653 12.0962 20.4417 14.3544 20.8508C14.4035 21.1944 14.4853 21.538 14.5999 21.8653L11.5399 22.978ZM22.8799 31.0944C22.0617 32.3544 20.1799 33.0908 17.7253 33.0908C16.4326 33.0908 16.5635 31.6835 17.169 31.2744C19.1653 29.949 20.4417 27.9035 20.8508 25.6453C21.1944 25.5962 21.538 25.5144 21.8653 25.3999L22.978 28.4762C23.2726 29.1308 23.5017 30.1126 22.8799 31.0944ZM31.2744 22.8308C29.949 20.8344 27.9035 19.558 25.6453 19.149C25.5962 18.8053 25.5144 18.4617 25.3999 18.1344L28.4762 17.0217C29.1308 16.7271 30.129 16.498 31.1108 17.1199C32.3708 17.938 33.1071 19.8199 33.1071 22.2744C33.0908 23.5835 31.6835 23.4526 31.2744 22.8308Z"
         android:fillColor="@color/car_nav_icon_fill_color" />
 </vector>
diff --git a/res/drawable/car_ic_hvac_selected.xml b/res/drawable/car_ic_hvac_selected.xml
index 817b7148..e51c5919 100644
--- a/res/drawable/car_ic_hvac_selected.xml
+++ b/res/drawable/car_ic_hvac_selected.xml
@@ -17,9 +17,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="@dimen/system_bar_icon_drawing_size"
         android:height="@dimen/system_bar_icon_drawing_size"
-        android:viewportWidth="24"
-        android:viewportHeight="24">
+        android:viewportWidth="40"
+        android:viewportHeight="40">
     <path
-        android:pathData="M16.34,8.36l-2.29,0.82c-0.18,-0.13 -0.38,-0.25 -0.58,-0.34c0.17,-0.83 0.63,-1.58 1.36,-2.06C16.85,5.44 16.18,2 13.39,2C9,2 7.16,5.01 8.36,7.66l0.82,2.29c-0.13,0.18 -0.25,0.38 -0.34,0.58c-0.83,-0.17 -1.58,-0.63 -2.06,-1.36C5.44,7.15 2,7.82 2,10.61c0,4.4 3.01,6.24 5.66,5.03l2.29,-0.82c0.18,0.13 0.38,0.25 0.58,0.34c-0.17,0.83 -0.63,1.58 -1.36,2.06C7.15,18.56 7.82,22 10.61,22c4.4,0 6.24,-3.01 5.03,-5.66l-0.82,-2.29c0.13,-0.18 0.25,-0.38 0.34,-0.58c0.83,0.17 1.58,0.63 2.06,1.36c1.34,2.01 4.77,1.34 4.77,-1.45C22,9 18.99,7.16 16.34,8.36zM12,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5c0,-0.83 0.67,-1.5 1.5,-1.5c0.83,0 1.5,0.67 1.5,1.5C13.5,12.83 12.83,13.5 12,13.5zM10.24,5.22C10.74,4.44 11.89,4 13.39,4c0.79,0 0.71,0.86 0.34,1.11c-1.22,0.81 -2,2.06 -2.25,3.44c-0.21,0.03 -0.42,0.08 -0.62,0.15l-0.68,-1.88C10,6.42 9.86,5.81 10.24,5.22zM6.83,13.82c-0.4,0.18 -1.01,0.32 -1.61,-0.06C4.44,13.26 4,12.11 4,10.61c0,-0.79 0.86,-0.71 1.11,-0.34c0.81,1.22 2.06,2 3.44,2.25c0.03,0.21 0.08,0.42 0.15,0.62L6.83,13.82zM13.76,18.78c-0.5,0.77 -1.65,1.22 -3.15,1.22c-0.79,0 -0.71,-0.86 -0.34,-1.11c1.22,-0.81 2,-2.06 2.25,-3.44c0.21,-0.03 0.42,-0.08 0.62,-0.15l0.68,1.88C14,17.58 14.14,18.18 13.76,18.78zM18.89,13.73c-0.81,-1.22 -2.06,-2 -3.44,-2.25c-0.03,-0.21 -0.08,-0.42 -0.15,-0.62l1.88,-0.68c0.4,-0.18 1.01,-0.32 1.61,0.06c0.77,0.5 1.22,1.65 1.22,3.15C20,14.19 19.14,14.11 18.89,13.73z"
+        android:pathData="M27.1017 14.0435L23.3544 15.3853C23.0599 15.1726 22.7326 14.9762 22.4053 14.829C22.6835 13.4708 23.4362 12.2435 24.6308 11.458C27.9362 9.26532 26.8399 3.63623 22.2744 3.63623C15.0908 3.63623 12.0799 8.56168 14.0435 12.898L15.3853 16.6453C15.1726 16.9399 14.9762 17.2671 14.829 17.5944C13.4708 17.3162 12.2435 16.5635 11.458 15.369C9.26532 12.0635 3.63623 13.1599 3.63623 17.7253C3.63623 24.9253 8.56168 27.9362 12.898 25.9562L16.6453 24.6144C16.9399 24.8271 17.2671 25.0235 17.5944 25.1708C17.3162 26.529 16.5635 27.7562 15.369 28.5417C12.0635 30.7344 13.1599 36.3635 17.7253 36.3635C24.9253 36.3635 27.9362 31.438 25.9562 27.1017L24.6144 23.3544C24.8271 23.0599 25.0235 22.7326 25.1708 22.4053C26.529 22.6835 27.7562 23.4362 28.5417 24.6308C30.7344 27.9199 36.3471 26.8235 36.3471 22.258C36.3635 15.0908 31.438 12.0799 27.1017 14.0435ZM19.9999 22.4544C18.6417 22.4544 17.5453 21.358 17.5453 19.9999C17.5453 18.6417 18.6417 17.5453 19.9999 17.5453C21.358 17.5453 22.4544 18.6417 22.4544 19.9999C22.4544 21.358 21.358 22.4544 19.9999 22.4544ZM17.1199 8.90532C17.938 7.62896 19.8199 6.90896 22.2744 6.90896C23.5671 6.90896 23.4362 8.31623 22.8308 8.72532C20.8344 10.0508 19.558 12.0962 19.149 14.3544C18.8053 14.4035 18.4617 14.4853 18.1344 14.5999L17.0217 11.5235C16.7271 10.869 16.498 9.87078 17.1199 8.90532ZM11.5399 22.978C10.8853 23.2726 9.88714 23.5017 8.90532 22.8799C7.62896 22.0617 6.90896 20.1799 6.90896 17.7253C6.90896 16.4326 8.31623 16.5635 8.72532 17.169C10.0508 19.1653 12.0962 20.4417 14.3544 20.8508C14.4035 21.1944 14.4853 21.538 14.5999 21.8653L11.5399 22.978ZM22.8799 31.0944C22.0617 32.3544 20.1799 33.0908 17.7253 33.0908C16.4326 33.0908 16.5635 31.6835 17.169 31.2744C19.1653 29.949 20.4417 27.9035 20.8508 25.6453C21.1944 25.5962 21.538 25.5144 21.8653 25.3999L22.978 28.4762C23.2726 29.1308 23.5017 30.1126 22.8799 31.0944ZM31.2744 22.8308C29.949 20.8344 27.9035 19.558 25.6453 19.149C25.5962 18.8053 25.5144 18.4617 25.3999 18.1344L28.4762 17.0217C29.1308 16.7271 30.129 16.498 31.1108 17.1199C32.3708 17.938 33.1071 19.8199 33.1071 22.2744C33.0908 23.5835 31.6835 23.4526 31.2744 22.8308Z"
         android:fillColor="@color/car_nav_icon_fill_color_selected" />
 </vector>
 \ No newline at end of file
diff --git a/res/drawable/car_ic_notification.xml b/res/drawable/car_ic_notification.xml
index aabf9161..b1f71266 100644
--- a/res/drawable/car_ic_notification.xml
+++ b/res/drawable/car_ic_notification.xml
@@ -17,9 +17,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="@dimen/system_bar_icon_drawing_size"
         android:height="@dimen/system_bar_icon_drawing_size"
-        android:viewportWidth="44"
-        android:viewportHeight="44">
+        android:viewportWidth="40"
+        android:viewportHeight="40">
     <path
-        android:pathData="M22 39.125C23.925 39.125 25.5 37.55 25.5 35.625L18.5 35.625C18.5 37.55 20.0575 39.125 22 39.125ZM32.5 28.625L32.5 19.875C32.5 14.5025 29.63 10.005 24.625 8.815L24.625 7.625C24.625 6.1725 23.4525 5 22 5C20.5475 5 19.375 6.1725 19.375 7.625L19.375 8.815C14.3525 10.005 11.5 14.485 11.5 19.875L11.5 28.625L8 32.125L8 33.875L36 33.875L36 32.125L32.5 28.625Z"
+        android:pathData="M29.8183 28.1819V18.3637C29.8183 13.34 27.151 9.13459 22.4546 8.02186V6.90914C22.4546 5.55095 21.3583 4.45459 20.0001 4.45459C18.6419 4.45459 17.5455 5.55095 17.5455 6.90914V8.02186C12.8655 9.13459 10.1819 13.3237 10.1819 18.3637V28.1819H6.90918V31.4546H23.2728H23.8946H33.091V28.1819H29.8183ZM26.5452 28.1816H13.4543V18.3634C13.4543 14.3052 15.9252 10.9998 19.9997 10.9998C24.0743 10.9998 26.5452 14.3052 26.5452 18.3634V28.1816ZM23.2728 33.0909C23.2728 34.8909 21.8001 36.3636 20.0001 36.3636C18.2001 36.3636 16.7273 34.8909 16.7273 33.0909H23.2728Z"
+        android:fillType="evenOdd"
         android:fillColor="@color/car_nav_icon_fill_color" />
 </vector>
 \ No newline at end of file
diff --git a/res/drawable/car_ic_notification_dock.xml b/res/drawable/car_ic_notification_dock.xml
new file mode 100644
index 00000000..562b3781
--- /dev/null
+++ b/res/drawable/car_ic_notification_dock.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<!-- todo(b/304320644): update drawable/car_ic_notification -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="30dp"
+    android:viewportWidth="24"
+    android:viewportHeight="30">
+    <path
+        android:pathData="M12,30C13.658,30 15,28.657 15,27H9C9,28.657 10.342,30 12,30ZM21,21V13.5C21,8.887 18.548,5.04 14.25,4.02V3C14.25,1.755 13.245,0.75 12,0.75C10.755,0.75 9.75,1.755 9.75,3V4.02C5.452,5.04 3,8.887 3,13.5V21L0,24V25.5H24V24L21,21Z"
+        android:fillColor="@color/car_nav_icon_fill_color" />
+</vector>
+\ No newline at end of file
diff --git a/res/drawable/car_ic_users_icon.xml b/res/drawable/car_ic_users_icon.xml
index 5017289b..4a087438 100644
--- a/res/drawable/car_ic_users_icon.xml
+++ b/res/drawable/car_ic_users_icon.xml
@@ -15,11 +15,11 @@
   ~ limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="@dimen/system_bar_user_icon_drawing_size"
-        android:height="@dimen/system_bar_user_icon_drawing_size"
-        android:viewportWidth="36"
-        android:viewportHeight="36">
+        android:width="@dimen/system_bar_user_icon_width"
+        android:height="@dimen/system_bar_user_icon_height"
+        android:viewportWidth="23"
+        android:viewportHeight="22">
     <path
-        android:pathData="M24.75 18C26.82 18 28.485 16.32 28.485 14.25C28.485 12.18 26.82 10.5 24.75 10.5C22.68 10.5 21 12.18 21 14.25C21 16.32 22.68 18 24.75 18ZM13.5 16.5C15.9825 16.5 17.985 14.4825 17.985 12C17.985 9.5175 15.9825 7.5 13.5 7.5C11.0175 7.5 9 9.5175 9 12C9 14.4825 11.0175 16.5 13.5 16.5ZM24.75 21C21.9975 21 16.5 22.38 16.5 25.125V28.5H33V25.125C33 22.38 27.5025 21 24.75 21ZM13.5 19.5C9.9975 19.5 3 21.255 3 24.75V28.5H13.5V25.125C13.5 23.85 14.0025 21.6225 17.055 19.92C15.75 19.6425 14.4825 19.5 13.5 19.5Z"
+        android:pathData="M11.5 11C10.0333 11 8.78889 10.5 7.76667 9.5C6.76667 8.47778 6.26667 7.23333 6.26667 5.76667C6.26667 4.3 6.76667 3.06667 7.76667 2.06667C8.78889 1.04444 10.0333 0.533333 11.5 0.533333C12.9667 0.533333 14.2 1.04444 15.2 2.06667C16.2222 3.06667 16.7333 4.3 16.7333 5.76667C16.7333 7.23333 16.2222 8.47778 15.2 9.5C14.2 10.5 12.9667 11 11.5 11ZM0.833333 21.6667V18.1333C0.833333 17.3556 1.03333 16.6556 1.43333 16.0333C1.83333 15.4111 2.35556 14.9333 3 14.6C4.42222 13.9111 5.83333 13.4 7.23333 13.0667C8.63333 12.7333 10.0556 12.5667 11.5 12.5667C12.9444 12.5667 14.3667 12.7444 15.7667 13.1C17.1667 13.4333 18.5667 13.9333 19.9667 14.6C20.6333 14.9333 21.1667 15.4111 21.5667 16.0333C21.9667 16.6556 22.1667 17.3556 22.1667 18.1333V21.6667H0.833333ZM3.26667 19.2333H19.7333V18.1333C19.7333 17.8444 19.6556 17.5889 19.5 17.3667C19.3444 17.1222 19.1444 16.9333 18.9 16.8C17.6333 16.1778 16.3889 15.7222 15.1667 15.4333C13.9667 15.1444 12.7444 15 11.5 15C10.2556 15 9.02222 15.1444 7.8 15.4333C6.57778 15.7222 5.33333 16.1778 4.06667 16.8C3.84444 16.9333 3.65556 17.1222 3.5 17.3667C3.34444 17.5889 3.26667 17.8444 3.26667 18.1333V19.2333ZM11.5 8.53333C12.2778 8.53333 12.9333 8.26667 13.4667 7.73333C14 7.2 14.2667 6.54444 14.2667 5.76667C14.2667 4.98889 14 4.33333 13.4667 3.8C12.9333 3.26667 12.2778 3 11.5 3C10.7222 3 10.0667 3.26667 9.53333 3.8C9 4.33333 8.73333 4.98889 8.73333 5.76667C8.73333 6.54444 9 7.2 9.53333 7.73333C10.0667 8.26667 10.7222 8.53333 11.5 8.53333Z"
         android:fillColor="@color/system_bar_icon_color"/>
 </vector>
 \ No newline at end of file
diff --git a/res/drawable/car_ic_volume.xml b/res/drawable/car_ic_volume.xml
new file mode 100644
index 00000000..c188d633
--- /dev/null
+++ b/res/drawable/car_ic_volume.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  ~ Copyright (C) 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="@dimen/system_bar_icon_drawing_size"
+    android:height="@dimen/system_bar_icon_drawing_size"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:pathData="M560,829L560,747Q650,721 705,647Q760,573 760,479Q760,385 705,311Q650,237 560,211L560,129Q684,157 762,254.5Q840,352 840,479Q840,606 762,703.5Q684,801 560,829ZM120,600L120,360L280,360L480,160L480,800L280,600L120,600ZM560,640L560,318Q607,340 633.5,384Q660,428 660,480Q660,531 633.5,574.5Q607,618 560,640ZM400,354L314,440L200,440L200,520L314,520L400,606L400,354ZM300,480L300,480L300,480L300,480L300,480L300,480L300,480Z"
+        android:fillColor="@color/car_nav_icon_fill_color" />
+</vector>
diff --git a/res/drawable/car_quick_controls_button_background_pill.xml b/res/drawable/car_quick_controls_pill_button_background.xml
index 43a2785e..f91a7bfb 100644
--- a/res/drawable/car_quick_controls_button_background_pill.xml
+++ b/res/drawable/car_quick_controls_pill_button_background.xml
@@ -20,7 +20,7 @@
     <item>
         <aapt:attr name="android:drawable">
             <shape android:shape="rectangle">
-                <solid android:color="@color/car_quick_controls_button_background_pill_color"/>
+                <solid android:color="@color/car_quick_controls_pill_button_background_color"/>
                 <corners android:radius="@dimen/system_bar_pill_radius"/>
             </shape>
         </aapt:attr>
diff --git a/res/drawable/displaycompat_arrow_back_32.xml b/res/drawable/displaycompat_arrow_back_32.xml
new file mode 100644
index 00000000..f8bb32d5
--- /dev/null
+++ b/res/drawable/displaycompat_arrow_back_32.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector android:height="32dp" android:tint="@android:color/white"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+</vector>
diff --git a/res/drawable/displaycompat_fullscreen_32.xml b/res/drawable/displaycompat_fullscreen_32.xml
new file mode 100644
index 00000000..c0fa74ec
--- /dev/null
+++ b/res/drawable/displaycompat_fullscreen_32.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector android:height="32dp" android:tint="@android:color/white"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M7,14L5,14v5h5v-2L7,17v-3zM5,10h2L7,7h3L10,5L5,5v5zM17,17h-3v2h5v-5h-2v3zM14,5v2h3v3h2L19,5h-5z"/>
+</vector>
diff --git a/res/drawable/displaycompat_round_bg.xml b/res/drawable/displaycompat_round_bg.xml
new file mode 100644
index 00000000..3950529f
--- /dev/null
+++ b/res/drawable/displaycompat_round_bg.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <gradient
+        android:startColor="#3C5D93"
+        android:endColor="#3C5D93"
+        android:angle="0"/>
+
+    <size
+        android:width="64dp"
+        android:height="64dp"/>
+</shape>
diff --git a/res/drawable/hvac_background.xml b/res/drawable/hvac_background.xml
new file mode 100644
index 00000000..73cb5bb2
--- /dev/null
+++ b/res/drawable/hvac_background.xml
@@ -0,0 +1,22 @@
+<!--
+  ~ Copyright (C) 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/hvac_background_color"/>
+
+    <corners
+        android:radius="@dimen/hvac_panel_background_radius"/>
+</shape>
+\ No newline at end of file
diff --git a/res/drawable/hvac_decrease_button.xml b/res/drawable/hvac_decrease_button.xml
index 656e94ae..94fe0782 100644
--- a/res/drawable/hvac_decrease_button.xml
+++ b/res/drawable/hvac_decrease_button.xml
@@ -14,40 +14,24 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-
 <layer-list
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt">
     <item android:gravity="center"
-          android:width="@dimen/system_bar_icon_drawing_size"
-          android:height="@dimen/system_bar_icon_drawing_size">
+          android:width="@dimen/hvac_temperature_icon_size"
+          android:height="@dimen/hvac_temperature_icon_size">
         <aapt:attr name="android:drawable">
-            <shape android:shape="oval">
-                <size
-                    android:width="@dimen/system_bar_icon_drawing_size"
-                    android:height="@dimen/system_bar_icon_drawing_size"/>
-                <solid
-                    android:color="@color/hvac_temperature_adjust_button_color"/>
-            </shape>
-        </aapt:attr>
-    </item>
-    <item android:gravity="center"
-          android:width="@dimen/system_bar_icon_drawing_size"
-          android:height="@dimen/system_bar_icon_drawing_size">
-        <aapt:attr name="android:drawable">
-            <vector android:width="@dimen/system_bar_icon_drawing_size"
-                    android:height="@dimen/system_bar_icon_drawing_size"
-                    android:viewportWidth="24.0"
-                    android:viewportHeight="24.0">
+            <vector android:width="@dimen/hvac_temperature_icon_size"
+                    android:height="@dimen/hvac_temperature_icon_size"
+                    android:viewportWidth="36"
+                    android:viewportHeight="36">
                 <path
-                    android:fillColor="@color/hvac_temperature_decrease_arrow_color"
-                    android:pathData="M14,7l-5,5 5,5V7z"/>
+                    android:fillColor="@color/car_on_surface"
+                    android:pathData="M30 19.4995H6V16.4995H30V19.4995Z"/>
             </vector>
         </aapt:attr>
     </item>
-    <item>
-        <aapt:attr name="android:drawable">
-            <ripple android:color="?android:attr/colorControlHighlight"/>
-        </aapt:attr>
-    </item>
-</layer-list>
-\ No newline at end of file
+    <item android:width="@dimen/hvac_temperature_button_size"
+          android:height="@dimen/hvac_temperature_button_size"
+          android:drawable="@drawable/system_bar_button_background"/>
+</layer-list>
diff --git a/samples/sample3/rro/res/drawable/car_ic_home.xml b/res/drawable/hvac_decrease_button_dock.xml
index c78f0edd..35ff7c12 100644
--- a/samples/sample3/rro/res/drawable/car_ic_home.xml
+++ b/res/drawable/hvac_decrease_button_dock.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!--
-  ~ Copyright (C) 2020 The Android Open Source Project
+  ~ Copyright (C) 2023 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -14,12 +14,14 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
+
+<!-- todo(b/304320644): update drawable/hvac_decrease_button -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="@dimen/system_bar_icon_drawing_size"
-        android:height="@dimen/system_bar_icon_drawing_size"
-        android:viewportWidth="24"
-        android:viewportHeight="24">
+    android:width="20dp"
+    android:height="4dp"
+    android:viewportWidth="20"
+    android:viewportHeight="4">
     <path
-        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"
-        android:fillColor="@color/car_nav_icon_fill_color" />
-</vector>
-\ No newline at end of file
+        android:pathData="M0.083,3.275V0.725H19.917V3.275H0.083Z"
+        android:fillColor="#5C5F5E"/>
+</vector>
diff --git a/res/drawable/hvac_increase_button.xml b/res/drawable/hvac_increase_button.xml
index 57c07c87..2544e223 100644
--- a/res/drawable/hvac_increase_button.xml
+++ b/res/drawable/hvac_increase_button.xml
@@ -14,40 +14,24 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-
 <layer-list
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt">
     <item android:gravity="center"
-          android:width="@dimen/system_bar_icon_drawing_size"
-          android:height="@dimen/system_bar_icon_drawing_size">
+          android:width="@dimen/hvac_temperature_icon_size"
+          android:height="@dimen/hvac_temperature_icon_size">
         <aapt:attr name="android:drawable">
-            <shape android:shape="oval">
-                <size
-                    android:width="@dimen/system_bar_icon_drawing_size"
-                    android:height="@dimen/system_bar_icon_drawing_size"/>
-                <solid
-                    android:color="@color/hvac_temperature_adjust_button_color"/>
-            </shape>
-        </aapt:attr>
-    </item>
-    <item android:gravity="center"
-          android:width="@dimen/system_bar_icon_drawing_size"
-          android:height="@dimen/system_bar_icon_drawing_size">
-        <aapt:attr name="android:drawable">
-            <vector android:width="@dimen/system_bar_icon_drawing_size"
-                    android:height="@dimen/system_bar_icon_drawing_size"
-                    android:viewportWidth="24.0"
-                    android:viewportHeight="24.0">
+            <vector android:width="@dimen/hvac_temperature_icon_size"
+                    android:height="@dimen/hvac_temperature_icon_size"
+                    android:viewportWidth="36"
+                    android:viewportHeight="36">
                 <path
-                    android:fillColor="@color/hvac_temperature_increase_arrow_color"
-                    android:pathData="M10,17l5,-5 -5,-5v10z"/>
+                    android:fillColor="@color/car_on_surface"
+                    android:pathData="M30 19.5H19.5V30H16.5V19.5H6V16.5H16.5V6H19.5V16.5H30V19.5Z"/>
             </vector>
         </aapt:attr>
     </item>
-    <item>
-        <aapt:attr name="android:drawable">
-            <ripple android:color="?android:attr/colorControlHighlight"/>
-        </aapt:attr>
-    </item>
+    <item android:width="@dimen/hvac_temperature_button_size"
+          android:height="@dimen/hvac_temperature_button_size"
+          android:drawable="@drawable/system_bar_button_background"/>
 </layer-list>
 \ No newline at end of file
diff --git a/res/drawable/hvac_increase_button_dock.xml b/res/drawable/hvac_increase_button_dock.xml
new file mode 100644
index 00000000..196a3e13
--- /dev/null
+++ b/res/drawable/hvac_increase_button_dock.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  ~ Copyright (C) 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<!-- todo(b/304320644): update drawable/hvac_increase_button -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+    <path
+        android:pathData="M8.725,11.275H0.083V8.725H8.725V0.083H11.275V8.725H19.917V11.275H11.275V19.917H8.725V11.275Z"
+        android:fillColor="#5C5F5E"/>
+</vector>
diff --git a/res/drawable/ic_backspace.xml b/res/drawable/ic_backspace.xml
new file mode 100644
index 00000000..9ad6c541
--- /dev/null
+++ b/res/drawable/ic_backspace.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2023 The Android Open Source Project
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+         http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="@dimen/pin_pad_icon_size"
+    android:height="@dimen/pin_pad_icon_size"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+    <path
+        android:fillColor="@color/pin_pad_icon_color"
+        android:pathData="M22,3H7C6.31,3 5.77,3.35 5.41,3.88l-5.04,7.57c-0.22,0.34 -0.22,0.77 0,1.11l5.04,7.56C5.77,20.64 6.31,21 7,21h15c1.1,0 2,-0.9 2,-2V5C24,3.9 23.1,3 22,3zM18.3,16.3L18.3,16.3c-0.39,0.39 -1.02,0.39 -1.41,0L14,13.41l-2.89,2.89c-0.39,0.39 -1.02,0.39 -1.41,0h0c-0.39,-0.39 -0.39,-1.02 0,-1.41L12.59,12L9.7,9.11c-0.39,-0.39 -0.39,-1.02 0,-1.41l0,0c0.39,-0.39 1.02,-0.39 1.41,0L14,10.59l2.89,-2.89c0.39,-0.39 1.02,-0.39 1.41,0v0c0.39,0.39 0.39,1.02 0,1.41L15.41,12l2.89,2.89C18.68,15.27 18.68,15.91 18.3,16.3z"/>
+</vector>
diff --git a/res/drawable/ic_check.xml b/res/drawable/ic_check.xml
new file mode 100644
index 00000000..3f327591
--- /dev/null
+++ b/res/drawable/ic_check.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2023 The Android Open Source Project
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+         http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="@dimen/pin_pad_icon_size"
+    android:height="@dimen/pin_pad_icon_size"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="@color/pin_pad_icon_color"
+        android:pathData="M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z"/>
+</vector>
diff --git a/res/drawable/ic_fan_direction_defrost_off.xml b/res/drawable/ic_fan_direction_defrost_off.xml
index 3b4e6e2a..63bf98c9 100644
--- a/res/drawable/ic_fan_direction_defrost_off.xml
+++ b/res/drawable/ic_fan_direction_defrost_off.xml
@@ -15,35 +15,30 @@
   ~ limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:viewportWidth="108"
-    android:viewportHeight="108"
-    android:alpha="@dimen/hvac_turned_off_alpha"
-    android:width="@dimen/hvac_icon_drawable_width"
-    android:height="@dimen/hvac_icon_drawable_height">
-    <group
-        android:rotation="-90"
-        android:translateX="-16.33333"
-        android:translateY="87">
-        <path
-            android:pathData="M44.666667 53.416667l0 -3.5 -12.845 0 0 -4.083334L26 51.666667 31.821667 57.5l0 -4.083333z"
-            android:fillColor="@color/hvac_icon_color" />
-    </group>
+        android:viewportWidth="96"
+        android:viewportHeight="96"
+        android:alpha="@dimen/hvac_turned_off_alpha"
+        android:width="@dimen/hvac_icon_drawable_width"
+        android:height="@dimen/hvac_icon_drawable_height">
     <path
-        android:pathData="M59.012449 61.002836l2.402926 -9.566666 1.394434 -5.6c0.592448 -1.966757 1.907369 -2.950135 3.131464 -3.29 0.74654 -0.21 1.539739 -0.28 2.309608 -0.14 2.916172 0.513333 4.82918 3.243333 4.339264 6.09l-3.149466 13.813333c-0.653222 3.313333 -3.522735 5.693333 -6.882165 5.693333l-15.980621 0 -8.91182 7 -3.499406 -3.5 13.461048 -10.5 11.384734 0z"
-        android:fillColor="@color/hvac_icon_color" />
+        android:pathData="M29.09,51.65H25L30.84,57.48L36.67,51.65H32.59V38.81H29.09V51.65Z"
+        android:fillColor="@color/hvac_icon_off_foreground_color"/>
     <path
-        android:pathData="M67.648549 39.158549c-2.1 -1.493334 -2.613334 -4.386667 -1.143334 -6.51 1.47 -2.1 4.386667 -2.613334 6.51 -1.143334 2.1 1.493334 2.613334 4.386667 1.143334 6.51 -1.493334 2.1 -4.386667 2.613334 -6.51 1.143334l0 0z"
-        android:fillColor="@color/hvac_icon_color" />
+        android:pathData="M54.52,57.48L56.92,47.91L58.31,42.31C58.9,40.34 60.22,39.36 61.44,39.02C62.19,38.81 62.98,38.74 63.75,38.88C66.67,39.39 68.58,42.12 68.09,44.97L64.94,58.78C64.29,62.09 61.42,64.47 58.06,64.47H42.08L33.17,71.47L29.67,67.97L43.13,57.47H54.52V57.48Z"
+        android:fillColor="@color/hvac_icon_off_foreground_color"/>
     <path
-        android:pathData="M47.150143 44.565971c0 -0.403677 -0.09086 -0.562059 -0.252 -0.82853 -0.189 -0.331765 -0.447857 -0.778235 -0.447857 -1.578088 0 -0.799853 0.258857 -1.246765 0.447857 -1.571029 0.161143 -0.266471 0.252 -0.432353 0.252 -0.82853 0 -0.396617 -0.09086 -0.562059 -0.252 -0.82897 -0.189 -0.331324 -0.447857 -0.778236 -0.447857 -1.578089l1.399714 0c0 0.403677 0.09129 0.562059 0.252 0.828971 0.189 0.331323 0.448286 0.778235 0.448286 1.578088 0 0.799853 -0.259286 1.246324 -0.448286 1.570588 -0.160714 0.266912 -0.252 0.425294 -0.252 0.828971 0 0.403235 0.09129 0.562059 0.252 0.828529 0.189 0.331324 0.448286 0.778236 0.448286 1.578089 0 0.01235 -1.400143 0.01765 -1.400143 0"
-        android:fillColor="@color/hvac_icon_color" />
+        android:pathData="M63.15,35.63C61.05,34.14 60.54,31.24 62.01,29.12C63.48,27.02 66.4,26.51 68.52,27.98C70.62,29.47 71.13,32.37 69.66,34.49C68.17,36.59 65.28,37.1 63.15,35.63Z"
+        android:fillColor="@color/hvac_icon_off_foreground_color"/>
     <path
-        android:pathData="M50.793 44.565971c0 -0.403677 -0.09086 -0.562059 -0.252 -0.82853 -0.189 -0.331765 -0.447857 -0.778235 -0.447857 -1.578088 0 -0.799853 0.258857 -1.246765 0.447857 -1.571029 0.161143 -0.266471 0.252 -0.432353 0.252 -0.82853 0 -0.396617 -0.09086 -0.562059 -0.252 -0.82897 -0.189 -0.331324 -0.447857 -0.778236 -0.447857 -1.578089l1.399714 0c0 0.403677 0.09129 0.562059 0.252 0.828971 0.189 0.331323 0.448286 0.778235 0.448286 1.578088 0 0.799853 -0.259286 1.246324 -0.448286 1.570588 -0.160714 0.266912 -0.252 0.425294 -0.252 0.828971 0 0.403235 0.09129 0.562059 0.252 0.828529 0.189 0.331324 0.448286 0.778236 0.448286 1.578089 0 0.01235 -1.400143 0.01765 -1.400143 0"
-        android:fillColor="@color/hvac_icon_color" />
+        android:pathData="M42.65,41.04C42.65,40.64 42.56,40.48 42.4,40.21C42.21,39.88 41.95,39.43 41.95,38.63C41.95,37.83 42.21,37.38 42.4,37.06C42.56,36.79 42.65,36.63 42.65,36.23C42.65,35.83 42.56,35.67 42.4,35.4C42.21,35.07 41.95,34.62 41.95,33.82H43.35C43.35,34.22 43.44,34.38 43.6,34.65C43.79,34.98 44.05,35.43 44.05,36.23C44.05,37.03 43.79,37.48 43.6,37.8C43.44,38.07 43.35,38.23 43.35,38.63C43.35,39.03 43.44,39.19 43.6,39.46C43.79,39.79 44.05,40.24 44.05,41.04C44.05,41.05 42.65,41.06 42.65,41.04Z"
+        android:fillColor="@color/hvac_icon_off_foreground_color"/>
     <path
-        android:pathData="M54.342943 44.565971c0 -0.403677 -0.09086 -0.562059 -0.252 -0.82853 -0.189 -0.331765 -0.447857 -0.778235 -0.447857 -1.578088 0 -0.799853 0.258857 -1.246765 0.447857 -1.571029 0.161143 -0.266471 0.252 -0.432353 0.252 -0.82853 0 -0.396617 -0.09086 -0.562059 -0.252 -0.82897 -0.189 -0.331324 -0.447857 -0.778236 -0.447857 -1.578089l1.399714 0c0 0.403677 0.09129 0.562059 0.252 0.828971 0.189 0.331323 0.448286 0.778235 0.448286 1.578088 0 0.799853 -0.259286 1.246324 -0.448286 1.570588 -0.160714 0.266912 -0.252 0.425294 -0.252 0.828971 0 0.403235 0.09129 0.562059 0.252 0.828529 0.189 0.331324 0.448286 0.778236 0.448286 1.578089 0 0.01235 -1.400143 0.01765 -1.400143 0"
-        android:fillColor="@color/hvac_icon_color" />
+        android:pathData="M46.3,41.04C46.3,40.64 46.21,40.48 46.05,40.21C45.86,39.88 45.6,39.43 45.6,38.63C45.6,37.83 45.86,37.38 46.05,37.06C46.21,36.79 46.3,36.63 46.3,36.23C46.3,35.83 46.21,35.67 46.05,35.4C45.86,35.07 45.6,34.62 45.6,33.82H47C47,34.22 47.09,34.38 47.25,34.65C47.44,34.98 47.7,35.43 47.7,36.23C47.7,37.03 47.44,37.48 47.25,37.8C47.09,38.07 47,38.23 47,38.63C47,39.03 47.09,39.19 47.25,39.46C47.44,39.79 47.7,40.24 47.7,41.04C47.7,41.05 46.3,41.06 46.3,41.04Z"
+        android:fillColor="@color/hvac_icon_off_foreground_color"/>
     <path
-        android:pathData="M58.865571 43.748823l-1.516285 -0.824117 3.63 -7.08C60.612857 35.418088 59.919857 34.705147 58.870714 33.998823 56.667 32.516471 54.018857 31.765147 51 31.765147c-3.018857 0 -5.667 0.751324 -7.870714 2.233676 -1.048715 0.705883 -1.741286 1.418383 -2.108572 1.846324L44.650286 42.924706 43.134 43.748823 39 35.685441 39.291 35.246029C39.433286 35.031618 42.862714 30 51 30c8.137286 0 11.566714 5.031618 11.709 5.246029L63 35.685441 58.865571 43.748823Z"
-        android:fillColor="@color/hvac_icon_color" />
+        android:pathData="M49.85,41.04C49.85,40.64 49.76,40.48 49.6,40.21C49.41,39.88 49.15,39.43 49.15,38.63C49.15,37.83 49.41,37.38 49.6,37.06C49.76,36.79 49.85,36.63 49.85,36.23C49.85,35.83 49.76,35.67 49.6,35.4C49.41,35.07 49.15,34.62 49.15,33.82H50.55C50.55,34.22 50.64,34.38 50.8,34.65C50.99,34.98 51.25,35.43 51.25,36.23C51.25,37.03 50.99,37.48 50.8,37.8C50.64,38.07 50.55,38.23 50.55,38.63C50.55,39.03 50.64,39.19 50.8,39.46C50.99,39.79 51.25,40.24 51.25,41.04C51.25,41.05 49.85,41.06 49.85,41.04Z"
+        android:fillColor="@color/hvac_icon_off_foreground_color"/>
+    <path
+        android:pathData="M54.37,40.22L52.85,39.4L56.48,32.32C56.11,31.89 55.42,31.18 54.37,30.47C52.17,28.99 49.52,28.24 46.5,28.24C43.48,28.24 40.83,28.99 38.63,30.47C37.58,31.18 36.89,31.89 36.52,32.32L40.15,39.4L38.63,40.22L34.5,32.16L34.79,31.72C34.93,31.51 38.36,26.47 46.5,26.47C54.64,26.47 58.07,31.5 58.21,31.72L58.5,32.16L54.37,40.22Z"
+        android:fillColor="@color/hvac_icon_off_foreground_color"/>
 </vector>
diff --git a/res/drawable/ic_fan_direction_defrost_on.xml b/res/drawable/ic_fan_direction_defrost_on.xml
index 8d2fdbb8..abcd5cd9 100644
--- a/res/drawable/ic_fan_direction_defrost_on.xml
+++ b/res/drawable/ic_fan_direction_defrost_on.xml
@@ -15,37 +15,32 @@
   ~ limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:viewportWidth="108"
-    android:viewportHeight="108"
-    android:width="@dimen/hvac_icon_drawable_width"
-    android:height="@dimen/hvac_icon_drawable_height">
-    <group
-        android:rotation="-90"
-        android:translateX="-16.33333"
-        android:translateY="87">
-        <path
-            android:pathData="M44.666667 53.416667l0 -3.5 -12.845 0 0 -4.083334L26 51.666667 31.821667 57.5l0 -4.083333z"
-            android:fillColor="@color/hvac_icon_color" />
-    </group>
-    <path
-        android:pathData="M59.012449 61.002836l2.402926 -9.566666 1.394434 -5.6c0.592448 -1.966757 1.907369 -2.950135 3.131464 -3.29 0.74654 -0.21 1.539739 -0.28 2.309608 -0.14 2.916172 0.513333 4.82918 3.243333 4.339264 6.09l-3.149466 13.813333c-0.653222 3.313333 -3.522735 5.693333 -6.882165 5.693333l-15.980621 0 -8.91182 7 -3.499406 -3.5 13.461048 -10.5 11.384734 0z"
-        android:fillColor="@color/hvac_icon_color" />
-    <path
-        android:pathData="M67.648549 39.158549c-2.1 -1.493334 -2.613334 -4.386667 -1.143334 -6.51 1.47 -2.1 4.386667 -2.613334 6.51 -1.143334 2.1 1.493334 2.613334 4.386667 1.143334 6.51 -1.493334 2.1 -4.386667 2.613334 -6.51 1.143334l0 0z"
-        android:fillColor="@color/hvac_icon_color" />
-    <path
-        android:pathData="M47.150143 44.565971c0 -0.403677 -0.09086 -0.562059 -0.252 -0.82853 -0.189 -0.331765 -0.447857 -0.778235 -0.447857 -1.578088 0 -0.799853 0.258857 -1.246765 0.447857 -1.571029 0.161143 -0.266471 0.252 -0.432353 0.252 -0.82853 0 -0.396617 -0.09086 -0.562059 -0.252 -0.82897 -0.189 -0.331324 -0.447857 -0.778236 -0.447857 -1.578089l1.399714 0c0 0.403677 0.09129 0.562059 0.252 0.828971 0.189 0.331323 0.448286 0.778235 0.448286 1.578088 0 0.799853 -0.259286 1.246324 -0.448286 1.570588 -0.160714 0.266912 -0.252 0.425294 -0.252 0.828971 0 0.403235 0.09129 0.562059 0.252 0.828529 0.189 0.331324 0.448286 0.778236 0.448286 1.578089 0 0.01235 -1.400143 0.01765 -1.400143 0"
-        android:fillColor="@color/hvac_icon_color" />
-    <path
-        android:pathData="M50.793 44.565971c0 -0.403677 -0.09086 -0.562059 -0.252 -0.82853 -0.189 -0.331765 -0.447857 -0.778235 -0.447857 -1.578088 0 -0.799853 0.258857 -1.246765 0.447857 -1.571029 0.161143 -0.266471 0.252 -0.432353 0.252 -0.82853 0 -0.396617 -0.09086 -0.562059 -0.252 -0.82897 -0.189 -0.331324 -0.447857 -0.778236 -0.447857 -1.578089l1.399714 0c0 0.403677 0.09129 0.562059 0.252 0.828971 0.189 0.331323 0.448286 0.778235 0.448286 1.578088 0 0.799853 -0.259286 1.246324 -0.448286 1.570588 -0.160714 0.266912 -0.252 0.425294 -0.252 0.828971 0 0.403235 0.09129 0.562059 0.252 0.828529 0.189 0.331324 0.448286 0.778236 0.448286 1.578089 0 0.01235 -1.400143 0.01765 -1.400143 0"
-        android:fillColor="@color/hvac_icon_color" />
-    <path
-        android:pathData="M54.342943 44.565971c0 -0.403677 -0.09086 -0.562059 -0.252 -0.82853 -0.189 -0.331765 -0.447857 -0.778235 -0.447857 -1.578088 0 -0.799853 0.258857 -1.246765 0.447857 -1.571029 0.161143 -0.266471 0.252 -0.432353 0.252 -0.82853 0 -0.396617 -0.09086 -0.562059 -0.252 -0.82897 -0.189 -0.331324 -0.447857 -0.778236 -0.447857 -1.578089l1.399714 0c0 0.403677 0.09129 0.562059 0.252 0.828971 0.189 0.331323 0.448286 0.778235 0.448286 1.578088 0 0.799853 -0.259286 1.246324 -0.448286 1.570588 -0.160714 0.266912 -0.252 0.425294 -0.252 0.828971 0 0.403235 0.09129 0.562059 0.252 0.828529 0.189 0.331324 0.448286 0.778236 0.448286 1.578089 0 0.01235 -1.400143 0.01765 -1.400143 0"
-        android:fillColor="@color/hvac_icon_color" />
-    <path
-        android:pathData="M58.865571 43.748823l-1.516285 -0.824117 3.63 -7.08C60.612857 35.418088 59.919857 34.705147 58.870714 33.998823 56.667 32.516471 54.018857 31.765147 51 31.765147c-3.018857 0 -5.667 0.751324 -7.870714 2.233676 -1.048715 0.705883 -1.741286 1.418383 -2.108572 1.846324L44.650286 42.924706 43.134 43.748823 39 35.685441 39.291 35.246029C39.433286 35.031618 42.862714 30 51 30c8.137286 0 11.566714 5.031618 11.709 5.246029L63 35.685441 58.865571 43.748823Z"
-        android:fillColor="@color/hvac_icon_color" />
-    <path
-        android:pathData="M0 54c0 29.823429 24.176571 54 54 54 29.823429 0 54 -24.176571 54 -54C108 24.176571 83.823429 0 54 0 24.176571 0 0 24.176571 0 54ZM54 3.8616071c27.57 0 50 22.4299999 50 49.9999999 0 27.57 -22.43 50.000003 -50 50.000003 -27.57 0 -50 -22.430003 -50 -50.000003 0 -27.57 22.43 -49.9999999 50 -49.9999999"
-        android:fillColor="@color/hvac_icon_color" />
-</vector>
-\ No newline at end of file
+        android:viewportWidth="96"
+        android:viewportHeight="96"
+        android:width="@dimen/hvac_icon_drawable_width"
+        android:height="@dimen/hvac_icon_drawable_height">
+    <path
+        android:pathData="M24,0L72,0A24,24 0,0 1,96 24L96,72A24,24 0,0 1,72 96L24,96A24,24 0,0 1,0 72L0,24A24,24 0,0 1,24 0z"
+        android:fillColor="@color/hvac_icon_on_background_color"/>
+    <path
+        android:pathData="M29.09,51.65H25L30.84,57.48L36.67,51.65H32.59V38.81H29.09V51.65Z"
+        android:fillColor="@color/hvac_icon_on_foreground_color"/>
+    <path
+        android:pathData="M54.52,57.48L56.92,47.91L58.31,42.31C58.9,40.34 60.22,39.36 61.44,39.02C62.19,38.81 62.98,38.74 63.75,38.88C66.67,39.39 68.58,42.12 68.09,44.97L64.94,58.78C64.29,62.09 61.42,64.47 58.06,64.47H42.08L33.17,71.47L29.67,67.97L43.13,57.47H54.52V57.48Z"
+        android:fillColor="@color/hvac_icon_on_foreground_color"/>
+    <path
+        android:pathData="M63.15,35.63C61.05,34.14 60.54,31.24 62.01,29.12C63.48,27.02 66.4,26.51 68.52,27.98C70.62,29.47 71.13,32.37 69.66,34.49C68.17,36.59 65.28,37.1 63.15,35.63Z"
+        android:fillColor="@color/hvac_icon_on_foreground_color"/>
+    <path
+        android:pathData="M42.65,41.04C42.65,40.64 42.56,40.48 42.4,40.21C42.21,39.88 41.95,39.43 41.95,38.63C41.95,37.83 42.21,37.38 42.4,37.06C42.56,36.79 42.65,36.63 42.65,36.23C42.65,35.83 42.56,35.67 42.4,35.4C42.21,35.07 41.95,34.62 41.95,33.82H43.35C43.35,34.22 43.44,34.38 43.6,34.65C43.79,34.98 44.05,35.43 44.05,36.23C44.05,37.03 43.79,37.48 43.6,37.8C43.44,38.07 43.35,38.23 43.35,38.63C43.35,39.03 43.44,39.19 43.6,39.46C43.79,39.79 44.05,40.24 44.05,41.04C44.05,41.05 42.65,41.06 42.65,41.04Z"
+        android:fillColor="@color/hvac_icon_on_foreground_color"/>
+    <path
+        android:pathData="M46.3,41.04C46.3,40.64 46.21,40.48 46.05,40.21C45.86,39.88 45.6,39.43 45.6,38.63C45.6,37.83 45.86,37.38 46.05,37.06C46.21,36.79 46.3,36.63 46.3,36.23C46.3,35.83 46.21,35.67 46.05,35.4C45.86,35.07 45.6,34.62 45.6,33.82H47C47,34.22 47.09,34.38 47.25,34.65C47.44,34.98 47.7,35.43 47.7,36.23C47.7,37.03 47.44,37.48 47.25,37.8C47.09,38.07 47,38.23 47,38.63C47,39.03 47.09,39.19 47.25,39.46C47.44,39.79 47.7,40.24 47.7,41.04C47.7,41.05 46.3,41.06 46.3,41.04Z"
+        android:fillColor="@color/hvac_icon_on_foreground_color"/>
+    <path
+        android:pathData="M49.85,41.04C49.85,40.64 49.76,40.48 49.6,40.21C49.41,39.88 49.15,39.43 49.15,38.63C49.15,37.83 49.41,37.38 49.6,37.06C49.76,36.79 49.85,36.63 49.85,36.23C49.85,35.83 49.76,35.67 49.6,35.4C49.41,35.07 49.15,34.62 49.15,33.82H50.55C50.55,34.22 50.64,34.38 50.8,34.65C50.99,34.98 51.25,35.43 51.25,36.23C51.25,37.03 50.99,37.48 50.8,37.8C50.64,38.07 50.55,38.23 50.55,38.63C50.55,39.03 50.64,39.19 50.8,39.46C50.99,39.79 51.25,40.24 51.25,41.04C51.25,41.05 49.85,41.06 49.85,41.04Z"
+        android:fillColor="@color/hvac_icon_on_foreground_color"/>
+    <path
+        android:pathData="M54.37,40.22L52.85,39.4L56.48,32.32C56.11,31.89 55.42,31.18 54.37,30.47C52.17,28.99 49.52,28.24 46.5,28.24C43.48,28.24 40.83,28.99 38.63,30.47C37.58,31.18 36.89,31.89 36.52,32.32L40.15,39.4L38.63,40.22L34.5,32.16L34.79,31.72C34.93,31.51 38.36,26.47 46.5,26.47C54.64,26.47 58.07,31.5 58.21,31.72L58.5,32.16L54.37,40.22Z"
+        android:fillColor="@color/hvac_icon_on_foreground_color"/>
+</vector>
diff --git a/res/drawable/ic_fan_direction_face_and_floor_off.xml b/res/drawable/ic_fan_direction_face_and_floor_off.xml
index a1f25492..41444db1 100644
--- a/res/drawable/ic_fan_direction_face_and_floor_off.xml
+++ b/res/drawable/ic_fan_direction_face_and_floor_off.xml
@@ -15,32 +15,21 @@
   ~ limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:viewportWidth="108"
-    android:viewportHeight="108"
-    android:alpha="@dimen/hvac_turned_off_alpha"
-    android:width="@dimen/hvac_icon_drawable_width"
-    android:height="@dimen/hvac_icon_drawable_height">
-    <group
-        android:scaleX="-1"
-        android:scaleY="-1"
-        android:translateX="96.33334"
-        android:translateY="73">
-        <path
-            android:pathData="M57.5 38.25l0 -3.5 -12.845 0 0 -4.083333L38.833333 36.5 44.655 42.333333 44.655 38.25Z"
-            android:fillColor="@color/hvac_icon_color" />
-    </group>
-    <group
-        android:rotation="-90"
-        android:translateX="-16.33333"
-        android:translateY="87">
-        <path
-            android:pathData="M44.666667 53.416667l0 -3.5 -12.845 0 0 -4.083334L26 51.666667 31.821667 57.5l0 -4.083333z"
-            android:fillColor="@color/hvac_icon_color" />
-    </group>
+        android:viewportWidth="96"
+        android:viewportHeight="96"
+        android:alpha="@dimen/hvac_turned_off_alpha"
+        android:width="@dimen/hvac_icon_drawable_width"
+        android:height="@dimen/hvac_icon_drawable_height">
     <path
-        android:pathData="M59.012449 61.002836l2.402926 -9.566666 1.394434 -5.6c0.592448 -1.966757 1.907369 -2.950135 3.131464 -3.29 0.74654 -0.21 1.539739 -0.28 2.309608 -0.14 2.916172 0.513333 4.82918 3.243333 4.339264 6.09l-3.149466 13.813333c-0.653222 3.313333 -3.522735 5.693333 -6.882165 5.693333l-15.980621 0 -8.91182 7 -3.499406 -3.5 13.461048 -10.5 11.384734 0z"
-        android:fillColor="@color/hvac_icon_color" />
+        android:pathData="M47.17,34.05V38.13L53,32.3L47.17,26.47V30.55H34.33V34.05H47.17Z"
+        android:fillColor="@color/hvac_icon_off_foreground_color"/>
     <path
-        android:pathData="M67.648549 39.158549c-2.1 -1.493334 -2.613334 -4.386667 -1.143334 -6.51 1.47 -2.1 4.386667 -2.613334 6.51 -1.143334 2.1 1.493334 2.613334 4.386667 1.143334 6.51 -1.493334 2.1 -4.386667 2.613334 -6.51 1.143334l0 0z"
-        android:fillColor="@color/hvac_icon_color" />
+        android:pathData="M29.08,50.98H25L30.83,56.8L36.66,50.98H32.58V38.13H29.08V50.98Z"
+        android:fillColor="@color/hvac_icon_off_foreground_color"/>
+    <path
+        android:pathData="M54.51,56.8L56.91,47.23L58.3,41.63C58.89,39.66 60.21,38.68 61.43,38.34C62.18,38.13 62.97,38.06 63.74,38.2C66.66,38.71 68.57,41.44 68.08,44.29L64.93,58.1C64.28,61.41 61.41,63.79 58.05,63.79H42.07L33.16,70.79L29.66,67.29L43.12,56.79H54.51V56.8Z"
+        android:fillColor="@color/hvac_icon_off_foreground_color"/>
+    <path
+        android:pathData="M63.14,34.96C61.04,33.47 60.53,30.57 62,28.45C63.47,26.35 66.39,25.84 68.51,27.31C70.61,28.8 71.12,31.7 69.65,33.82C68.16,35.92 65.27,36.43 63.14,34.96Z"
+        android:fillColor="@color/hvac_icon_off_foreground_color"/>
 </vector>
diff --git a/res/drawable/ic_fan_direction_face_and_floor_on.xml b/res/drawable/ic_fan_direction_face_and_floor_on.xml
index 24e08112..4feeacd6 100644
--- a/res/drawable/ic_fan_direction_face_and_floor_on.xml
+++ b/res/drawable/ic_fan_direction_face_and_floor_on.xml
@@ -15,34 +15,23 @@
   ~ limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:viewportWidth="108"
-    android:viewportHeight="108"
-    android:width="@dimen/hvac_icon_drawable_width"
-    android:height="@dimen/hvac_icon_drawable_height">
-    <group
-        android:scaleX="-1"
-        android:scaleY="-1"
-        android:translateX="96.33334"
-        android:translateY="73">
-        <path
-            android:pathData="M57.5 38.25l0 -3.5 -12.845 0 0 -4.083333L38.833333 36.5 44.655 42.333333 44.655 38.25Z"
-            android:fillColor="@color/hvac_icon_color" />
-    </group>
-    <group
-        android:rotation="-90"
-        android:translateX="-16.33333"
-        android:translateY="87">
-        <path
-            android:pathData="M44.666667 53.416667l0 -3.5 -12.845 0 0 -4.083334L26 51.666667 31.821667 57.5l0 -4.083333z"
-            android:fillColor="@color/hvac_icon_color" />
-    </group>
+        android:viewportWidth="96"
+        android:viewportHeight="96"
+        android:width="@dimen/hvac_icon_drawable_width"
+        android:height="@dimen/hvac_icon_drawable_height">
     <path
-        android:pathData="M59.012449 61.002836l2.402926 -9.566666 1.394434 -5.6c0.592448 -1.966757 1.907369 -2.950135 3.131464 -3.29 0.74654 -0.21 1.539739 -0.28 2.309608 -0.14 2.916172 0.513333 4.82918 3.243333 4.339264 6.09l-3.149466 13.813333c-0.653222 3.313333 -3.522735 5.693333 -6.882165 5.693333l-15.980621 0 -8.91182 7 -3.499406 -3.5 13.461048 -10.5 11.384734 0z"
-        android:fillColor="@color/hvac_icon_color" />
+        android:pathData="M24,0L72,0A24,24 0,0 1,96 24L96,72A24,24 0,0 1,72 96L24,96A24,24 0,0 1,0 72L0,24A24,24 0,0 1,24 0z"
+        android:fillColor="@color/hvac_icon_on_background_color"/>
     <path
-        android:pathData="M67.648549 39.158549c-2.1 -1.493334 -2.613334 -4.386667 -1.143334 -6.51 1.47 -2.1 4.386667 -2.613334 6.51 -1.143334 2.1 1.493334 2.613334 4.386667 1.143334 6.51 -1.493334 2.1 -4.386667 2.613334 -6.51 1.143334l0 0z"
-        android:fillColor="@color/hvac_icon_color" />
+        android:pathData="M47.17,34.05V38.13L53,32.3L47.17,26.47V30.55H34.33V34.05H47.17Z"
+        android:fillColor="@color/hvac_icon_on_foreground_color"/>
     <path
-        android:pathData="M0 54c0 29.823429 24.176571 54 54 54 29.823429 0 54 -24.176571 54 -54C108 24.176571 83.823429 0 54 0 24.176571 0 0 24.176571 0 54ZM54 3.8616071c27.57 0 50 22.4299999 50 49.9999999 0 27.57 -22.43 50.000003 -50 50.000003 -27.57 0 -50 -22.430003 -50 -50.000003 0 -27.57 22.43 -49.9999999 50 -49.9999999"
-        android:fillColor="@color/hvac_icon_color" />
-</vector>
-\ No newline at end of file
+        android:pathData="M29.08,50.98H25L30.83,56.8L36.66,50.98H32.58V38.13H29.08V50.98Z"
+        android:fillColor="@color/hvac_icon_on_foreground_color"/>
+    <path
+        android:pathData="M54.51,56.8L56.91,47.23L58.3,41.63C58.89,39.66 60.21,38.68 61.43,38.34C62.18,38.13 62.97,38.06 63.74,38.2C66.66,38.71 68.57,41.44 68.08,44.29L64.93,58.1C64.28,61.41 61.41,63.79 58.05,63.79H42.07L33.16,70.79L29.66,67.29L43.12,56.79H54.51V56.8Z"
+        android:fillColor="@color/hvac_icon_on_foreground_color"/>
+    <path
+        android:pathData="M63.14,34.96C61.04,33.47 60.53,30.57 62,28.45C63.47,26.35 66.39,25.84 68.51,27.31C70.61,28.8 71.12,31.7 69.65,33.82C68.16,35.92 65.27,36.43 63.14,34.96Z"
+        android:fillColor="@color/hvac_icon_on_foreground_color"/>
+</vector>
diff --git a/res/drawable/ic_fan_direction_face_off.xml b/res/drawable/ic_fan_direction_face_off.xml
index 5a588461..c323151a 100644
--- a/res/drawable/ic_fan_direction_face_off.xml
+++ b/res/drawable/ic_fan_direction_face_off.xml
@@ -15,24 +15,18 @@
   ~ limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:viewportWidth="108"
-    android:viewportHeight="108"
-    android:alpha="@dimen/hvac_turned_off_alpha"
-    android:width="@dimen/hvac_icon_drawable_width"
-    android:height="@dimen/hvac_icon_drawable_height">
-    <group
-        android:scaleX="-1"
-        android:scaleY="-1"
-        android:translateX="96.33334"
-        android:translateY="73">
-        <path
-            android:pathData="M57.5 38.25l0 -3.5 -12.845 0 0 -4.083333L38.833333 36.5 44.655 42.333333 44.655 38.25Z"
-            android:fillColor="@color/hvac_icon_color" />
-    </group>
+        android:viewportWidth="96"
+        android:viewportHeight="96"
+        android:alpha="@dimen/hvac_turned_off_alpha"
+        android:width="@dimen/hvac_icon_drawable_width"
+        android:height="@dimen/hvac_icon_drawable_height">
     <path
-        android:pathData="M59.012449 61.002836l2.402926 -9.566666 1.394434 -5.6c0.592448 -1.966757 1.907369 -2.950135 3.131464 -3.29 0.74654 -0.21 1.539739 -0.28 2.309608 -0.14 2.916172 0.513333 4.82918 3.243333 4.339264 6.09l-3.149466 13.813333c-0.653222 3.313333 -3.522735 5.693333 -6.882165 5.693333l-15.980621 0 -8.91182 7 -3.499406 -3.5 13.461048 -10.5 11.384734 0z"
-        android:fillColor="@color/hvac_icon_color" />
+        android:pathData="M45.52,34.05V38.13L51.34,32.3L45.52,26.47V30.55H32.68V34.05H45.52Z"
+        android:fillColor="@color/hvac_icon_off_foreground_color"/>
     <path
-        android:pathData="M67.648549 39.158549c-2.1 -1.493334 -2.613334 -4.386667 -1.143334 -6.51 1.47 -2.1 4.386667 -2.613334 6.51 -1.143334 2.1 1.493334 2.613334 4.386667 1.143334 6.51 -1.493334 2.1 -4.386667 2.613334 -6.51 1.143334l0 0z"
-        android:fillColor="@color/hvac_icon_color" />
+        android:pathData="M52.85,56.8L55.25,47.23L56.64,41.63C57.23,39.66 58.55,38.68 59.77,38.34C60.52,38.13 61.31,38.06 62.08,38.2C65,38.71 66.91,41.44 66.42,44.29L63.27,58.1C62.62,61.41 59.75,63.79 56.39,63.79H40.41L31.5,70.79L28,67.29L41.46,56.79H52.85V56.8Z"
+        android:fillColor="@color/hvac_icon_off_foreground_color"/>
+    <path
+        android:pathData="M61.49,34.96C59.39,33.47 58.88,30.57 60.35,28.45C61.82,26.35 64.74,25.84 66.86,27.31C68.96,28.8 69.47,31.7 68,33.82C66.51,35.92 63.61,36.43 61.49,34.96Z"
+        android:fillColor="@color/hvac_icon_off_foreground_color"/>
 </vector>
diff --git a/res/drawable/ic_fan_direction_face_on.xml b/res/drawable/ic_fan_direction_face_on.xml
index a4adb763..72aa6496 100644
--- a/res/drawable/ic_fan_direction_face_on.xml
+++ b/res/drawable/ic_fan_direction_face_on.xml
@@ -15,26 +15,20 @@
   ~ limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:viewportWidth="108"
-    android:viewportHeight="108"
-    android:width="@dimen/hvac_icon_drawable_width"
-    android:height="@dimen/hvac_icon_drawable_height">
-    <group
-        android:scaleX="-1"
-        android:scaleY="-1"
-        android:translateX="96.33334"
-        android:translateY="73">
-        <path
-            android:pathData="M57.5 38.25l0 -3.5 -12.845 0 0 -4.083333L38.833333 36.5 44.655 42.333333 44.655 38.25Z"
-            android:fillColor="@color/hvac_icon_color" />
-    </group>
+        android:viewportWidth="96"
+        android:viewportHeight="96"
+        android:width="@dimen/hvac_icon_drawable_width"
+        android:height="@dimen/hvac_icon_drawable_height">
     <path
-        android:pathData="M59.012449 61.002836l2.402926 -9.566666 1.394434 -5.6c0.592448 -1.966757 1.907369 -2.950135 3.131464 -3.29 0.74654 -0.21 1.539739 -0.28 2.309608 -0.14 2.916172 0.513333 4.82918 3.243333 4.339264 6.09l-3.149466 13.813333c-0.653222 3.313333 -3.522735 5.693333 -6.882165 5.693333l-15.980621 0 -8.91182 7 -3.499406 -3.5 13.461048 -10.5 11.384734 0z"
-        android:fillColor="@color/hvac_icon_color" />
+        android:pathData="M24,0L72,0A24,24 0,0 1,96 24L96,72A24,24 0,0 1,72 96L24,96A24,24 0,0 1,0 72L0,24A24,24 0,0 1,24 0z"
+        android:fillColor="@color/hvac_icon_on_background_color"/>
     <path
-        android:pathData="M67.648549 39.158549c-2.1 -1.493334 -2.613334 -4.386667 -1.143334 -6.51 1.47 -2.1 4.386667 -2.613334 6.51 -1.143334 2.1 1.493334 2.613334 4.386667 1.143334 6.51 -1.493334 2.1 -4.386667 2.613334 -6.51 1.143334l0 0z"
-        android:fillColor="@color/hvac_icon_color" />
+        android:pathData="M45.52,34.05V38.13L51.34,32.3L45.52,26.47V30.55H32.68V34.05H45.52Z"
+        android:fillColor="@color/hvac_icon_on_foreground_color"/>
     <path
-        android:pathData="M0 54c0 29.823429 24.176571 54 54 54 29.823429 0 54 -24.176571 54 -54C108 24.176571 83.823429 0 54 0 24.176571 0 0 24.176571 0 54ZM54 3.8616071c27.57 0 50 22.4299999 50 49.9999999 0 27.57 -22.43 50.000003 -50 50.000003 -27.57 0 -50 -22.430003 -50 -50.000003 0 -27.57 22.43 -49.9999999 50 -49.9999999"
-        android:fillColor="@color/hvac_icon_color" />
-</vector>
-\ No newline at end of file
+        android:pathData="M52.85,56.8L55.25,47.23L56.64,41.63C57.23,39.66 58.55,38.68 59.77,38.34C60.52,38.13 61.31,38.06 62.08,38.2C65,38.71 66.91,41.44 66.42,44.29L63.27,58.1C62.62,61.41 59.75,63.79 56.39,63.79H40.41L31.5,70.79L28,67.29L41.46,56.79H52.85V56.8Z"
+        android:fillColor="@color/hvac_icon_on_foreground_color"/>
+    <path
+        android:pathData="M61.49,34.96C59.39,33.47 58.88,30.57 60.35,28.45C61.82,26.35 64.74,25.84 66.86,27.31C68.96,28.8 69.47,31.7 68,33.82C66.51,35.92 63.61,36.43 61.49,34.96Z"
+        android:fillColor="@color/hvac_icon_on_foreground_color"/>
+</vector>
diff --git a/res/drawable/ic_fan_direction_floor_off.xml b/res/drawable/ic_fan_direction_floor_off.xml
index 9309b081..515f5d23 100644
--- a/res/drawable/ic_fan_direction_floor_off.xml
+++ b/res/drawable/ic_fan_direction_floor_off.xml
@@ -15,23 +15,18 @@
   ~ limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:viewportWidth="108"
-    android:viewportHeight="108"
-    android:alpha="@dimen/hvac_turned_off_alpha"
-    android:width="@dimen/hvac_icon_drawable_width"
-    android:height="@dimen/hvac_icon_drawable_height">
-    <group
-        android:rotation="-90"
-        android:translateX="-16.33333"
-        android:translateY="87">
-        <path
-            android:pathData="M44.666667 53.416667l0 -3.5 -12.845 0 0 -4.083334L26 51.666667 31.821667 57.5l0 -4.083333z"
-            android:fillColor="@color/hvac_icon_color" />
-    </group>
+        android:viewportWidth="96"
+        android:viewportHeight="96"
+        android:alpha="@dimen/hvac_turned_off_alpha"
+        android:width="@dimen/hvac_icon_drawable_width"
+        android:height="@dimen/hvac_icon_drawable_height">
     <path
-        android:pathData="M59.012449 61.002836l2.402926 -9.566666 1.394434 -5.6c0.592448 -1.966757 1.907369 -2.950135 3.131464 -3.29 0.74654 -0.21 1.539739 -0.28 2.309608 -0.14 2.916172 0.513333 4.82918 3.243333 4.339264 6.09l-3.149466 13.813333c-0.653222 3.313333 -3.522735 5.693333 -6.882165 5.693333l-15.980621 0 -8.91182 7 -3.499406 -3.5 13.461048 -10.5 11.384734 0z"
-        android:fillColor="@color/hvac_icon_color" />
+        android:pathData="M29.08,50.98H25L30.83,56.8L36.66,50.98H32.58V38.13H29.08V50.98Z"
+        android:fillColor="@color/hvac_icon_off_foreground_color"/>
     <path
-        android:pathData="M67.648549 39.158549c-2.1 -1.493334 -2.613334 -4.386667 -1.143334 -6.51 1.47 -2.1 4.386667 -2.613334 6.51 -1.143334 2.1 1.493334 2.613334 4.386667 1.143334 6.51 -1.493334 2.1 -4.386667 2.613334 -6.51 1.143334l0 0z"
-        android:fillColor="@color/hvac_icon_color" />
+        android:pathData="M54.51,56.8L56.91,47.23L58.3,41.63C58.89,39.66 60.21,38.68 61.43,38.34C62.18,38.13 62.97,38.06 63.74,38.2C66.66,38.71 68.57,41.44 68.08,44.29L64.93,58.1C64.28,61.41 61.41,63.79 58.05,63.79H42.07L33.16,70.79L29.66,67.29L43.12,56.79H54.51V56.8Z"
+        android:fillColor="@color/hvac_icon_off_foreground_color"/>
+    <path
+        android:pathData="M63.14,34.96C61.04,33.47 60.53,30.57 62,28.45C63.47,26.35 66.39,25.84 68.51,27.31C70.61,28.8 71.12,31.7 69.65,33.82C68.16,35.92 65.27,36.43 63.14,34.96Z"
+        android:fillColor="@color/hvac_icon_off_foreground_color"/>
 </vector>
diff --git a/res/drawable/ic_fan_direction_floor_on.xml b/res/drawable/ic_fan_direction_floor_on.xml
index 0b68b899..13f2e85f 100644
--- a/res/drawable/ic_fan_direction_floor_on.xml
+++ b/res/drawable/ic_fan_direction_floor_on.xml
@@ -15,25 +15,20 @@
   ~ limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:viewportWidth="108"
-    android:viewportHeight="108"
-    android:width="@dimen/hvac_icon_drawable_width"
-    android:height="@dimen/hvac_icon_drawable_height">
-    <group
-        android:rotation="-90"
-        android:translateX="-16.33333"
-        android:translateY="87">
-        <path
-            android:pathData="M44.666667 53.416667l0 -3.5 -12.845 0 0 -4.083334L26 51.666667 31.821667 57.5l0 -4.083333z"
-            android:fillColor="@color/hvac_icon_color" />
-    </group>
+        android:viewportWidth="96"
+        android:viewportHeight="96"
+        android:width="@dimen/hvac_icon_drawable_width"
+        android:height="@dimen/hvac_icon_drawable_height">
     <path
-        android:pathData="M59.012449 61.002836l2.402926 -9.566666 1.394434 -5.6c0.592448 -1.966757 1.907369 -2.950135 3.131464 -3.29 0.74654 -0.21 1.539739 -0.28 2.309608 -0.14 2.916172 0.513333 4.82918 3.243333 4.339264 6.09l-3.149466 13.813333c-0.653222 3.313333 -3.522735 5.693333 -6.882165 5.693333l-15.980621 0 -8.91182 7 -3.499406 -3.5 13.461048 -10.5 11.384734 0z"
-        android:fillColor="@color/hvac_icon_color" />
+        android:pathData="M24,0L72,0A24,24 0,0 1,96 24L96,72A24,24 0,0 1,72 96L24,96A24,24 0,0 1,0 72L0,24A24,24 0,0 1,24 0z"
+        android:fillColor="@color/hvac_icon_on_background_color"/>
     <path
-        android:pathData="M67.648549 39.158549c-2.1 -1.493334 -2.613334 -4.386667 -1.143334 -6.51 1.47 -2.1 4.386667 -2.613334 6.51 -1.143334 2.1 1.493334 2.613334 4.386667 1.143334 6.51 -1.493334 2.1 -4.386667 2.613334 -6.51 1.143334l0 0z"
-        android:fillColor="@color/hvac_icon_color" />
+        android:pathData="M29.08,50.98H25L30.83,56.8L36.66,50.98H32.58V38.13H29.08V50.98Z"
+        android:fillColor="@color/hvac_icon_on_foreground_color"/>
     <path
-        android:pathData="M0 54c0 29.823429 24.176571 54 54 54 29.823429 0 54 -24.176571 54 -54C108 24.176571 83.823429 0 54 0 24.176571 0 0 24.176571 0 54ZM54 3.8616071c27.57 0 50 22.4299999 50 49.9999999 0 27.57 -22.43 50.000003 -50 50.000003 -27.57 0 -50 -22.430003 -50 -50.000003 0 -27.57 22.43 -49.9999999 50 -49.9999999"
-        android:fillColor="@color/hvac_icon_color" />
-</vector>
-\ No newline at end of file
+        android:pathData="M54.51,56.8L56.91,47.23L58.3,41.63C58.89,39.66 60.21,38.68 61.43,38.34C62.18,38.13 62.97,38.06 63.74,38.2C66.66,38.71 68.57,41.44 68.08,44.29L64.93,58.1C64.28,61.41 61.41,63.79 58.05,63.79H42.07L33.16,70.79L29.66,67.29L43.12,56.79H54.51V56.8Z"
+        android:fillColor="@color/hvac_icon_on_foreground_color"/>
+    <path
+        android:pathData="M63.14,34.96C61.04,33.47 60.53,30.57 62,28.45C63.47,26.35 66.39,25.84 68.51,27.31C70.61,28.8 71.12,31.7 69.65,33.82C68.16,35.92 65.27,36.43 63.14,34.96Z"
+        android:fillColor="@color/hvac_icon_on_foreground_color"/>
+</vector>
diff --git a/res/drawable/ic_seat_heat_level_1.xml b/res/drawable/ic_seat_heat_level_1.xml
index 688e6318..c88a10f3 100644
--- a/res/drawable/ic_seat_heat_level_1.xml
+++ b/res/drawable/ic_seat_heat_level_1.xml
@@ -80,7 +80,7 @@ C33.4622,34.1902 34.0672,35.2032 34.0672,37.0162 C34.0672,37.0442
                 </group>
             </group>
             <path
-                android:fillColor="#6BC2B8"
+                android:fillColor="@color/hvac_seat_heat_level_drawable_on_fill_color"
                 android:strokeWidth="1"
                 android:pathData="M43.1206656,107.936015 C39.6520522,107.220263 36.2396976,106.15025
 32.9797533,104.759027 C29.7801594,103.392591 26.6930832,101.699781
@@ -105,7 +105,7 @@ C33.4622,34.1902 34.0672,35.2032 34.0672,37.0162 C34.0672,37.0442
 43.73849,108.000051 C43.5349353,108.000051 43.3283119,107.979394
 43.1206656,107.936015 Z" />
             <path
-                android:fillColor="@color/hvac_seat_heat_level_drawable_fill_color"
+                android:fillColor="@color/hvac_seat_heat_level_drawable_off_fill_color"
                 android:strokeWidth="1"
                 android:pathData="M96.2360712,28.8658223 C95.25103,28.8658223 94.2833779,28.3876215
 93.6901028,27.5014524 C91.9767653,24.9400312 90.0097515,22.5335347
@@ -132,7 +132,7 @@ C33.4622,34.1902 34.0672,35.2032 34.0672,37.0162 C34.0672,37.0442
 97.9504316,28.3339143 C97.4246671,28.6933395 96.8273005,28.8658223
 96.2360712,28.8658223" />
             <path
-                android:fillColor="@color/hvac_seat_heat_level_drawable_fill_color"
+                android:fillColor="@color/hvac_seat_heat_level_drawable_off_fill_color"
                 android:strokeWidth="1"
                 android:pathData="M64.2613062,108 C62.8333545,108 61.5547444,106.988858 61.2581069,105.522238
 C60.918508,103.845953 61.9884489,102.208916 63.6496192,101.866016
diff --git a/res/drawable/ic_seat_heat_level_2.xml b/res/drawable/ic_seat_heat_level_2.xml
index f89eedca..aed5cbbe 100644
--- a/res/drawable/ic_seat_heat_level_2.xml
+++ b/res/drawable/ic_seat_heat_level_2.xml
@@ -80,7 +80,7 @@ C33.4622,34.1902 34.0672,35.2032 34.0672,37.0162 C34.0672,37.0442
 30.8002,37.0562 30.8002,37.0162" />
             </group>
             <path
-                android:fillColor="#80CBC4"
+                android:fillColor="@color/hvac_seat_heat_level_drawable_on_fill_color"
                 android:strokeWidth="1"
                 android:pathData="M93.6901028,27.5014524 C91.9767653,24.9400312 90.0097515,22.5335347
 87.8442975,20.3470313 C85.6788435,18.1594949 83.2944914,16.1733607
@@ -127,7 +127,7 @@ C46.0115511,102.208916 47.081492,103.845953 46.7418931,105.522238
 C46.4452556,106.988858 45.1666455,108 43.7386938,108 C43.535139,108
 43.3285157,107.979343 43.1208694,107.935964 Z" />
             <path
-                android:fillColor="@color/hvac_seat_heat_level_drawable_fill_color"
+                android:fillColor="@color/hvac_seat_heat_level_drawable_off_fill_color"
                 android:strokeWidth="1"
                 android:pathData="M64.2613062,108 C62.8333545,108 61.5547444,106.988858 61.2581069,105.522238
 C60.918508,103.845953 61.9884489,102.208916 63.6496192,101.866016
diff --git a/res/drawable/ic_seat_heat_level_3.xml b/res/drawable/ic_seat_heat_level_3.xml
index 0b329a14..f69f2fef 100644
--- a/res/drawable/ic_seat_heat_level_3.xml
+++ b/res/drawable/ic_seat_heat_level_3.xml
@@ -80,7 +80,7 @@ C33.4622,34.1902 34.0672,35.2032 34.0672,37.0162 C34.0672,37.0442
                 </group>
             </group>
             <path
-                android:fillColor="#80CBC4"
+                android:fillColor="@color/hvac_seat_heat_level_drawable_on_fill_color"
                 android:strokeWidth="1"
                 android:pathData="M96.2360712,28.8658223 C95.25103,28.8658223 94.2833779,28.3876215
 93.6901028,27.5014524 C91.9767653,24.9400312 90.0097515,22.5335347
diff --git a/res/drawable/ic_seat_heat_off.xml b/res/drawable/ic_seat_heat_off.xml
index d084b38e..f7d2ef41 100644
--- a/res/drawable/ic_seat_heat_off.xml
+++ b/res/drawable/ic_seat_heat_off.xml
@@ -71,7 +71,7 @@ L37.9996,72.6666 L56.8266,72.6666 C60.2326,72.6666 63.3686,71.3756
 L64.4026,61.9626 Z" />
             </group>
             <path
-                android:fillColor="@color/hvac_seat_heat_level_drawable_fill_color"
+                android:fillColor="@color/hvac_seat_heat_level_drawable_off_fill_color"
                 android:strokeWidth="1"
                 android:pathData="M96.2360712,28.8658223 C95.25103,28.8658223 94.2833779,28.3876215
 93.6901028,27.5014524 C91.9767653,24.9400312 90.0097515,22.5335347
@@ -98,7 +98,7 @@ L64.4026,61.9626 Z" />
 97.9504316,28.3339143 C97.4246671,28.6933395 96.8273005,28.8658223
 96.2360712,28.8658223" />
             <path
-                android:fillColor="@color/hvac_seat_heat_level_drawable_fill_color"
+                android:fillColor="@color/hvac_seat_heat_level_drawable_off_fill_color"
                 android:strokeWidth="1"
                 android:pathData="M43.7386938,108 C43.535139,108 43.3285157,107.979343 43.1208694,107.935964
 C39.6522559,107.220213 36.2399013,106.150199 32.9799571,104.758976
@@ -122,7 +122,7 @@ C0.369262592,61.9140426 0,58.2185729 0,54.5200046 C0,50.8214364
 47.081492,103.845953 46.7418931,105.522238 C46.4452556,106.988858 45.1666455,108
 43.7386938,108" />
             <path
-                android:fillColor="@color/hvac_seat_heat_level_drawable_fill_color"
+                android:fillColor="@color/hvac_seat_heat_level_drawable_off_fill_color"
                 android:strokeWidth="1"
                 android:pathData="M64.2613062,108 C62.8333545,108 61.5547444,106.988858 61.2581069,105.522238
 C60.918508,103.845953 61.9884489,102.208916 63.6496192,101.866016
diff --git a/res/drawable/nav_bar_button_background.xml b/res/drawable/nav_bar_button_background.xml
new file mode 100644
index 00000000..9cf1dab0
--- /dev/null
+++ b/res/drawable/nav_bar_button_background.xml
@@ -0,0 +1,93 @@
+<!--
+  ~ Copyright (C) 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT 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_selected="true" android:state_focused="true" android:state_pressed="true">
+        <layer-list>
+            <item>
+                <ripple android:color="@color/car_ui_ripple_color">
+                    <item android:drawable="@drawable/nav_bar_button_background_selected" />
+                </ripple>
+            </item>
+            <item>
+                <shape android:shape="rectangle">
+                    <solid android:color="@color/car_ui_rotary_focus_pressed_fill_color"/>
+                    <stroke android:width="@dimen/car_ui_rotary_focus_pressed_stroke_width"
+                            android:color="@color/car_ui_rotary_focus_pressed_stroke_color"/>
+                    <corners android:radius="@dimen/car_nav_bar_button_selected_corner_radius"/>
+                </shape>
+            </item>
+        </layer-list>
+    </item>
+    <item android:state_selected="true" android:state_focused="true">
+        <layer-list>
+            <item>
+                <ripple android:color="@color/car_ui_ripple_color">
+                    <item android:drawable="@drawable/nav_bar_button_background_selected" />
+                </ripple>
+            </item>
+            <item>
+                <shape android:shape="rectangle">
+                    <solid android:color="@color/car_ui_rotary_focus_fill_color"/>
+                    <stroke android:width="@dimen/car_ui_rotary_focus_stroke_width"
+                            android:color="@color/car_ui_rotary_focus_stroke_color"/>
+                    <corners android:radius="@dimen/car_nav_bar_button_selected_corner_radius"/>
+                </shape>
+            </item>
+        </layer-list>
+    </item>
+    <item android:state_focused="true" android:state_pressed="true">
+        <layer-list>
+            <item>
+                <ripple android:color="@color/car_ui_ripple_color">
+                    <item android:drawable="@drawable/nav_bar_button_background_unselected" />
+                </ripple>
+            </item>
+            <item>
+                <shape android:shape="oval">
+                    <solid android:color="@color/car_ui_rotary_focus_pressed_fill_color"/>
+                    <stroke android:width="@dimen/car_ui_rotary_focus_pressed_stroke_width"
+                            android:color="@color/car_ui_rotary_focus_pressed_stroke_color"/>
+                </shape>
+            </item>
+        </layer-list>
+    </item>
+    <item android:state_focused="true">
+        <layer-list>
+            <item>
+                <ripple android:color="@color/car_ui_ripple_color">
+                    <item android:drawable="@drawable/nav_bar_button_background_unselected" />
+                </ripple>
+            </item>
+            <item>
+                <shape android:shape="oval">
+                    <solid android:color="@color/car_ui_rotary_focus_fill_color"/>
+                    <stroke android:width="@dimen/car_ui_rotary_focus_stroke_width"
+                            android:color="@color/car_ui_rotary_focus_stroke_color"/>
+                </shape>
+            </item>
+        </layer-list>
+    </item>
+    <item android:state_selected="true">
+        <ripple android:color="@color/car_ui_ripple_color">
+            <item android:drawable="@drawable/nav_bar_button_background_selected" />
+        </ripple>
+    </item>
+    <item>
+        <ripple android:color="@color/car_ui_ripple_color">
+            <item android:drawable="@drawable/nav_bar_button_background_unselected" />
+        </ripple>
+    </item>
+</selector>
+\ No newline at end of file
diff --git a/res/drawable/nav_bar_button_background_selected.xml b/res/drawable/nav_bar_button_background_selected.xml
new file mode 100644
index 00000000..2fbdfa49
--- /dev/null
+++ b/res/drawable/nav_bar_button_background_selected.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="@dimen/system_bar_button_size"
+        android:height="@dimen/system_bar_button_size"
+        android:viewportWidth="48"
+        android:viewportHeight="48">
+
+    <group
+        android:name="s"
+        android:translateX="24"
+        android:translateY="24"
+        android:scaleX="0.5"
+        android:scaleY="0.5">
+        <path
+            android:name="v"
+            android:fillColor="@color/car_nav_icon_background_color_selected"
+            android:fillAlpha="1"
+            android:fillType="nonZero"
+            android:pathData="M48 -16 C48,-16 48,16 48,16 C48,33.67 33.67,48 16,48 C16,48 -16,48 -16,48 C-33.67,48 -48,33.67 -48,16 C-48,16 -48,-16 -48,-16 C-48,-33.67 -33.67,-48 -16,-48 C-16,-48 16,-48 16,-48 C33.67,-48 48,-33.67 48,-16c " />
+    </group>
+</vector>
+\ No newline at end of file
diff --git a/res/drawable/nav_bar_button_background_unselected.xml b/res/drawable/nav_bar_button_background_unselected.xml
new file mode 100644
index 00000000..8f040e74
--- /dev/null
+++ b/res/drawable/nav_bar_button_background_unselected.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="@dimen/system_bar_button_size"
+        android:height="@dimen/system_bar_button_size"
+        android:viewportWidth="48"
+        android:viewportHeight="48">
+
+    <group
+        android:name="s"
+        android:translateX="24"
+        android:translateY="24"
+        android:scaleX="0.5"
+        android:scaleY="0.5">
+        <path
+            android:name="v"
+            android:fillColor="@color/car_nav_icon_background_color"
+            android:fillAlpha="1"
+            android:fillType="nonZero"
+            android:pathData="M48 0.25 C48,0.25 48,0 48,0 C47.75,26 31.25,48 0,48 C0,48 0,48 0,48 C-30,48 -48,25.75 -48,-0.25 C-48,-0.25 -48,-0.25 -48,-0.25 C-47.75,-23.5 -32.25,-47.75 0.5,-48 C0.5,-48 0.5,-48 0.5,-48 C28,-47.75 47.75,-29.75 48,0.25c " />
+    </group>
+</vector>
+\ No newline at end of file
diff --git a/res/drawable/privacy_chip_inactive_selected_background_pill.xml b/res/drawable/privacy_chip_inactive_selected_background_pill.xml
index f6707c02..1d8c293b 100644
--- a/res/drawable/privacy_chip_inactive_selected_background_pill.xml
+++ b/res/drawable/privacy_chip_inactive_selected_background_pill.xml
@@ -21,7 +21,7 @@
         <aapt:attr name="android:drawable">
             <shape android:shape="rectangle">
                 <solid android:color="@color/status_icon_selected_button_color"/>
-                <corners android:radius="@dimen/system_bar_pill_radius"/>
+                <corners android:radius="@dimen/system_bar_pill_selected_radius"/>
             </shape>
         </aapt:attr>
     </item>
diff --git a/res/drawable/stat_sys_ethernet_fully.xml b/res/drawable/stat_sys_ethernet_fully.xml
new file mode 100644
index 00000000..e4dbcce4
--- /dev/null
+++ b/res/drawable/stat_sys_ethernet_fully.xml
@@ -0,0 +1,24 @@
+<!--
+  ~ Copyright (C) 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="@dimen/car_quick_controls_icon_drawable_width"
+        android:height="@dimen/car_quick_controls_icon_drawable_height"
+        android:viewportWidth="960"
+        android:viewportHeight="960">
+    <path
+        android:fillColor="@color/car_quick_controls_icon_drawable_color"
+        android:pathData="M680,720L624,664L806,480L624,296L680,240L920,480L680,720ZM280,720L40,480L280,240L336,296L154,480L336,664L280,720ZM320,520Q303,520 291.5,508.5Q280,497 280,480Q280,463 291.5,451.5Q303,440 320,440Q337,440 348.5,451.5Q360,463 360,480Q360,497 348.5,508.5Q337,520 320,520ZM480,520Q463,520 451.5,508.5Q440,497 440,480Q440,463 451.5,451.5Q463,440 480,440Q497,440 508.5,451.5Q520,463 520,480Q520,497 508.5,508.5Q497,520 480,520ZM640,520Q623,520 611.5,508.5Q600,497 600,480Q600,463 611.5,451.5Q623,440 640,440Q657,440 668.5,451.5Q680,463 680,480Q680,497 668.5,508.5Q657,520 640,520Z"/>
+</vector>
diff --git a/res/drawable/status_icon_background.xml b/res/drawable/status_icon_background.xml
index 6f78d9f2..fcdd2b09 100644
--- a/res/drawable/status_icon_background.xml
+++ b/res/drawable/status_icon_background.xml
@@ -25,7 +25,7 @@
             <item>
                 <shape android:shape="rectangle">
                     <solid android:color="@color/status_icon_selected_button_color"/>
-                    <corners android:radius="@dimen/system_bar_pill_radius"/>
+                    <corners android:radius="@dimen/system_bar_pill_selected_radius"/>
                 </shape>
             </item>
             <item android:drawable="@drawable/system_bar_pill_rotary_background"/>
@@ -49,7 +49,7 @@
             <item>
                 <shape android:shape="rectangle">
                     <solid android:color="@color/status_icon_selected_button_color"/>
-                    <corners android:radius="@dimen/system_bar_pill_radius"/>
+                    <corners android:radius="@dimen/system_bar_pill_selected_radius"/>
                 </shape>
             </item>
             <item android:drawable="@drawable/system_bar_pill_rotary_background"/>
diff --git a/res/drawable/system_bar_pill_rotary_background.xml b/res/drawable/system_bar_pill_rotary_background.xml
index 734d330b..f49d74c7 100644
--- a/res/drawable/system_bar_pill_rotary_background.xml
+++ b/res/drawable/system_bar_pill_rotary_background.xml
@@ -15,6 +15,14 @@
   ~ limitations under the License.
   -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true" android:state_pressed="true" android:state_selected="true">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/car_ui_rotary_focus_pressed_fill_color"/>
+            <stroke android:width="@dimen/car_ui_rotary_focus_pressed_stroke_width"
+                    android:color="@color/car_ui_rotary_focus_pressed_stroke_color"/>
+            <corners android:radius="@dimen/system_bar_pill_selected_radius"/>
+        </shape>
+    </item>
     <item android:state_focused="true" android:state_pressed="true">
         <shape android:shape="rectangle">
             <solid android:color="@color/car_ui_rotary_focus_pressed_fill_color"/>
@@ -23,6 +31,14 @@
             <corners android:radius="@dimen/system_bar_pill_radius"/>
         </shape>
     </item>
+    <item android:state_focused="true" android:state_selected="true">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/car_ui_rotary_focus_fill_color"/>
+            <stroke android:width="@dimen/car_ui_rotary_focus_stroke_width"
+                    android:color="@color/car_ui_rotary_focus_stroke_color"/>
+            <corners android:radius="@dimen/system_bar_pill_selected_radius"/>
+        </shape>
+    </item>
     <item android:state_focused="true">
         <shape android:shape="rectangle">
             <solid android:color="@color/car_ui_rotary_focus_fill_color"/>
diff --git a/res/layout/adjustable_temperature_view.xml b/res/layout/adjustable_temperature_view.xml
index cf756cc1..4c8694db 100644
--- a/res/layout/adjustable_temperature_view.xml
+++ b/res/layout/adjustable_temperature_view.xml
@@ -23,32 +23,28 @@
     android:gravity="center_vertical"
     android:paddingEnd="@dimen/hvac_container_padding"
     android:paddingStart="@dimen/hvac_container_padding">
-
     <ImageView
         android:id="@+id/hvac_decrease_button"
         android:layout_width="@dimen/hvac_temperature_button_size"
         android:layout_height="@dimen/hvac_temperature_button_size"
-        android:background="@drawable/system_bar_button_background"
+        android:paddingHorizontal="@dimen/hvac_temperature_button_padding"
         android:scaleType="center"
         android:src="@drawable/hvac_decrease_button"
         android:contentDescription="@string/hvac_decrease_button_label"/>
-
     <TextView
         android:id="@+id/hvac_temperature_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:paddingEnd="@dimen/hvac_temperature_text_padding"
-        android:paddingStart="@dimen/hvac_temperature_text_padding"
+        android:paddingHorizontal="@dimen/hvac_temperature_text_padding"
         android:textColor="@color/system_bar_text_color"
         android:textSize="@dimen/hvac_temperature_text_size"/>
-
     <ImageView
         android:id="@+id/hvac_increase_button"
         android:layout_width="@dimen/hvac_temperature_button_size"
         android:layout_height="@dimen/hvac_temperature_button_size"
-        android:background="@drawable/system_bar_button_background"
+        android:paddingHorizontal="@dimen/hvac_temperature_button_padding"
         android:scaleType="center"
         android:src="@drawable/hvac_increase_button"
         android:contentDescription="@string/hvac_increase_button_label"/>
-</LinearLayout>
-\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/adjustable_temperature_view_dock.xml b/res/layout/adjustable_temperature_view_dock.xml
new file mode 100644
index 00000000..53e7429b
--- /dev/null
+++ b/res/layout/adjustable_temperature_view_dock.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  ~ Copyright (C) 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<!-- todo(b/304320644): update layout/adjustable_temperature_view -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
+    android:paddingEnd="@dimen/hvac_container_padding"
+    android:paddingStart="@dimen/hvac_container_padding">
+
+    <ImageView
+        android:id="@+id/hvac_decrease_button"
+        android:layout_width="@dimen/hvac_temperature_button_size"
+        android:layout_height="@dimen/hvac_temperature_button_size"
+        android:background="@drawable/system_bar_button_background"
+        android:scaleType="center"
+        android:src="@drawable/hvac_decrease_button_dock"
+        android:contentDescription="@string/hvac_decrease_button_label"/>
+
+    <TextView
+        android:id="@+id/hvac_temperature_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingEnd="@dimen/hvac_temperature_text_padding"
+        android:paddingStart="@dimen/hvac_temperature_text_padding"
+        android:textColor="@color/system_bar_text_color"
+        android:textSize="@dimen/hvac_temperature_text_size"/>
+
+    <ImageView
+        android:id="@+id/hvac_increase_button"
+        android:layout_width="@dimen/hvac_temperature_button_size"
+        android:layout_height="@dimen/hvac_temperature_button_size"
+        android:background="@drawable/system_bar_button_background"
+        android:scaleType="center"
+        android:src="@drawable/hvac_increase_button_dock"
+        android:contentDescription="@string/hvac_increase_button_label"/>
+</LinearLayout>
+\ No newline at end of file
diff --git a/samples/sample1/rro/res/drawable/system_bar_background.xml b/res/layout/alert_dialog_systemui.xml
index 6161ad9b..6c465c80 100644
--- a/samples/sample1/rro/res/drawable/system_bar_background.xml
+++ b/res/layout/alert_dialog_systemui.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2020 The Android Open Source Project
+  ~ Copyright (C) 2023 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -14,20 +14,11 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
-    <corners
-        android:topLeftRadius="0dp"
-        android:topRightRadius="10dp"
-        android:bottomLeftRadius="0dp"
-        android:bottomRightRadius="0dp"
-    />
-    <solid
-        android:color="#404040"
-    />
-    <padding
-        android:left="0dp"
-        android:top="0dp"
-        android:right="0dp"
-        android:bottom="0dp"
-    />
-</shape>
-\ No newline at end of file
+<!-- This is the copy of the files at packages/services/Car/car_product/rro/overlay-visual/androidRRO/res/layout-car/
+     This layout controls the dialog shown by the SysUI and the other one is the platform default. -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <include layout="@*android:layout/car_alert_dialog" />
+</LinearLayout>
diff --git a/res/layout/camera_privacy_chip.xml b/res/layout/camera_privacy_chip.xml
index eab60b12..b48bf03f 100644
--- a/res/layout/camera_privacy_chip.xml
+++ b/res/layout/camera_privacy_chip.xml
@@ -22,8 +22,7 @@
     android:layout_width="@dimen/privacy_chip_width"
     android:layout_height="match_parent"
     android:visibility="gone"
-    android:paddingTop="@dimen/car_padding_1"
-    android:paddingBottom="@dimen/car_padding_1"
+    android:paddingVertical="@dimen/privacy_chip_vertical_padding"
     android:paddingEnd="@dimen/privacy_chip_horizontal_padding"
     android:focusable="false"
     app:layoutDescription="@xml/camera_privacy_chip_scene">
diff --git a/res/layout/camera_privacy_chip_dock.xml b/res/layout/camera_privacy_chip_dock.xml
new file mode 100644
index 00000000..00000bc1
--- /dev/null
+++ b/res/layout/camera_privacy_chip_dock.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<!-- todo(b/304320644): update layout/camera_privacy_chip -->
+<com.android.systemui.car.privacy.CameraPrivacyChip
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/camera_privacy_chip"
+    android:layout_width="@dimen/privacy_chip_width"
+    android:layout_height="match_parent"
+    android:visibility="gone"
+    android:focusable="false"
+    style="@style/PrivacyChipPadding"
+    app:layoutDescription="@xml/camera_privacy_chip_scene">
+
+    <include layout="@layout/privacy_chip_content" />
+
+</com.android.systemui.car.privacy.CameraPrivacyChip>
diff --git a/res/layout/car_activity_window.xml b/res/layout/car_activity_window.xml
new file mode 100644
index 00000000..aee086ac
--- /dev/null
+++ b/res/layout/car_activity_window.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<com.android.car.ui.FocusArea
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+
+    <!--TODO: b/310990030 Remove if remote task view is not used for display compat toolbar-->
+        <include layout="@layout/displaycompat_toolbar"/>
+
+        <FrameLayout
+            android:id="@+id/activity_area"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </LinearLayout>
+</com.android.car.ui.FocusArea>
diff --git a/res/layout/car_bottom_system_bar.xml b/res/layout/car_bottom_system_bar.xml
index 879bc7e7..303def2d 100644
--- a/res/layout/car_bottom_system_bar.xml
+++ b/res/layout/car_bottom_system_bar.xml
@@ -92,7 +92,7 @@
                 systemui:intent="@string/system_bar_app_drawer_intent"
                 systemui:clearBackStack="true"/>
 
-            <com.android.systemui.car.systembar.HvacButton
+            <com.android.systemui.car.systembar.CarSystemBarButton
                 android:id="@+id/hvac"
                 android:contentDescription="@string/system_bar_climate_control_label"
                 style="@style/SystemBarButton"
@@ -173,4 +173,4 @@
             systemui:icon="@drawable/car_ic_home"
             systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;launchFlags=0x14000000;end"/>
     </LinearLayout>
-</com.android.systemui.car.systembar.CarSystemBarView>
+</com.android.systemui.car.systembar.CarSystemBarView>
+\ No newline at end of file
diff --git a/res/layout/car_bottom_system_bar_dock.xml b/res/layout/car_bottom_system_bar_dock.xml
new file mode 100644
index 00000000..d0c1ebc9
--- /dev/null
+++ b/res/layout/car_bottom_system_bar_dock.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2023 The Android Open Source Project.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<com.android.systemui.car.systembar.CarSystemBarView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:systemui="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/system_bar_background"
+    android:gravity="center"
+    android:orientation="horizontal">
+
+    <LinearLayout
+        android:id="@+id/nav_buttons"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/car_nav_buttons_margin"
+        android:layoutDirection="ltr"
+        android:gravity="center">
+
+        <com.android.systemui.car.systembar.CarSystemBarButton
+            android:id="@+id/home"
+            android:contentDescription="@string/system_bar_home_label"
+            style="@style/SystemBarButtonWithDock"
+            systemui:componentNames="com.android.car.carlauncher/.CarLauncher"
+            systemui:highlightWhenSelected="true"
+            systemui:icon="@drawable/car_ic_home"
+            systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;launchFlags=0x14000000;end"/>
+
+        <com.android.systemui.car.systembar.CarSystemBarButton
+            android:id="@+id/passenger_home"
+            android:contentDescription="@string/system_bar_home_label"
+            android:visibility="gone"
+            style="@style/SystemBarButtonWithDock"
+            systemui:highlightWhenSelected="true"
+            systemui:icon="@drawable/car_ic_home"
+            systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;launchFlags=0x14000000;end"/>
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"/>
+
+        <com.android.systemui.car.hvac.TemperatureControlView
+            android:id="@+id/driver_hvac"
+            style="@style/TemperatureControlView"
+            systemui:hvacAreaId="49">
+            <include layout="@layout/adjustable_temperature_view_dock"/>
+        </com.android.systemui.car.hvac.TemperatureControlView>
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"/>
+
+        <com.android.systemui.car.systembar.AppGridButton
+            android:id="@+id/grid_nav"
+            android:contentDescription="@string/system_bar_applications_label"
+            style="@style/SystemBarButtonWithDock"
+            systemui:componentNames="@string/config_appGridComponentName"
+            systemui:highlightWhenSelected="true"
+            systemui:icon="@drawable/car_ic_apps"
+            systemui:intent="@string/system_bar_app_drawer_intent"
+            systemui:clearBackStack="true"/>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:layoutDirection="ltr"
+            android:layout_marginHorizontal="@dimen/dock_container_margin">
+            <!-- todo: add dock here  -->
+        </LinearLayout>
+
+        <com.android.systemui.car.systembar.AssistantButton
+            android:id="@+id/assistant"
+            android:contentDescription="@string/system_bar_assistant_label"
+            style="@style/SystemBarButtonWithDock"
+            systemui:highlightWhenSelected="true"
+            systemui:icon="@drawable/ic_mic_light"/>
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"/>
+
+        <com.android.systemui.car.hvac.TemperatureControlView
+            android:id="@+id/passenger_hvac"
+            style="@style/TemperatureControlView"
+            systemui:hvacAreaId="68">
+            <include layout="@layout/adjustable_temperature_view_dock"/>
+        </com.android.systemui.car.hvac.TemperatureControlView>
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"/>
+
+        <com.android.systemui.car.systembar.VolumeButton
+            android:id="@+id/volume"
+            android:contentDescription="@string/system_bar_home_label"
+            style="@style/SystemBarButtonWithDock"
+            systemui:icon="@drawable/car_ic_volume" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/lock_screen_nav_buttons"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:layoutDirection="ltr"
+        android:paddingEnd="@dimen/car_keyline_1"
+        android:paddingStart="@dimen/car_keyline_1"
+        android:visibility="gone"/>
+
+    <LinearLayout
+        android:id="@+id/occlusion_buttons"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:layoutDirection="ltr"
+        android:paddingEnd="@dimen/car_keyline_1"
+        android:paddingStart="@dimen/car_keyline_1"
+        android:visibility="gone">
+        <com.android.systemui.car.systembar.CarSystemBarButton
+            android:id="@+id/home"
+            android:contentDescription="@string/system_bar_home_label"
+            style="@style/SystemBarButtonWithDock"
+            systemui:componentNames="com.android.car.carlauncher/.CarLauncher"
+            systemui:highlightWhenSelected="true"
+            systemui:icon="@drawable/car_ic_home"
+            systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;launchFlags=0x14000000;end"/>
+    </LinearLayout>
+</com.android.systemui.car.systembar.CarSystemBarView>
diff --git a/res/layout/car_fullscreen_user_switcher.xml b/res/layout/car_fullscreen_user_switcher.xml
index 1a74f6c3..0ff2e124 100644
--- a/res/layout/car_fullscreen_user_switcher.xml
+++ b/res/layout/car_fullscreen_user_switcher.xml
@@ -14,33 +14,26 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.car.ui.FocusArea
+<com.android.systemui.car.userswitcher.UserSwitcherContainer
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/user_switcher_focus_area"
+    android:id="@+id/user_switcher_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:gravity="center">
-    <com.android.systemui.car.userswitcher.UserSwitcherContainer
-        android:id="@+id/user_switcher_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/car_user_switcher_background_color"
-        android:orientation="vertical">
+    android:background="@color/car_user_switcher_background_color"
+    android:orientation="vertical">
 
-        <include
-            layout="@layout/car_status_bar_header"
-            android:layout_alignParentTop="true"
-            android:theme="@android:style/Theme"/>
+    <include
+        layout="@layout/car_status_bar_header"
+        android:layout_alignParentTop="true"/>
 
-        <FrameLayout
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <com.android.systemui.car.userswitcher.UserGridRecyclerView
+            android:id="@+id/user_grid"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
-            <com.android.systemui.car.userswitcher.UserGridRecyclerView
-                android:id="@+id/user_grid"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginTop="@dimen/car_user_switcher_margin_top"/>
-        </FrameLayout>
-    </com.android.systemui.car.userswitcher.UserSwitcherContainer>
-</com.android.car.ui.FocusArea>
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginTop="@dimen/car_user_switcher_margin_top"/>
+    </FrameLayout>
+</com.android.systemui.car.userswitcher.UserSwitcherContainer>
diff --git a/res/layout/car_fullscreen_user_switcher_wrapper.xml b/res/layout/car_fullscreen_user_switcher_wrapper.xml
new file mode 100644
index 00000000..ca803cdb
--- /dev/null
+++ b/res/layout/car_fullscreen_user_switcher_wrapper.xml
@@ -0,0 +1,24 @@
+<!--
+  ~ Copyright (C) 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<com.android.car.ui.FocusArea
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/user_switcher_focus_area"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center">
+    <include layout="@layout/car_fullscreen_user_switcher"/>
+</com.android.car.ui.FocusArea>
diff --git a/res/layout/car_left_system_bar.xml b/res/layout/car_left_system_bar.xml
index 21be0e9f..142363bb 100644
--- a/res/layout/car_left_system_bar.xml
+++ b/res/layout/car_left_system_bar.xml
@@ -16,95 +16,14 @@
 ** limitations under the License.
 */
 -->
-
-<com.android.systemui.car.systembar.CarSystemBarView
+<com.android.systemui.car.displaycompat.CarDisplayCompatSystemBarView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:systemui="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     android:orientation="vertical"
-    android:background="@drawable/system_bar_background">
-
-    <LinearLayout
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        android:id="@+id/nav_buttons"
-        android:orientation="vertical"
-        android:gravity="top"
-        android:paddingTop="30dp"
-        android:layout_weight="1"
-        android:animateLayoutChanges="true">
-
-        <com.android.systemui.car.systembar.CarSystemBarButton
-            android:id="@+id/home"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:src="@drawable/car_ic_overview"
-            android:background="?android:attr/selectableItemBackground"
-            android:paddingTop="30dp"
-            android:paddingBottom="30dp"
-            android:contentDescription="@string/system_bar_home_label"
-            systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;launchFlags=0x14000000;end"/>
-
-        <com.android.systemui.car.systembar.CarSystemBarButton
-            android:id="@+id/grid"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:src="@drawable/car_ic_apps"
-            android:background="?android:attr/selectableItemBackground"
-            android:paddingTop="30dp"
-            android:paddingBottom="30dp"
-            android:contentDescription="@string/system_bar_applications_label"
-            systemui:intent="intent:#Intent;component=com.android.car.home/.AppGridActivity;end"
-            systemui:longIntent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;launchFlags=0x14000000;end"/>
-
-        <com.android.systemui.car.systembar.HvacButton
-            android:id="@+id/hvac"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:src="@drawable/car_ic_hvac"
-            android:background="?android:attr/selectableItemBackground"
-            android:paddingTop="30dp"
-            android:paddingBottom="30dp"
-            android:contentDescription="@string/system_bar_climate_control_label"
-            systemui:broadcast="true"/>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:gravity="bottom"
-        android:orientation="vertical">
-
-        <com.android.systemui.statusbar.AlphaOptimizedImageView
-            android:id="@+id/note"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:src="@drawable/car_ic_notification"
-            android:background="?android:attr/selectableItemBackground"
-            android:paddingTop="20dp"
-            android:paddingBottom="20dp"
-            android:alpha="0.7"
-            android:contentDescription="@string/system_bar_notifications_label"/>
-
-
-        <com.android.systemui.statusbar.policy.Clock
-            android:id="@+id/clock"
-            android:textAppearance="@style/TextAppearance.StatusBar.Clock"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:singleLine="true"
-            android:paddingStart="@dimen/status_bar_clock_starting_padding"
-            android:paddingEnd="@dimen/status_bar_clock_end_padding"
-            android:gravity="center_horizontal"
-            android:paddingBottom="20dp"/>
-
-        <Space
-            android:layout_height="10dp"
-            android:layout_width="match_parent"/>
-
-    </LinearLayout>
+    app:default_layout="@layout/car_left_system_bar_default"
+    app:displaycompat_layout="@layout/displaycompat_toolbar"
+    app:displaycompat_side="left">
 
-</com.android.systemui.car.systembar.CarSystemBarView>
+</com.android.systemui.car.displaycompat.CarDisplayCompatSystemBarView>
diff --git a/res/layout/car_left_system_bar_default.xml b/res/layout/car_left_system_bar_default.xml
new file mode 100644
index 00000000..3b516af5
--- /dev/null
+++ b/res/layout/car_left_system_bar_default.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:systemui="http://schemas.android.com/apk/res-auto"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:orientation="vertical"
+    android:background="@drawable/system_bar_background">
+
+    <LinearLayout
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        android:id="@+id/nav_buttons"
+        android:orientation="vertical"
+        android:gravity="top"
+        android:paddingTop="30dp"
+        android:layout_weight="1"
+        android:animateLayoutChanges="true">
+
+        <com.android.systemui.car.systembar.CarSystemBarButton
+            android:id="@+id/home"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:src="@drawable/car_ic_overview"
+            android:background="?android:attr/selectableItemBackground"
+            android:paddingTop="30dp"
+            android:paddingBottom="30dp"
+            android:contentDescription="@string/system_bar_home_label"
+            systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;launchFlags=0x14000000;end"/>
+
+        <com.android.systemui.car.systembar.CarSystemBarButton
+            android:id="@+id/grid"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:src="@drawable/car_ic_apps"
+            android:background="?android:attr/selectableItemBackground"
+            android:paddingTop="30dp"
+            android:paddingBottom="30dp"
+            android:contentDescription="@string/system_bar_applications_label"
+            systemui:intent="intent:#Intent;component=com.android.car.home/.AppGridActivity;end"
+            systemui:longIntent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;launchFlags=0x14000000;end"/>
+
+        <com.android.systemui.car.systembar.CarSystemBarButton
+            android:id="@+id/hvac"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:src="@drawable/car_ic_hvac"
+            android:background="?android:attr/selectableItemBackground"
+            android:paddingTop="30dp"
+            android:paddingBottom="30dp"
+            android:contentDescription="@string/system_bar_climate_control_label"
+            systemui:broadcast="true"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:gravity="bottom"
+        android:orientation="vertical">
+
+        <com.android.systemui.statusbar.AlphaOptimizedImageView
+            android:id="@+id/note"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:src="@drawable/car_ic_notification"
+            android:background="?android:attr/selectableItemBackground"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp"
+            android:alpha="0.7"
+            android:contentDescription="@string/system_bar_notifications_label"/>
+
+
+        <com.android.systemui.statusbar.policy.Clock
+            android:id="@+id/clock"
+            android:textAppearance="@style/TextAppearance.StatusBar.Clock"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:singleLine="true"
+            android:paddingStart="@dimen/status_bar_clock_starting_padding"
+            android:paddingEnd="@dimen/status_bar_clock_end_padding"
+            android:gravity="center_horizontal"
+            android:paddingBottom="20dp"/>
+
+        <Space
+            android:layout_height="10dp"
+            android:layout_width="match_parent"/>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/car_left_system_bar_unprovisioned.xml b/res/layout/car_left_system_bar_unprovisioned.xml
index 38039f24..230c1738 100644
--- a/res/layout/car_left_system_bar_unprovisioned.xml
+++ b/res/layout/car_left_system_bar_unprovisioned.xml
@@ -46,7 +46,7 @@
             android:contentDescription="@string/system_bar_home_label"
             systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;launchFlags=0x14000000;end"/>
 
-        <com.android.systemui.car.systembar.HvacButton
+        <com.android.systemui.car.systembar.CarSystemBarButton
             android:id="@+id/hvac"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
diff --git a/res/layout/car_right_system_bar.xml b/res/layout/car_right_system_bar.xml
index 701e7a33..c3270079 100644
--- a/res/layout/car_right_system_bar.xml
+++ b/res/layout/car_right_system_bar.xml
@@ -16,98 +16,14 @@
 ** limitations under the License.
 */
 -->
-
-<com.android.systemui.car.systembar.CarSystemBarView
+<com.android.systemui.car.displaycompat.CarDisplayCompatSystemBarView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:systemui="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     android:orientation="vertical"
-    android:background="@drawable/system_bar_background">
-
-    <!-- phone.SystemBarView has rot0 and rot90 but we expect the car head unit to have a fixed
-         rotation so skip this level of the hierarchy.
-    -->
-    <LinearLayout
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        android:id="@+id/nav_buttons"
-        android:orientation="vertical"
-        android:gravity="top"
-        android:paddingTop="30dp"
-        android:layout_weight="1"
-        android:animateLayoutChanges="true">
-
-        <com.android.systemui.car.systembar.CarSystemBarButton
-            android:id="@+id/home"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:src="@drawable/car_ic_overview"
-            android:background="?android:attr/selectableItemBackground"
-            android:paddingTop="30dp"
-            android:paddingBottom="30dp"
-            android:contentDescription="@string/system_bar_home_label"
-            systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;launchFlags=0x14000000;end"/>
-
-        <com.android.systemui.car.systembar.CarSystemBarButton
-            android:id="@+id/grid"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:src="@drawable/car_ic_apps"
-            android:background="?android:attr/selectableItemBackground"
-            android:paddingTop="30dp"
-            android:paddingBottom="30dp"
-            android:contentDescription="@string/system_bar_applications_label"
-            systemui:intent="intent:#Intent;component=com.android.car.home/.AppGridActivity;launchFlags=0x14000000;end"
-            systemui:longIntent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;launchFlags=0x14000000;end"/>
-
-        <com.android.systemui.car.systembar.HvacButton
-            android:id="@+id/hvac"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:src="@drawable/car_ic_hvac"
-            android:background="?android:attr/selectableItemBackground"
-            android:paddingTop="30dp"
-            android:paddingBottom="30dp"
-            android:contentDescription="@string/system_bar_climate_control_label"
-            systemui:broadcast="true"/>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:gravity="bottom"
-        android:orientation="vertical">
-
-        <com.android.systemui.statusbar.AlphaOptimizedImageView
-            android:id="@+id/note"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:src="@drawable/car_ic_notification"
-            android:background="?android:attr/selectableItemBackground"
-            android:paddingTop="20dp"
-            android:paddingBottom="20dp"
-            android:alpha="0.7"
-            android:contentDescription="@string/system_bar_notifications_label"/>
-
-
-        <com.android.systemui.statusbar.policy.Clock
-            android:id="@+id/clock"
-            android:textAppearance="@style/TextAppearance.StatusBar.Clock"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:singleLine="true"
-            android:paddingStart="@dimen/status_bar_clock_starting_padding"
-            android:paddingEnd="@dimen/status_bar_clock_end_padding"
-            android:gravity="center_horizontal"
-            android:paddingBottom="20dp"/>
-
-        <Space
-            android:layout_height="10dp"
-            android:layout_width="match_parent"/>
-
-    </LinearLayout>
+    app:default_layout="@layout/car_right_system_bar_default"
+    app:displaycompat_layout="@layout/displaycompat_toolbar"
+    app:displaycompat_side="right">
 
-</com.android.systemui.car.systembar.CarSystemBarView>
+</com.android.systemui.car.displaycompat.CarDisplayCompatSystemBarView>
diff --git a/res/layout/car_right_system_bar_default.xml b/res/layout/car_right_system_bar_default.xml
new file mode 100644
index 00000000..c3cbb47d
--- /dev/null
+++ b/res/layout/car_right_system_bar_default.xml
@@ -0,0 +1,111 @@
+<!--
+  ~ Copyright (C) 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:systemui="http://schemas.android.com/apk/res-auto"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:orientation="vertical"
+    android:background="@drawable/system_bar_background">
+
+    <!-- phone.SystemBarView has rot0 and rot90 but we expect the car head unit to have a fixed
+         rotation so skip this level of the hierarchy.
+    -->
+    <LinearLayout
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        android:id="@+id/nav_buttons"
+        android:orientation="vertical"
+        android:gravity="top"
+        android:paddingTop="30dp"
+        android:layout_weight="1"
+        android:animateLayoutChanges="true">
+
+        <com.android.systemui.car.systembar.CarSystemBarButton
+            android:id="@+id/home"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:src="@drawable/car_ic_overview"
+            android:background="?android:attr/selectableItemBackground"
+            android:paddingTop="30dp"
+            android:paddingBottom="30dp"
+            android:contentDescription="@string/system_bar_home_label"
+            systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;launchFlags=0x14000000;end"/>
+
+        <com.android.systemui.car.systembar.CarSystemBarButton
+            android:id="@+id/grid"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:src="@drawable/car_ic_apps"
+            android:background="?android:attr/selectableItemBackground"
+            android:paddingTop="30dp"
+            android:paddingBottom="30dp"
+            android:contentDescription="@string/system_bar_applications_label"
+            systemui:intent="intent:#Intent;component=com.android.car.home/.AppGridActivity;launchFlags=0x14000000;end"
+            systemui:longIntent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;launchFlags=0x14000000;end"/>
+
+        <com.android.systemui.car.systembar.CarSystemBarButton
+            android:id="@+id/hvac"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:src="@drawable/car_ic_hvac"
+            android:background="?android:attr/selectableItemBackground"
+            android:paddingTop="30dp"
+            android:paddingBottom="30dp"
+            android:contentDescription="@string/system_bar_climate_control_label"
+            systemui:broadcast="true"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:gravity="bottom"
+        android:orientation="vertical">
+
+        <com.android.systemui.statusbar.AlphaOptimizedImageView
+            android:id="@+id/note"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:src="@drawable/car_ic_notification"
+            android:background="?android:attr/selectableItemBackground"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp"
+            android:alpha="0.7"
+            android:contentDescription="@string/system_bar_notifications_label"/>
+
+
+        <com.android.systemui.statusbar.policy.Clock
+            android:id="@+id/clock"
+            android:textAppearance="@style/TextAppearance.StatusBar.Clock"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:singleLine="true"
+            android:paddingStart="@dimen/status_bar_clock_starting_padding"
+            android:paddingEnd="@dimen/status_bar_clock_end_padding"
+            android:gravity="center_horizontal"
+            android:paddingBottom="20dp"/>
+
+        <Space
+            android:layout_height="10dp"
+            android:layout_width="match_parent"/>
+
+    </LinearLayout>
+
+</LinearLayout>
+\ No newline at end of file
diff --git a/res/layout/car_right_system_bar_unprovisioned.xml b/res/layout/car_right_system_bar_unprovisioned.xml
index 38039f24..230c1738 100644
--- a/res/layout/car_right_system_bar_unprovisioned.xml
+++ b/res/layout/car_right_system_bar_unprovisioned.xml
@@ -46,7 +46,7 @@
             android:contentDescription="@string/system_bar_home_label"
             systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;launchFlags=0x14000000;end"/>
 
-        <com.android.systemui.car.systembar.HvacButton
+        <com.android.systemui.car.systembar.CarSystemBarButton
             android:id="@+id/hvac"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
diff --git a/res/layout/car_top_system_bar.xml b/res/layout/car_top_system_bar.xml
index 62002c05..13f66583 100644
--- a/res/layout/car_top_system_bar.xml
+++ b/res/layout/car_top_system_bar.xml
@@ -42,8 +42,8 @@
             android:id="@+id/clock_container"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:paddingStart="@dimen/car_padding_2"
-            android:paddingEnd="@dimen/car_padding_2"
+            android:paddingStart="@dimen/car_padding_4"
+            android:paddingEnd="@dimen/car_padding_4"
             android:layout_centerInParent="true">
             <com.android.systemui.statusbar.policy.Clock
                 android:id="@+id/clock"
@@ -85,16 +85,14 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true"
-            android:layout_marginTop="@dimen/car_padding_2"
-        >
+            android:layout_centerVertical="true">
             <com.android.systemui.car.systembar.CarSystemBarButton
                 android:id="@+id/user_name"
                 android:layout_width="wrap_content"
-                android:layout_height="match_parent"
+                android:layout_height="@dimen/car_system_bar_user_name_button_height"
                 android:layout_marginEnd="@dimen/car_padding_2"
                 android:background="@drawable/status_icon_background"
-                android:gravity="center_vertical">
+                android:layout_gravity="center_vertical">
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
diff --git a/res/layout/car_top_system_bar_dock.xml b/res/layout/car_top_system_bar_dock.xml
new file mode 100644
index 00000000..9bf61d93
--- /dev/null
+++ b/res/layout/car_top_system_bar_dock.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<!-- todo(b/304320644): update layout/car_top_system_bar -->
+<com.android.systemui.car.systembar.CarSystemBarView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:systemui="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/car_top_bar"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/system_bar_background"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layoutDirection="ltr">
+
+        <LinearLayout
+            android:id="@+id/qc_entry_points_container"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_centerVertical="true"
+            android:layout_alignParentStart="true"
+            />
+
+        <FrameLayout
+            android:id="@+id/clock_container"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingStart="@dimen/car_padding_2"
+            android:paddingEnd="@dimen/car_padding_2"
+            android:layout_centerInParent="true">
+            <com.android.systemui.statusbar.policy.Clock
+                android:id="@+id/clock"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:elevation="5dp"
+                android:singleLine="true"
+                android:textAppearance="@style/TextAppearance.SystemBar.Clock"
+                systemui:amPmStyle="gone"
+                />
+        </FrameLayout>
+
+        <LinearLayout
+            android:id="@+id/read_only_icons_container"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_centerVertical="true"
+            android:layout_toRightOf="@id/clock_container"
+            />
+
+        <com.android.systemui.car.systembar.CarSystemBarButton
+            android:id="@+id/notifications"
+            android:contentDescription="@string/system_bar_notifications_label"
+            android:layout_width="@dimen/car_quick_controls_entry_points_button_width"
+            android:layout_height="match_parent"
+            style="@style/TopBarButton"
+            android:layout_toLeftOf="@id/camera_privacy_chip"
+            systemui:longIntent="intent:#Intent;action=com.android.car.bugreport.action.START_AUDIO_FIRST;component=com.android.car.bugreport/.BugReportActivity;end">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal"
+                android:gravity="center">
+                <ImageView
+                    android:id="@+id/notification_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:src="@drawable/car_ic_notification_dock"
+                    android:tint="@color/system_bar_icon_color_with_selection" />
+            </LinearLayout>
+        </com.android.systemui.car.systembar.CarSystemBarButton>
+
+        <include layout="@layout/camera_privacy_chip_dock"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_centerVertical="true"
+            android:layout_toLeftOf="@id/mic_privacy_chip" />
+
+        <include layout="@layout/mic_privacy_chip_dock"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_centerVertical="true"
+            android:layout_toLeftOf="@id/user_name_container"
+            android:contentDescription="@string/system_bar_mic_privacy_chip" />
+
+        <FrameLayout
+            android:id="@+id/user_name_container"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true">
+            <com.android.systemui.car.systembar.CarSystemBarButton
+                android:id="@+id/user_name"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                style="@style/TopBarButton"
+                android:gravity="center">
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="horizontal"
+                    android:layout_marginStart="@dimen/car_padding_2"
+                    android:layout_marginEnd="@dimen/car_padding_2"
+                    android:gravity="center_vertical">
+                    <ImageView
+                        android:id="@+id/user_avatar"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:src="@drawable/car_ic_users_icon"
+                        android:tint="@color/system_bar_icon_color_with_selection"
+                        android:layout_marginEnd="@dimen/system_bar_user_icon_padding"
+                        android:contentDescription="@string/system_bar_user_avatar" />
+                    <TextView
+                        android:id="@+id/user_name_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:gravity="center_vertical"
+                        android:textAppearance="@style/TextAppearance.SystemBar.Username"
+                        android:singleLine="true"
+                        android:maxWidth="@dimen/car_system_bar_user_name_max_width"
+                        android:layout_marginEnd="@dimen/system_bar_user_icon_padding"
+                        android:contentDescription="@string/system_bar_user_name_text" />
+                </LinearLayout>
+            </com.android.systemui.car.systembar.CarSystemBarButton>
+        </FrameLayout>
+    </RelativeLayout>
+</com.android.systemui.car.systembar.CarSystemBarView>
diff --git a/res/layout/displaycompat_toolbar.xml b/res/layout/displaycompat_toolbar.xml
new file mode 100644
index 00000000..c50e3134
--- /dev/null
+++ b/res/layout/displaycompat_toolbar.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/action_bar"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:padding="8dp"
+    android:background="#2D4874"
+    android:visibility="gone">
+
+    <ImageButton
+        android:id="@+id/back_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/displaycompat_arrow_back_32"
+        android:background="@drawable/displaycompat_round_bg"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:contentDescription="@string/back_btn" />
+
+    <LinearLayout
+        android:id="@+id/optional_actions"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:orientation="vertical">
+
+        <ImageButton
+            android:id="@+id/fullscreen_btn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/displaycompat_fullscreen_32"
+            android:background="@drawable/displaycompat_round_bg"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:contentDescription="@string/fullscreen" />
+
+    </LinearLayout>
+
+</RelativeLayout>
diff --git a/res/layout/hvac_panel.xml b/res/layout/hvac_panel.xml
index 16b1fd3a..9b330ab8 100644
--- a/res/layout/hvac_panel.xml
+++ b/res/layout/hvac_panel.xml
@@ -22,7 +22,7 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="@dimen/hvac_panel_full_expanded_height"
-    android:background="@color/hvac_background_color">
+    android:background="@drawable/hvac_background">
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/top_guideline"
         android:layout_width="wrap_content"
@@ -57,7 +57,7 @@
         app:layout_constraintRight_toLeftOf="@+id/fan_control"
         systemui:hvacAreaId="117"
         systemui:hvacPropertyId="354419976"
-        systemui:hvacTurnOffIfAutoOn="true"
+        systemui:hvacDisableViewIfAutoOn="true"
         systemui:hvacToggleOnButtonDrawable="@drawable/ic_recycle_air_on"
         systemui:hvacToggleOffButtonDrawable="@drawable/ic_recycle_air_off"/>
     <LinearLayout
@@ -92,7 +92,7 @@
         app:layout_constraintRight_toLeftOf="@+id/passenger_hvac"
         systemui:hvacAreaId="117"
         systemui:hvacPropertyId="354419973"
-        systemui:hvacTurnOffIfAutoOn="true"
+        systemui:hvacDisableViewIfAutoOn="true"
         systemui:hvacToggleOnButtonDrawable="@drawable/ic_ac_on"
         systemui:hvacToggleOffButtonDrawable="@drawable/ic_ac_off"/>
     <com.android.systemui.car.hvac.referenceui.BackgroundAdjustingTemperatureControlView
@@ -105,32 +105,35 @@
         systemui:hvacAreaId="68">
         <include layout="@layout/hvac_temperature_bar_overlay"/>
     </com.android.systemui.car.hvac.referenceui.BackgroundAdjustingTemperatureControlView>
+    <com.android.systemui.car.hvac.SeatTemperatureLevelButton
+        android:id="@+id/seat_heat_level_button_left"
+        android:background="@drawable/hvac_panel_button_bg"
+        style="@style/HvacButton"
+        app:layout_constraintLeft_toRightOf="@+id/driver_hvac"
+        app:layout_constraintRight_toLeftOf="@+id/fan_control"
+        app:layout_constraintBottom_toBottomOf="@+id/bottom_guideline"
+        systemui:hvacAreaId="1"
+        systemui:seatTemperatureType="heating"
+        systemui:seatTemperatureIconDrawableList="@array/hvac_heated_seat_default_icons"/>
     <com.android.systemui.car.hvac.toggle.HvacBooleanToggleButton
         android:id="@+id/ac_master_switch"
         android:background="@drawable/hvac_panel_button_bg"
         android:scaleType="center"
         style="@style/HvacButton"
-        app:layout_constraintLeft_toRightOf="@+id/driver_hvac"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintLeft_toRightOf="@+id/seat_heat_level_button_left"
+        app:layout_constraintRight_toLeftOf="@+id/defroster_button"
         app:layout_constraintBottom_toBottomOf="@+id/bottom_guideline"
         systemui:hvacAreaId="117"
         systemui:hvacPropertyId="354419984"
-        systemui:hvacTurnOffIfPowerOff="false"
         systemui:hvacToggleOnButtonDrawable="@drawable/ac_master_switch_on"
         systemui:hvacToggleOffButtonDrawable="@drawable/ac_master_switch_off"/>
-    <com.android.systemui.car.hvac.SeatTemperatureLevelButton
-        android:id="@+id/seat_heat_level_button_left"
-        android:background="@drawable/hvac_panel_button_bg"
-        style="@style/HvacButton"
-        app:layout_constraintLeft_toRightOf="@+id/ac_master_switch"
-        app:layout_constraintBottom_toBottomOf="@+id/bottom_guideline"
-        systemui:hvacAreaId="1"
-        systemui:seatTemperatureType="heating"
-        systemui:seatTemperatureIconDrawableList="@array/hvac_heated_seat_default_icons"/>
     <com.android.systemui.car.hvac.toggle.HvacBooleanToggleButton
         android:id="@+id/defroster_button"
         android:background="@drawable/hvac_panel_button_bg"
         style="@style/HvacButton"
-        app:layout_constraintLeft_toRightOf="@+id/seat_heat_level_button_left"
+        app:layout_constraintLeft_toRightOf="@+id/ac_master_switch"
+        app:layout_constraintRight_toLeftOf="@+id/auto_button"
         app:layout_constraintBottom_toBottomOf="@+id/bottom_guideline"
         systemui:hvacAreaId="1"
         systemui:hvacPropertyId="320865540"
@@ -143,7 +146,6 @@
         systemui:hvacPropertyId="354419978"
         android:scaleType="center"
         android:layout_gravity="center"
-        android:layout_width="0dp"
         style="@style/HvacButton"
         app:layout_constraintLeft_toRightOf="@+id/defroster_button"
         app:layout_constraintRight_toLeftOf="@+id/rear_defroster_button"
@@ -156,6 +158,7 @@
         style="@style/HvacButton"
         systemui:hvacAreaId="2"
         systemui:hvacPropertyId="320865540"
+        app:layout_constraintLeft_toRightOf="@+id/auto_button"
         app:layout_constraintRight_toLeftOf="@+id/seat_heat_level_button_right"
         app:layout_constraintBottom_toBottomOf="@+id/bottom_guideline"
         systemui:hvacToggleOnButtonDrawable="@drawable/ic_rear_defroster_on"
@@ -165,6 +168,7 @@
         android:background="@drawable/hvac_panel_button_bg"
         style="@style/HvacButton"
         app:layout_constraintRight_toLeftOf="@+id/passenger_hvac"
+        app:layout_constraintLeft_toRightOf="@+id/fan_control"
         app:layout_constraintBottom_toBottomOf="@+id/bottom_guideline"
         systemui:hvacAreaId="4"
         systemui:seatTemperatureType="heating"
diff --git a/res/layout/mic_privacy_chip.xml b/res/layout/mic_privacy_chip.xml
index 5ed65619..f46cc901 100644
--- a/res/layout/mic_privacy_chip.xml
+++ b/res/layout/mic_privacy_chip.xml
@@ -22,8 +22,7 @@
     android:layout_width="@dimen/privacy_chip_width"
     android:layout_height="match_parent"
     android:visibility="gone"
-    android:paddingTop="@dimen/car_padding_1"
-    android:paddingBottom="@dimen/car_padding_1"
+    android:paddingVertical="@dimen/privacy_chip_vertical_padding"
     android:paddingEnd="@dimen/privacy_chip_horizontal_padding"
     android:focusable="false"
     app:layoutDescription="@xml/mic_privacy_chip_scene">
diff --git a/res/layout/mic_privacy_chip_dock.xml b/res/layout/mic_privacy_chip_dock.xml
new file mode 100644
index 00000000..56b60de1
--- /dev/null
+++ b/res/layout/mic_privacy_chip_dock.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<!-- todo(b/304320644): update layout/mic_privacy_chip -->
+<com.android.systemui.car.privacy.MicPrivacyChip
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/mic_privacy_chip"
+    android:layout_width="@dimen/privacy_chip_width"
+    android:layout_height="match_parent"
+    android:visibility="gone"
+    android:focusable="false"
+    style="@style/PrivacyChipPadding"
+    app:layoutDescription="@xml/mic_privacy_chip_scene">
+
+    <include layout="@layout/privacy_chip_content" />
+
+</com.android.systemui.car.privacy.MicPrivacyChip>
+\ No newline at end of file
diff --git a/res/layout/pin_pad_view.xml b/res/layout/pin_pad_view.xml
new file mode 100644
index 00000000..52cb7603
--- /dev/null
+++ b/res/layout/pin_pad_view.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT 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 file is copied from packages/apps/Car/Settings/res/layout/pin_pad_view.xml -->
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Row 1 -->
+    <Button
+        android:id="@+id/key1"
+        style="@style/PinPadKey"
+        android:layout_width="@dimen/pin_pad_key_width"
+        android:layout_height="@dimen/pin_pad_key_height"
+        android:layout_margin="@dimen/pin_pad_key_margin"
+        android:tag="1"
+        android:text="@string/one"/>
+    <Button
+        android:id="@+id/key2"
+        style="@style/PinPadKey"
+        android:layout_width="@dimen/pin_pad_key_width"
+        android:layout_height="@dimen/pin_pad_key_height"
+        android:layout_margin="@dimen/pin_pad_key_margin"
+        android:tag="2"
+        android:text="@string/two"/>
+    <Button
+        android:id="@+id/key3"
+        style="@style/PinPadKey"
+        android:layout_width="@dimen/pin_pad_key_width"
+        android:layout_height="@dimen/pin_pad_key_height"
+        android:layout_margin="@dimen/pin_pad_key_margin"
+        android:tag="3"
+        android:text="@string/three"/>
+    <!-- Row 2 -->
+    <Button
+        android:id="@+id/key4"
+        style="@style/PinPadKey"
+        android:layout_width="@dimen/pin_pad_key_width"
+        android:layout_height="@dimen/pin_pad_key_height"
+        android:layout_margin="@dimen/pin_pad_key_margin"
+        android:tag="4"
+        android:text="@string/four"/>
+    <Button
+        android:id="@+id/key5"
+        style="@style/PinPadKey"
+        android:layout_width="@dimen/pin_pad_key_width"
+        android:layout_height="@dimen/pin_pad_key_height"
+        android:layout_margin="@dimen/pin_pad_key_margin"
+        android:tag="5"
+        android:text="@string/five"/>
+    <Button
+        android:id="@+id/key6"
+        style="@style/PinPadKey"
+        android:layout_width="@dimen/pin_pad_key_width"
+        android:layout_height="@dimen/pin_pad_key_height"
+        android:layout_margin="@dimen/pin_pad_key_margin"
+        android:tag="6"
+        android:text="@string/six"/>
+    <!-- Row 3 -->
+    <Button
+        android:id="@+id/key7"
+        style="@style/PinPadKey"
+        android:layout_width="@dimen/pin_pad_key_width"
+        android:layout_height="@dimen/pin_pad_key_height"
+        android:layout_margin="@dimen/pin_pad_key_margin"
+        android:tag="7"
+        android:text="@string/seven"/>
+    <Button
+        android:id="@+id/key8"
+        style="@style/PinPadKey"
+        android:layout_width="@dimen/pin_pad_key_width"
+        android:layout_height="@dimen/pin_pad_key_height"
+        android:layout_margin="@dimen/pin_pad_key_margin"
+        android:tag="8"
+        android:text="@string/eight"/>
+    <Button
+        android:id="@+id/key9"
+        style="@style/PinPadKey"
+        android:layout_width="@dimen/pin_pad_key_width"
+        android:layout_height="@dimen/pin_pad_key_height"
+        android:layout_margin="@dimen/pin_pad_key_margin"
+        android:tag="9"
+        android:text="@string/nine"/>
+    <!-- Row 4 -->
+    <ImageButton
+        android:id="@+id/key_backspace"
+        style="@style/PinPadKey"
+        android:layout_width="@dimen/pin_pad_key_width"
+        android:layout_height="@dimen/pin_pad_key_height"
+        android:layout_margin="@dimen/pin_pad_key_margin"
+        android:contentDescription="@string/backspace_key"
+        android:src="@drawable/ic_backspace"/>
+    <Button
+        android:id="@+id/key0"
+        style="@style/PinPadKey"
+        android:layout_width="@dimen/pin_pad_key_width"
+        android:layout_height="@dimen/pin_pad_key_height"
+        android:layout_margin="@dimen/pin_pad_key_margin"
+        android:tag="0"
+        android:text="@string/zero"/>
+    <ImageButton
+        android:id="@+id/key_enter"
+        style="@style/PinPadKey"
+        android:layout_width="@dimen/pin_pad_key_width"
+        android:layout_height="@dimen/pin_pad_key_height"
+        android:layout_margin="@dimen/pin_pad_key_margin"
+        android:contentDescription="@string/enter_key"
+        android:src="@drawable/ic_check"/>
+</merge>
diff --git a/res/layout/qc_bluetooth_panel.xml b/res/layout/qc_bluetooth_panel.xml
index 126baee6..3f28eaaf 100644
--- a/res/layout/qc_bluetooth_panel.xml
+++ b/res/layout/qc_bluetooth_panel.xml
@@ -18,6 +18,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layoutDirection="locale"
     android:background="@color/status_icon_panel_bg_color">
     <com.android.car.ui.FocusParkingView
         android:layout_width="wrap_content"
@@ -33,6 +34,7 @@
             <ScrollView
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
+                android:layout_marginBottom="@dimen/car_quick_controls_footer_button_margin_top"
                 app:layout_constraintHeight_default="wrap"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/res/layout/qc_camera_panel.xml b/res/layout/qc_camera_panel.xml
index 9bb968f7..bc075b5f 100644
--- a/res/layout/qc_camera_panel.xml
+++ b/res/layout/qc_camera_panel.xml
@@ -18,6 +18,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layoutDirection="locale"
     android:background="@color/status_icon_panel_bg_color">
     <com.android.car.ui.FocusParkingView
         android:layout_width="wrap_content"
@@ -33,7 +34,7 @@
             <ScrollView
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:paddingTop="16dp"
+                android:layout_marginBottom="@dimen/car_quick_controls_footer_button_margin_top"
                 app:layout_constraintHeight_default="wrap"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/res/layout/qc_connectivity_panel.xml b/res/layout/qc_connectivity_panel.xml
index 51783a88..351c55af 100644
--- a/res/layout/qc_connectivity_panel.xml
+++ b/res/layout/qc_connectivity_panel.xml
@@ -18,6 +18,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layoutDirection="locale"
     android:background="@color/status_icon_panel_bg_color">
     <com.android.car.ui.FocusParkingView
         android:layout_width="wrap_content"
@@ -33,7 +34,7 @@
             <ScrollView
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:paddingTop="16dp"
+                android:layout_marginBottom="@dimen/car_quick_controls_footer_button_margin_top"
                 app:layout_constraintHeight_default="wrap"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/res/layout/qc_display_panel.xml b/res/layout/qc_display_panel.xml
index 8dc78ec7..f0647b89 100644
--- a/res/layout/qc_display_panel.xml
+++ b/res/layout/qc_display_panel.xml
@@ -18,6 +18,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layoutDirection="locale"
     android:background="@color/status_icon_panel_bg_color">
     <com.android.car.ui.FocusParkingView
         android:layout_width="wrap_content"
@@ -33,7 +34,7 @@
             <ScrollView
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:paddingTop="16dp"
+                android:layout_marginBottom="@dimen/car_quick_controls_footer_button_margin_top"
                 app:layout_constraintHeight_default="wrap"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -53,6 +54,16 @@
                         android:layout_height="wrap_content"
                         android:gravity="center"
                         app:remoteQCProvider="content://com.android.car.settings.qc/adaptive_brightness_switch"/>
+                    <com.android.systemui.car.qc.SystemUIQCView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        app:remoteQCProvider="content://com.android.car.settings.qc/theme_toggle"/>
+                    <com.android.systemui.car.qc.SystemUIQCView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        app:remoteQCProvider="content://com.android.car.carlauncher.calmmode/calm_mode"/>
                 </LinearLayout>
             </ScrollView>
             <com.android.systemui.car.qc.QCFooterButton
diff --git a/res/layout/qc_drive_mode_panel.xml b/res/layout/qc_drive_mode_panel.xml
index 50c753ee..2d214c2d 100644
--- a/res/layout/qc_drive_mode_panel.xml
+++ b/res/layout/qc_drive_mode_panel.xml
@@ -34,6 +34,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layoutDirection="locale"
     android:background="@color/status_icon_panel_bg_color">
     <com.android.car.ui.FocusParkingView
         android:layout_width="wrap_content"
diff --git a/res/layout/qc_mic_panel.xml b/res/layout/qc_mic_panel.xml
index d4f9abd1..bccb65d7 100644
--- a/res/layout/qc_mic_panel.xml
+++ b/res/layout/qc_mic_panel.xml
@@ -19,6 +19,7 @@
     android:id="@+id/mic_privacy_panel"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layoutDirection="locale"
     android:background="@color/status_icon_panel_bg_color">
     <com.android.car.ui.FocusParkingView
         android:layout_width="wrap_content"
@@ -34,7 +35,7 @@
             <ScrollView
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:paddingTop="16dp"
+                android:layout_marginBottom="@dimen/car_quick_controls_footer_button_margin_top"
                 app:layout_constraintHeight_default="wrap"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/res/layout/qc_profile_switcher.xml b/res/layout/qc_profile_switcher.xml
index 4ec4ce3c..d4355f2e 100644
--- a/res/layout/qc_profile_switcher.xml
+++ b/res/layout/qc_profile_switcher.xml
@@ -18,6 +18,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layoutDirection="locale"
     android:background="@color/status_icon_panel_bg_color">
     <com.android.car.ui.FocusParkingView
         android:layout_width="wrap_content"
@@ -33,6 +34,7 @@
             <ScrollView
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
+                android:layout_marginBottom="@dimen/car_quick_controls_footer_button_margin_top"
                 app:layout_constraintHeight_default="wrap"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/res/layout/sensor_use_started_title.xml b/res/layout/sensor_use_started_title.xml
new file mode 100644
index 00000000..b9d9540c
--- /dev/null
+++ b/res/layout/sensor_use_started_title.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:gravity="center_vertical">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/car_alert_dialog_padding"
+        android:orientation="horizontal"
+        android:gravity="center">
+        <ImageView
+            android:layout_width="@dimen/car_alert_dialog_icon_size"
+            android:layout_height="@dimen/car_alert_dialog_icon_size"
+            android:id="@+id/sensor_use_camera_icon"
+            android:src="@*android:drawable/perm_group_camera"
+            android:tint="@color/car_on_surface"
+            android:visibility="gone" />
+        <ImageView
+            android:layout_width="@dimen/car_alert_dialog_icon_size"
+            android:layout_height="@dimen/car_alert_dialog_icon_size"
+            android:id="@+id/sensor_use_microphone_icon"
+            android:src="@*android:drawable/perm_group_microphone"
+            android:tint="@color/car_on_surface"
+            android:visibility="gone" />
+    </LinearLayout>
+    <com.android.internal.widget.DialogTitle
+        android:id="@+id/sensor_use_started_title_message"
+        style="@android:style/TextAppearance.DeviceDefault.WindowTitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textAlignment="center" />
+</LinearLayout>
+\ No newline at end of file
diff --git a/res/layout/sysui_overlay_window.xml b/res/layout/sysui_overlay_window.xml
index ba95e748..58c1c522 100644
--- a/res/layout/sysui_overlay_window.xml
+++ b/res/layout/sysui_overlay_window.xml
@@ -46,7 +46,7 @@
     <ViewStub android:id="@+id/fullscreen_user_switcher_stub"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
-              android:layout="@layout/car_fullscreen_user_switcher"/>
+              android:layout="@layout/car_fullscreen_user_switcher_wrapper"/>
 
     <ViewStub android:id="@+id/user_switching_dialog_stub"
               android:layout_width="match_parent"
diff --git a/res/layout/text_toast.xml b/res/layout/text_toast.xml
index d2aca57a..91dfb2fc 100644
--- a/res/layout/text_toast.xml
+++ b/res/layout/text_toast.xml
@@ -16,35 +16,30 @@
   ~ limitations under the License.
   -->
 
-<LinearLayout
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="706dp"
+    android:layout_width="@*android:dimen/toast_width"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:gravity="center_vertical"
-    android:maxHeight="160dp"
-    android:background="@android:drawable/toast_frame"
-    android:elevation="@*android:dimen/toast_elevation"
-    android:layout_marginEnd="16dp"
-    android:layout_marginStart="16dp"
-    android:paddingStart="32dp"
-    android:paddingEnd="32dp"
-    android:paddingTop="32dp"
-    android:paddingBottom="32dp">
-
-    <!-- This is needed so that toasts don't crash -->
-    <ImageView
-        android:id="@+id/icon"
-        android:layout_width="44dp"
-        android:layout_height="44dp"
-        android:paddingEnd="16dp"/>
-
-    <TextView
-        android:id="@+id/text"
-        android:layout_width="642dp"
-        android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="2"
-        android:lineHeight="32dp"
-        android:textAppearance="@style/TextAppearance.Toast"/>
-</LinearLayout>
-\ No newline at end of file
+    android:gravity="center"
+    android:layout_marginBottom="@dimen/car_toast_bottom_margin">
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxWidth="@*android:dimen/toast_width"
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+            android:background="@android:drawable/toast_frame"
+            android:elevation="@*android:dimen/toast_elevation"
+            android:padding="@dimen/car_toast_margin">
+            <ImageView
+                android:id="@+id/icon"
+                android:layout_width="@dimen/car_toast_icon_size"
+                android:layout_height="@dimen/car_toast_icon_size"
+                android:layout_marginEnd="@dimen/car_toast_icon_margin"/>
+            <TextView
+                android:id="@+id/text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/TextAppearance.Car.Toast"/>
+        </LinearLayout>
+</FrameLayout>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index dca892a7..57570ece 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -36,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> is af."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Gebruik <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Vir programme wat toestemming het"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Mikrofooninstellings"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Privaatheidinstellings"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> gebruik tans die <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> gebruik tans die mikrofoon"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> het onlangs die <xliff:g id="SENSOR">%2$s</xliff:g> gebruik"</string>
@@ -46,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Skakel voertuigmikrofoon aan?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Skakel die inligtingvermaakstelsel se mikrofoon aan om voort te gaan. Dit sal die mikrofoon aanskakel vir alle programme wat toestemming het."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Kamera-instellings"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> gebruik tans die kamera"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> gebruik tans die kamera"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> het onlangs die kamera gebruik"</string>
@@ -64,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Media"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Beheersentrum"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistent"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Mikrofoonprivaatheidskyfie"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Gebruikeravatar"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Gebruikernaamteks"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Verlaag temperatuur"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Verhoog temperatuur"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Bluetooth-instelling: ontkoppel"</string>
@@ -88,8 +91,9 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Klankinstellings"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Profiel- en rekeninginstellings"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Patroon steun nie rotasie nie; gebruik raak"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Raakskerm is gesluit"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Jou skerm is gesluit"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Jou skerm is gesluit"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Jou skerm is gesluit"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Jou skerm is nou ontsluit"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Is jy seker jy wil afmeld?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Dit sal alle oop apps toemaak"</string>
     <string name="user_logout" msgid="2934184154258330491">"Meld af"</string>
@@ -119,4 +123,9 @@
     <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Voer jou PIN in"</string>
     <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Voer jou patroon in"</string>
     <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Voer jou wagwoord in"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Backspace-sleutel"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter-sleutel"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"voorneme:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Terug"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Volskerm"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index d0747d2d..c6ebabb2 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"ክፍለ-ጊዜን አብቃ"</string>
     <string name="car_new_user" msgid="6766334721724989964">"አዲስ መገለጫ"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"አዲስ መገለጫ ይታከል?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"እርስዎ አዲስ መገለጫ ካከሉ በኋላ የመለያው ባለቤት እሱን ማበጀት ይችላል።"</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"ማንኛውም መገለጫ የመተግበሪያ ዝማኔ መጫን ይቻላል ከዚያም ለሁሉም መገለጫዎች የሚገኝ ይሆናል።"</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"የመገለጫ ከፍተኛው ገደብ ላይ ተደርሷል"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{አንድ መገለጫ ብቻ ነው ሊፈጠር የሚችለው።}one{እስከ # መገለጫዎች ድረስ ማከል ይችላሉ።}other{እስከ # መገለጫዎች ድረስ ማከል ይችላሉ።}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"በመጫን ላይ"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> ጠፍቷል።"</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"<xliff:g id="SENSOR">%1$s</xliff:g>ን ይጠቀሙ"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"ፈቃድ ላላቸው መተግበሪያዎች"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"የማይክሮፎን ቅንብሮች"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"የግላዊነት ቅንብሮች"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> <xliff:g id="SENSOR">%2$s</xliff:g>ን እየተጠቀመ ነው"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> ማይክሮፎኑን እየተጠቀሙ ነው"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> በቅርቡ <xliff:g id="SENSOR">%2$s</xliff:g>ን ተጠቅመዋል"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"እሺ"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"የተሽከርካሪ ማይክሮፎን ይብራ?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"ለመቀጠል የኢንፎቴይንመንት ሥርዓት ማይክሮፎኑን ያብሩ። ይህ ፈቃዱ ላላቸው ሁሉም መተግበሪያዎች ማይክሮፎኑን ያበራል።"</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"የካሜራ ቅንብሮች"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> ካሜራውን እየተጠቀመ ነው"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> ካሜራውን እየተጠቀሙ ነው"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> በቅርቡ ካሜራውን ተጠቅሟል"</string>
@@ -58,7 +55,7 @@
     <string name="camera_privacy_chip_dialog_ok" msgid="7285467760928137765">"እሺ"</string>
     <string name="sensor_privacy_start_use_camera_dialog_title" msgid="4787836783010823885">"የተሽከርካሪ ካሜራ ይብራ?"</string>
     <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7749639131326657668">"ለመቀጠል የኢንፎቴይንመንት ስርዓት ካሜራን ያብሩ። ይህ ፈቃዱ ላላቸው ሁሉም መተግበሪያዎች ካሜራውን ያበራል።"</string>
-    <string name="system_bar_home_label" msgid="8413273833405495948">"መነሻ ማያ ገጽ"</string>
+    <string name="system_bar_home_label" msgid="8413273833405495948">"መነሻ ማያ ገፅ"</string>
     <string name="system_bar_phone_label" msgid="5664288201806823777">"ስልክ"</string>
     <string name="system_bar_applications_label" msgid="7081862804211786227">"መተግበሪያዎች"</string>
     <string name="system_bar_climate_control_label" msgid="4091187805919276017">"የአየር ንብረት መቆጣጠሪያ"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"ካርታዎች"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"ሚዲያ"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"የቁጥጥር ማዕከል"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"ረዳት"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"የMIC ግላዊነት ቺፕ"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"የተጠቃሚ አምሳያ"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"የተጠቃሚ ስም ጽሁፍ"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"የሙቀት መጠኑን ቀንስ"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"የሙቀት መጠኑን ጨምር"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"የብሉቱዝ ቅንብር፦ ግንኙነት ተቋርጧል"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"የድምፅ ቅንብሮች"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"የመገለጫዎች እና የመለያዎች ቅንብሮች"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"ሥርዓተ ጥለት መሽከርከርን አይደግፍም፤ እባክዎ ንካን ይጠቀሙ"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"ተነኪ ማያ ተቆልፏል"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"ማያ ገጽዎ ተቆልፏል"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"ማያ ገጽዎ አሁን ተቆልፏል"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"ማያ ገጽዎ ተቆልፏል"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"ማያ ገጽዎ አሁን ተከፍቷል"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"ለመውጣት ስለመፈለግዎ እርግጠኛ ነዎት?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"ይህ ሁሉም የተከፈቱ መተግበሪያዎችን ይዘጋል"</string>
     <string name="user_logout" msgid="2934184154258330491">"ውጣ"</string>
     <string name="car_guest" msgid="768913000117469596">"እንግዳ"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"መገለጫን በመቀየር ላይ…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"አዲስ መገለጫን በማከል ላይ…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"እስከ <xliff:g id="USER_LIMIT">%d</xliff:g> መገለጫዎች ማከል ይችላሉ"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"አዲስ መገለጫ ይታከል?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"ለመቀጠል <xliff:g id="USER_NAME">%1$s</xliff:g> ከ<xliff:g id="SEAT_LOCATION">%2$s</xliff:g> የማያ ገጽ ላይ ዘግተው መውጣት አለባቸው"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"ለመጀመር መገለጫ ይምረጡ"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"በመለያ ገብተዋል"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"በ<xliff:g id="SEAT_LOCATION">%s</xliff:g> የማያ ገጽ ላይ በመለያ ገብተዋል"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"አዲስ መገለጫ ማከል አልተቻለም። ቆይተው እንደገና ይሞክሩ።"</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"የእንግዳ መገለጫን መጀመር አልተቻለም። ቆይተው እንደገና ይሞክሩ።"</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"ዘግቶ በመውጣት ላይ…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> ዘግተው እንዲውጡ እየተደረገ ነው። ቆይተው እንደገና ይሞክሩ።"</string>
     <string name="seat_driver" msgid="4502591979520445677">"ነጂ"</string>
     <string name="seat_front" msgid="836133281052793377">"የፊት"</string>
     <string name="seat_rear" msgid="403133444964528577">"የኋላ"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"የእርስዎን ፒን ያስገቡ"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"የእርስዎን ሥርዓተ-ጥለት ያስገቡ"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"የይለፍ ቃልዎን ያስገቡ"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"የኋሊት መደምሰሻ ቁልፍ"</string>
+    <string name="enter_key" msgid="747962923921283095">"ያስገቡ ቁልፍ"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"ተመለስ"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"ሙሉ ገፅ ዕይታ"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index ba9aebb6..62bbd8b0 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"إنهاء الجلسة"</string>
     <string name="car_new_user" msgid="6766334721724989964">"ملف شخصي جديد"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"هل تريد إضافة ملف شخصي جديد؟"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"بعد إضافة ملف شخصي جديد، يمكن لصاحب الحساب تخصيصه."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"يمكن لأي ملف شخصي تثبيت تحديثات التطبيقات، والتي تكون متاحة لاحقًا لجميع الملفات الشخصية."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"تم بلوغ أقصى عدد للملفات الشخصية"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{يمكنك إنشاء ملف شخصي واحد فقط.}zero{يمكنك إضافة # ملف شخصي كحد أقصى.}two{يمكنك إضافة ملفين شخصيين كحد أقصى.}few{يمكنك إضافة # ملفات شخصية كحد أقصى.}many{يمكنك إضافة # ملفًا شخصيًا كحد أقصى.}other{يمكنك إضافة # ملف شخصي كحد أقصى.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"جارٍ التحميل"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"تم إيقاف ميزة <xliff:g id="SENSOR">%1$s</xliff:g>."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"استخدام <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"للتطبيقات التي حصلت على الإذن"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"إعدادات الميكروفون"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"إعدادات الخصوصية"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"يستخدم تطبيق <xliff:g id="APP">%1$s</xliff:g> ميزة <xliff:g id="SENSOR">%2$s</xliff:g> الآن."</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"تستخدم تطبيقات <xliff:g id="APP_LIST">%s</xliff:g> الميكروفون."</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"استخدَم تطبيق <xliff:g id="APP">%1$s</xliff:g> ميزة <xliff:g id="SENSOR">%2$s</xliff:g> مؤخرًا."</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"حسنًا"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"هل تريد تفعيل ميكروفون السيارة؟"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"للمتابعة، عليك تفعيل الميكروفون لنظام الترفيه والمعلومات. سيؤدي هذا إلى تفعيل الميكروفون لجميع التطبيقات التي حصلت على الإذن."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"إعدادات الكاميرا"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"يستخدم تطبيق <xliff:g id="APP">%s</xliff:g> الكاميرا الآن."</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"تستخدِم تطبيقات <xliff:g id="APP_LIST">%s</xliff:g> الكاميرا."</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"استخدَم تطبيق <xliff:g id="APP">%s</xliff:g> الكاميرا مؤخرًا."</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"خرائط Google"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"الوسائط"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"مركز التحكّم"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"مساعد Google"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"شريحة خصوصية الميكروفون"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"الصورة الرمزية للمستخدم"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"نص اسم المستخدم"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"خفض درجة الحرارة"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"رفع درجة الحرارة"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"إعداد بلوتوث: غير متّصل"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"إعدادات الصوت"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"إعدادات الملفات الشخصية والحسابات"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"لا يدعم النقش الإدخال عبر وحدة تحكّم دورانية، يُرجى استخدام وحدة تحكّم باللمس."</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"تم قفل الشاشة التي تعمل باللمس."</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"تم قفل شاشتك."</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"تم قفل شاشتك."</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"تم قفل شاشتك."</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"تم فتح قفل شاشتك الآن."</string>
     <string name="user_logout_title" msgid="5534754139319586681">"هل تريد فعلاً تسجيل الخروج؟"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"سيؤدي هذا إلى إغلاق جميع التطبيقات المفتوحة."</string>
     <string name="user_logout" msgid="2934184154258330491">"تسجيل الخروج"</string>
     <string name="car_guest" msgid="768913000117469596">"ضيف"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"جارٍ تبديل الملف الشخصي…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"جارٍ إضافة ملف شخصي جديد…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"يمكنك إضافة ما يصل إلى <xliff:g id="USER_LIMIT">%d</xliff:g> ملف شخصي."</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"هل تريد إضافة ملف شخصي جديد؟"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"للمتابعة، على \"<xliff:g id="USER_NAME">%1$s</xliff:g>\" تسجيل الخروج من شاشة <xliff:g id="SEAT_LOCATION">%2$s</xliff:g>."</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"اختَر ملفًا شخصيًا للبدء"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"مسجّلٌ الدخول"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"مسجّلٌ الدخول في شاشة <xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"تتعذّر إضافة ملف شخصي جديد. يُرجى إعادة المحاولة لاحقًا."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"يتعذّر بدء استخدام الملف الشخصي للضيف. يُرجى إعادة المحاولة لاحقًا."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"جارٍ تسجيل الخروج…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"يتم الآن تسجيل خروج \"<xliff:g id="USER_NAME">%s</xliff:g>\". يُرجى إعادة المحاولة لاحقًا."</string>
     <string name="seat_driver" msgid="4502591979520445677">"السائق"</string>
     <string name="seat_front" msgid="836133281052793377">"المقعد الأمامي"</string>
     <string name="seat_rear" msgid="403133444964528577">"المقعد الخلفي"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"أدخِل رقم التعريف الشخصي."</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"أدخِل النقش."</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"أدخِل كلمة المرور."</string>
+    <string name="backspace_key" msgid="5570862528655375412">"مفتاح Backspace"</string>
+    <string name="enter_key" msgid="747962923921283095">"مفتاح Enter"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"رجوع"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"ملء الشاشة"</string>
 </resources>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 051cf153..6b8d9ad7 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"ছেশ্বন সমাপ্ত কৰক"</string>
     <string name="car_new_user" msgid="6766334721724989964">"নতুন প্ৰ’ফাইল"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"নতুন প্ৰ’ফাইল যোগ দিবনে?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"আপুনি এটা নতুন প্ৰ’ফাইল যোগ দিয়াৰ পাছত একাউণ্টৰ গৰাকীয়ে সেইটো কাষ্টমাইজ কৰিব পাৰে।"</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"যিকোনো প্ৰ’ফাইলে এপৰ আপডে’ট ইনষ্টল কৰিব পাৰে, যিটো তাৰ পাছত আটাইবোৰ প্ৰ’ফাইলৰ বাবে উপলব্ধ হ’ব।"</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"প্ৰ’ফাইলৰ সীমাত উপনীত হৈছে"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{কেৱল এটা প্ৰ’ফাইল সৃষ্টি কৰিব পাৰি।}one{আপুনি # টা পর্যন্ত প্ৰ’ফাইল যোগ দিব পাৰে।}other{আপুনি # টা পর্যন্ত প্ৰ’ফাইল যোগ দিব পাৰে।}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"ল’ড হৈ আছে"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> অফ কৰা আছে।"</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"<xliff:g id="SENSOR">%1$s</xliff:g> ব্যৱহাৰ কৰক"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"অনুমতি থকা এপৰ বাবে"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"মাইক্ৰ’ফ’নৰ ছেটিং"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"গোপনীয়তাৰ ছেটিং"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g>এ <xliff:g id="SENSOR">%2$s</xliff:g> ব্যৱহাৰ কৰি আছে"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g>এ মাইক ব্যৱহাৰ কৰি আছে"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g>এ শেহতীয়াকৈ <xliff:g id="SENSOR">%2$s</xliff:g> ব্যৱহাৰ কৰিছে"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"ঠিক আছে"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"বাহনৰ মাইক্ৰ’ফ’ন অন কৰিবনে?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"অব্যাহত ৰাখিবলৈ, ইনফ’টেইনমেণ্ট ছিষ্টেমৰ মাইক্ৰ’ফ’নটো অন কৰক। এইটোৱে অনুমতি থকা আটাইবোৰ এপৰ বাবে মাইক্ৰ’ফ’নটো অন কৰিব।"</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"কেমেৰাৰ ছেটিং"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g>এ কেমেৰা ব্যৱহাৰ কৰি আছে"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g>এ কেমেৰা ব্যৱহাৰ কৰি আছে"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g>এ শেহতীয়াকৈ কেমেৰা ব্যৱহাৰ কৰিছে"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"মিডিয়া"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"নিয়ন্ত্ৰণ কেন্দ্ৰ"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistant"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"মাইকৰ গোপনীয়তা বিষয়ক চিপ"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"ব্যৱহাৰকাৰীৰ অৱতাৰ"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"ব্যৱহাৰকাৰীৰ নামৰ পাঠ"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"উষ্ণতা হ্ৰাস কৰক"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"উষ্ণতা বৃদ্ধি কৰক"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"ব্লুটুথৰ ছেটিং: সংযোগ বিচ্ছিন্ন কৰা হ’ল"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"ধ্বনিৰ ছেটিং"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"প্ৰ’ফাইল আৰু একাউণ্ট ছেটিং"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"আৰ্হিটোৱে ৰ’টেৰী সমৰ্থন কৰে; স্পৰ্শ কৰাটো ব্যৱহাৰ কৰক"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"টাচ্চ স্ক্ৰীন লক কৰা হৈছে"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"আপোনাৰ স্ক্ৰীন লক কৰা হৈছে"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"আপোনাৰ স্ক্ৰীন লক কৰা আছে"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"আপোনাৰ স্ক্ৰীন লক কৰা হৈছে"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"আপোনাৰ স্ক্ৰীন এতিয়া আনলক কৰা হৈছে"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"আপুনি লগ আউট কৰিব বিচাৰে বুলি নিশ্চিতনে?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"এইটোৱে খোল খাই থকা আটাইবোৰ এপ্লিকেশ্বন বন্ধ কৰিব"</string>
     <string name="user_logout" msgid="2934184154258330491">"লগ আউট কৰক"</string>
     <string name="car_guest" msgid="768913000117469596">"অতিথি"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"প্ৰ’ফাইল সালসলনি কৰি থকা হৈছে…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"নতুন প্ৰ’ফাইল যোগ দি থকা হৈছে…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"আপুনি <xliff:g id="USER_LIMIT">%d</xliff:g> টা পৰ্যন্ত প্ৰ’ফাইল যোগ দিব পাৰে"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"নতুন প্ৰ’ফাইল যোগ দিবনে?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"অব্যাহত ৰাখিবলৈ, <xliff:g id="USER_NAME">%1$s</xliff:g>এ <xliff:g id="SEAT_LOCATION">%2$s</xliff:g> স্ক্ৰীনৰ পৰা ছাইন আউট কৰিব লাগিব"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"আৰম্ভ কৰিবলৈ প্ৰ’ফাইল বাছনি কৰক"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"ছাইন ইন কৰা হৈছে"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"<xliff:g id="SEAT_LOCATION">%s</xliff:g> স্ক্ৰীনত ছাইন ইন কৰা হৈছে"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"নতুন প্ৰ’ফাইল যোগ দিব নোৱাৰি। পাছত পুনৰ চেষ্টা কৰক।"</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"অতিথিৰ প্ৰ’ফাইল আৰম্ভ কৰিব নোৱাৰি। পাছত পুনৰ চেষ্টা কৰক।"</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"ছাইন আউট কৰি থকা হৈছে…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g>ক ছাইন আউট কৰাই থকা হৈছে। পাছত পুনৰ চেষ্টা কৰক।"</string>
     <string name="seat_driver" msgid="4502591979520445677">"চালকৰ আসন"</string>
     <string name="seat_front" msgid="836133281052793377">"সন্মুখৰ আসন"</string>
     <string name="seat_rear" msgid="403133444964528577">"পিছফালৰ আসন"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"আপোনাৰ পিনটো দিয়ক"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"আপোনাৰ আৰ্হিটো দিয়ক"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"আপোনাৰ পাছৱৰ্ডটো দিয়ক"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"বেকস্পেচ কী"</string>
+    <string name="enter_key" msgid="747962923921283095">"এণ্টাৰ কী"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"উভতি যাওক"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"পূৰ্ণ স্ক্ৰীন"</string>
 </resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 55a0b3b9..643f0885 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Sessiyanı sonlandırın"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Yeni profil"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Yeni profil əlavə edilsin?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Yeni profil əlavə etdikdən sonra hesab sahibi onu fərdiləşdirə bilər."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"İstənilən profil bütün profillər üçün əlçatan olacaq tətbiq güncəllənməsi quraşdıra bilər."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Profil limitinə çatmısınız"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Yalnız bir profil yaradıla bilər.}other{Maksimum # profil əlavə edə bilərsiniz.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Yüklənir"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> deaktivdir."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"<xliff:g id="SENSOR">%1$s</xliff:g> istifadə edin"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"İcazəsi olan tətbiqlər üçün"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Mikrofon ayarları"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Məxfilik ayarları"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> <xliff:g id="SENSOR">%2$s</xliff:g> istifadə edir"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> mikrofondan istifadə edir"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> bu yaxınlarda <xliff:g id="SENSOR">%2$s</xliff:g> istifadə edib"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Avtomobilin mikrofonu aktiv edilsin?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Davam etmək üçün məlumat-əyləncə sistemi mikrofonunu aktiv edin. Bu, icazəsi olan bütün tətbiqlər üçün mikrofonu aktiv edəcək."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Kamera ayarları"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> kameradan istifadə edir"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> kameradan istifadə edir"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> bu yaxınlarda kameradan istifadə edib"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Xəritə"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Media"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"İdarə Mərkəzi"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistent"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Mikrofon məxfilik çipi"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"İstifadəçi avatarı"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"İstifadəçi adı mətni"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Temperaturu azaldın"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Temperaturu artırın"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Bluetooth Ayarı: Ayrılıb"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Səs ayarları"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Profillər və hesab ayarları"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Model fırlanmanı dəstəkləmir; toxunuşdan istifadə edin"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Sensor ekran kilidlənib"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Ekran kilidlənib"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Ekran kilidlənib"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Ekran kilidlənib"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Ekran kiliddən çıxarılıb"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Çıxmaq istədiyinizə əminsiniz?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Bütün açıq tətbiqlər bağlanacaq"</string>
     <string name="user_logout" msgid="2934184154258330491">"Çıxış"</string>
     <string name="car_guest" msgid="768913000117469596">"Qonaq"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Profil dəyişdirilir…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Yeni profil əlavə edilir…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Maksimum <xliff:g id="USER_LIMIT">%d</xliff:g> profil əlavə edə bilərsiniz"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Yeni profil əlavə edilsin?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Davam etmək üçün <xliff:g id="USER_NAME">%1$s</xliff:g> <xliff:g id="SEAT_LOCATION">%2$s</xliff:g> ekranından çıxmalıdır"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Başlamaq üçün profil seçin"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Daxil olunub"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"<xliff:g id="SEAT_LOCATION">%s</xliff:g> ekranında daxil olunub"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Yeni profil əlavə etmək olmur. Sonra cəhd edin."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Qonaq profili yaratmaq olmur. Sonra cəhd edin."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Çıxış edilir…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> çıxır. Sonra cəhd edin."</string>
     <string name="seat_driver" msgid="4502591979520445677">"sürücü"</string>
     <string name="seat_front" msgid="836133281052793377">"ön"</string>
     <string name="seat_rear" msgid="403133444964528577">"arxa"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"PIN daxil edin"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Model daxil edin"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Parol daxil edin"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Geri düyməsi"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter düyməsi"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Geri"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Tam ekran"</string>
 </resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 49e02818..fa2cca6f 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Završi sesiju"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Novi profil"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Želite da dodate novi profil?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Kada dodate nov profil, vlasnik naloga može da ga prilagodi."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Svaki profil može da instalira ažuriranje aplikacije, koje će zatim biti dostupno svim profilima."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Dostignut maksimalan broj profila"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Možete da napravite samo jedan profil.}one{Možete da dodate najviše # profil.}few{Možete da dodate najviše # profila.}other{Možete da dodate najviše # profila.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Učitava se"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"Senzor <xliff:g id="SENSOR">%1$s</xliff:g> je isključen."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Koristi: <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Za aplikacije koje imaju dozvolu"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Podešavanja mikrofona"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Podešavanja privatnosti"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> koristi: <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"Aplikacije <xliff:g id="APP_LIST">%s</xliff:g> koriste mikrofon"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"Aplikacija <xliff:g id="APP">%1$s</xliff:g> je nedavno koristila: <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"Potvrdi"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Želite da uključite mikrofon vozila?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Da biste nastavili, uključite mikrofon sistema za info-zabavu. Ovim će se uključiti mikrofon za sve aplikacije koje imaju dozvolu."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Podešavanja kamere"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> koristi kameru"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"Aplikacije <xliff:g id="APP_LIST">%s</xliff:g> koriste kameru"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"Aplikacija <xliff:g id="APP">%s</xliff:g> je nedavno koristila kameru"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Mape"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Mediji"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Kontrolni centar"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Pomoćnik"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Element za privatnost mikrofona"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Avatar korisnika"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Tekst korisničkog imena"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Smanji temperaturu"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Povećaj temperaturu"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Podešavanje Bluetooth-a: Nije povezano"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Podešavanja zvuka"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Podešavanja profila i naloga"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Šablon ne dopušta kružne pokrete; koristite dodir"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Dodirni ekran je zaključan"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Ekran je zaključan"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Ekran je zaključan"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Ekran je zaključan"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Ekran je otključan"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Da li stvarno želite da se odjavite?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Ovo će zatvoriti sve otvorene aplikacije"</string>
     <string name="user_logout" msgid="2934184154258330491">"Odjavi me"</string>
     <string name="car_guest" msgid="768913000117469596">"Gost"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Menja se profil…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Dodaje se novi profil…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Možete da dodate najviše <xliff:g id="USER_LIMIT">%d</xliff:g> profila"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Želite da dodate novi profil?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Da biste nastavili, <xliff:g id="USER_NAME">%1$s</xliff:g> treba da se odjavi sa ekrana za:<xliff:g id="SEAT_LOCATION">%2$s</xliff:g>"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Izaberite profil da biste započeli"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Prijavljeni ste"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Prijavljeni ste na ekranu za: <xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Ne možete da dodate nov profil. Probajte ponovo kasnije."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Ne možete da pokrenete profil gosta. Probajte ponovo kasnije."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Odjavljujete se…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> se odjavljuje. Probajte ponovo kasnije."</string>
     <string name="seat_driver" msgid="4502591979520445677">"vozač"</string>
     <string name="seat_front" msgid="836133281052793377">"prednje"</string>
     <string name="seat_rear" msgid="403133444964528577">"zadnje"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Unesite PIN"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Unesite šablon"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Unesite lozinku"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Taster backspace"</string>
+    <string name="enter_key" msgid="747962923921283095">"Taster Enter"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Nazad"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Ceo ekran"</string>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index efc49ae5..81c0a507 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Завяршыць сеанс"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Новы профіль"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Дадаць новы профіль?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Уладальнік уліковага запісу зможа наладзіць новы профіль пасля таго, як вы яго дадасце."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Абнаўленне праграмы можна ўсталяваць з любога профілю. Яна будзе абноўлена для ўсіх профіляў."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Дасягнуты ліміт колькасці профіляў"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Можна стварыць толькі адзін профіль.}one{Можна дадаць максімум # профіль.}few{Можна дадаць максімум # профілі.}many{Можна дадаць максімум # профіляў.}other{Можна дадаць максімум # профілю.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Ідзе загрузка"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g>: выключана."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Выкарыстоўваць гэта: <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Для праграм, якія маюць дазвол"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Налады мікрафона"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Налады прыватнасці"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"Праграма \"<xliff:g id="APP">%1$s</xliff:g>\" выкарыстоўвае гэта: <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> выкарыстоўваюць мікрафон"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"Праграма \"<xliff:g id="APP">%1$s</xliff:g>\" нядаўна выкарыстоўвала гэта: <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Уключыць мікрафон аўтамабіля?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Каб працягнуць, уключыце мікрафон інфармацыйна-забаўляльнай сістэмы. Ён будзе ўключаны для ўсіх праграм, якія маюць адпаведны дазвол."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Налады камеры"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"Праграма \"<xliff:g id="APP">%s</xliff:g>\" выкарыстоўвае камеру"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> выкарыстоўваюць камеру"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"Праграма \"<xliff:g id="APP">%s</xliff:g>\" нядаўна выкарыстоўвала камеру"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Карты"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Мультымедыя"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Цэнтр кіравання"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Памочнік"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Чып прыватнасці для мікрафона"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Аватар карыстальніка"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Імя карыстальніка ў тэкставым фармаце"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Панізіць тэмпературу"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Павысіць тэмпературу"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Налада Bluetooth: адключана"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Налады гуку"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Налады ўліковых запісаў і профіляў"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Паваротны рэгулятар не падтрымліваецца, выкарыстайце сэнсарны ўвод"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Сэнсарны экран заблакіраваны"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Экран заблакіраваны"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Экран заблакіраваны"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Экран заблакіраваны"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Экран разблакіраваны"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Вы сапраўды хочаце выйсці?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Будуць закрыты ўсе адкрытыя праграмы"</string>
     <string name="user_logout" msgid="2934184154258330491">"Выйсці"</string>
     <string name="car_guest" msgid="768913000117469596">"Госць"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Ідзе пераключэнне на іншы профіль…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Ідзе дадаванне новага профілю…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Максімальная колькасць профіляў, якую можна дадаць: <xliff:g id="USER_LIMIT">%d</xliff:g>"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Дадаць новы профіль?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Каб працягнуць, карыстальнік <xliff:g id="USER_NAME">%1$s</xliff:g> павінен выйсці з уліковага запісу на экране \"<xliff:g id="SEAT_LOCATION">%2$s</xliff:g>\""</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Каб пачаць, выберыце профіль"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Уваход выкананы"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Уваход выкананы на экране \"<xliff:g id="SEAT_LOCATION">%s</xliff:g>\""</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Не ўдаецца дадаць новы профіль. Паўтарыце спробу пазней."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Не ўдаецца стварыць гасцявы профіль. Паўтарыце спробу пазней."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Ажыццяўляецца выхад…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> выходзіць з уліковага запісу. Паўтарыце спробу пазней."</string>
     <string name="seat_driver" msgid="4502591979520445677">"на месцы вадзіцеля"</string>
     <string name="seat_front" msgid="836133281052793377">"на пярэднім сядзенні"</string>
     <string name="seat_rear" msgid="403133444964528577">"на заднім сядзенні"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Увядзіце PIN-код"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Увядзіце ўзор разблакіроўкі"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Увядзіце пароль"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Клавіша Backspace"</string>
+    <string name="enter_key" msgid="747962923921283095">"Клавіша \"Увод\""</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Назад"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Поўнаэкранны рэжым"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 73c82030..671de33e 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Прекратяване на сесията"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Нов потребителски профил"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Да се добави ли новият профил?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"След като добавите новия си потребителски профил, собственикът на профила може да го персонализира."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Всеки потр. профил може да инсталира актуализация на прил., която ще е налице за всички профили."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Достигнахте лимита за потр. профили"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Може да бъде създаден само един потребителски профил.}other{Можете да добавите до # потребителски профила.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Зарежда се"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> е изкл."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Използване на <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"За приложения, които имат разрешение"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Настройки на микрофона"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Настройки за поверителност"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> използва <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> използват микрофона"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> наскоро използва <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Да се включи ли микрофонът на превозното средство?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"За да продължите, включете микрофона на основното устройство. Така той ще се включи за всички приложения, които имат разрешение."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Настройки на камерата"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> използва камерата"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> използват камерата"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> използва камерата наскоро"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Карти"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Мултимедия"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Контролен център"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Асистент"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Чип за поверителност на микрофона"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Потребителски аватар"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Текст за потребителското име"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"По-ниска температура"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Увеличаване на температурата"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Настройка за Bluetooth: Връзката е прекратена"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Настройки за звука"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Настройки за потр. профили и профилите"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Фигурата не поддържа ротация. Моля, докоснете"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Сензорният екран е заключен"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Екранът ви е заключен"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Екранът ви е заключен"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Екранът ви е заключен"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Екранът ви вече е отключен"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Наистина ли искате да излезете?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Ще бъдат затворени всички отворени приложения"</string>
     <string name="user_logout" msgid="2934184154258330491">"Излизане"</string>
     <string name="car_guest" msgid="768913000117469596">"Гост"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Потребителският профил се превключва…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Новият потребителски профил се добавя…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Можете да добавите до <xliff:g id="USER_LIMIT">%d</xliff:g> потребителски профила"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Да се добави ли новият потребителски профил?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"За да продължи, <xliff:g id="USER_NAME">%1$s</xliff:g> трябва да излезе от екрана на <xliff:g id="SEAT_LOCATION">%2$s</xliff:g>"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Изберете потребителски профил, за да стартирате"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Влязохте в профила"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Влязохте на екрана на <xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Новият потребителски профил не може да се добави. Опитайте отново по-късно."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Потребителският профил на гост не може да се стартира. Опитайте отново по-късно."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Излизате от профила си…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> излиза от профила си. Опитайте отново по-късно."</string>
     <string name="seat_driver" msgid="4502591979520445677">"шофьорска"</string>
     <string name="seat_front" msgid="836133281052793377">"предна"</string>
     <string name="seat_rear" msgid="403133444964528577">"задна"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Въведете ПИН кода си"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Въведете фигурата си"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Въведете паролата си"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Клавиш Backspace"</string>
+    <string name="enter_key" msgid="747962923921283095">"Въведете ключа"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Назад"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Цял екран"</string>
 </resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index b19b5dd5..a56b53ff 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"সেশন শেষ করুন"</string>
     <string name="car_new_user" msgid="6766334721724989964">"নতুন প্রোফাইল"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"নতুন প্রোফাইল যোগ করতে চান?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"নতুন প্রোফাইল যোগ করার পর, যার অ্যাকাউন্ট তিনি এটি কাস্টমাইজ করতে পারবেন।"</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"যেকোনও প্রোফাইল, অ্যাপ আপডেট ইনস্টল করতে পারবে, যেটি তারপরে সব প্রোফাইলে উপলভ্য হবে।"</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"আর কোনও প্রোফাইল যোগ করা যাবে না"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{শুধুমাত্র একটি প্রোফাইল তৈরি করা যাবে।}one{আপনি সর্বাধিক #টি প্রোফাইল যোগ করতে পারবেন।}other{আপনি সর্বাধিক #টি প্রোফাইল যোগ করতে পারবেন।}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"লোড হচ্ছে"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> বন্ধ আছে।"</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"<xliff:g id="SENSOR">%1$s</xliff:g> ব্যবহার করুন"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"যেসব অ্যাপের অনুমতি আছে"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"মাইক্রোফোন সেটিংস"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"গোপনীয়তা সেটিংস"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> <xliff:g id="SENSOR">%2$s</xliff:g> ব্যবহার করছে"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> মাইক্রোফোন ব্যবহার করছে"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> সম্প্রতি <xliff:g id="SENSOR">%2$s</xliff:g> ব্যবহার করেছে"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"ঠিক আছে"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"গাড়ির মাইক্রোফোন চালু করতে চান?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"চালিয়ে যাওয়ার জন্য, ইনফোটেইনমেন্ট সিস্টেমের মাইক্রোফোন চালু করুন। এটি অনুমতি আছে এমন সব অ্যাপের জন্য মাইক্রোফোন চালু করবে।"</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"ক্যামেরা সেটিংস"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> ক্যামেরা ব্যবহার করছে"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> ক্যামেরাটি ব্যবহার করছে"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> সম্প্রতি ক্যামেরা ব্যবহার করেছে"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"মিডিয়া"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"কন্ট্রোল সেন্টার"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistant"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"মাইকের জন্য গোপনীয়তা চিপ"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"ব্যবহারকারীর অবতার"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"ইউজার নেম টেক্সট"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"কম তাপমাত্রা"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"তাপমাত্রা বাড়ানো"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"ব্লুটুথ সেটিং: ডিসকানেক্ট হয়ে গেছে"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"সাউন্ড সেটিংস"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"প্রোফাইল ও অ্যাকাউন্ট সেটিংস"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"প্যাটার্নে রোটারি ব্যবহার করা যাবে না; টাচ ফিচার ব্যবহার করুন"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"টাচ স্ক্রিন লক হয়ে গেছে"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"আপনার স্ক্রিন লক করা হয়েছে"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"আপনার স্ক্রিন লক করা আছে"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"আপনার স্ক্রিন লক করা হয়েছে"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"আপনার স্ক্রিন এখন আনলক করা আছে"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"লগ আউট করার ব্যাপারে আপনি কি নিশ্চিত?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"এর ফলে খোলা রয়েছে এমন সবকটি অ্যাপ্লিকেশন বন্ধ হয়ে যাবে"</string>
     <string name="user_logout" msgid="2934184154258330491">"লগ আউট করুন"</string>
     <string name="car_guest" msgid="768913000117469596">"অতিথি"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"প্রোফাইল পাল্টানো হচ্ছে…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"নতুন প্রোফাইল যোগ করা হচ্ছে…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"আপনি সর্বাধিক <xliff:g id="USER_LIMIT">%d</xliff:g>টি প্রোফাইল যোগ করতে পারবেন"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"নতুন প্রোফাইল যোগ করতে চান?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"চালিয়ে যেতে, <xliff:g id="USER_NAME">%1$s</xliff:g>-কে <xliff:g id="SEAT_LOCATION">%2$s</xliff:g> স্ক্রিন থেকে সাইন-আউট করতে হবে"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"চালু করতে প্রোফাইল বেছে নিন"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"সাইন-ইন করেছেন"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"<xliff:g id="SEAT_LOCATION">%s</xliff:g> স্ক্রিনে সাইন-ইন করেছেন"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"নতুন প্রোফাইল যোগ করা যাচ্ছে না। পরে আবার চেষ্টা করুন।"</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"অতিথি প্রোফাইল চালু করা যাচ্ছে না। পরে আবার চেষ্টা করুন।"</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"সাইন-আউট করা হচ্ছে…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> সাইন-আউট করছেন। পরে আবার চেষ্টা করুন।"</string>
     <string name="seat_driver" msgid="4502591979520445677">"ড্রাইভার"</string>
     <string name="seat_front" msgid="836133281052793377">"সামনের দিক"</string>
     <string name="seat_rear" msgid="403133444964528577">"পিছন দিক"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"পিন লিখুন"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"প্যাটার্ন আঁকুন"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"পাসওয়ার্ড লিখুন"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Backspace কী"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter কী"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"ফিরে যান"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"ফুল-স্ক্রিন"</string>
 </resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index b6256564..e3011b3e 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -36,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"Senzor <xliff:g id="SENSOR">%1$s</xliff:g> isključen."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Koristite senzor <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Za aplikacije koje imaju odobrenje"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Postavke mikrofona"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Postavke privatnosti"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"Aplikacija <xliff:g id="APP">%1$s</xliff:g> koristi senzor <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> koriste mikrofon"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"Aplikacija <xliff:g id="APP">%1$s</xliff:g> je nedavno koristila senzor <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
@@ -46,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"Uredu"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Uključiti mikrofon vozila?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Da nastavite, uključite mikrofon informativno-zabavnog sistema. Ovim će se uključiti mikrofon za sve aplikacije koje imaju odobrenje."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Postavke kamere"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"Aplikacija <xliff:g id="APP">%s</xliff:g> koristi kameru"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"Aplikacije <xliff:g id="APP_LIST">%s</xliff:g> koriste kameru"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"Aplikacija <xliff:g id="APP">%s</xliff:g> je nedavno koristila kameru"</string>
@@ -64,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Mape"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Mediji"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Kontrolni centar"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Asistent"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Čip za privatnost mikrofona"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Avatar korisnika"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Tekst korisničkog imena"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Snizi temperaturu"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Povećaj temperaturu"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Postavka Bluetootha: veza je prekinuta"</string>
@@ -88,8 +91,9 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Postavke zvuka"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Postavke profila i računa"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Uzorak ne podržava brojčanik. Koristite dodir"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Ekran na dodir je zaključan"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Ekran je zaključan"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Ekran je sada zaključan"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Ekran je zaključan"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Ekran je sada otključan"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Jeste li sigurni da se želite odjaviti?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Ovo će zatvoriti sve otvorene aplikacije"</string>
     <string name="user_logout" msgid="2934184154258330491">"Odjava"</string>
@@ -119,4 +123,9 @@
     <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Unesite PIN"</string>
     <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Unesite uzorak"</string>
     <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Unesite lozinku"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Tipka Backspace"</string>
+    <string name="enter_key" msgid="747962923921283095">"Tipka Enter"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Nazad"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Prikaži preko cijelog ekrana"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 80aa52cc..d53cfe39 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Finalitza la sessió"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Perfil nou"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Vols afegir un perfil nou?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Després d\'afegir un perfil nou, el titular del compte pot personalitzar-lo."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Qualsevol perfil pot instal·lar una actualització de l\'app, que estarà disponible per a tots."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"S\'ha assolit el límit de perfils"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Només es pot crear 1 perfil.}other{Pots afegir fins a # perfils.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"S\'està carregant"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g>: s\'ha desactivat."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Utilitza <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Per a les aplicacions que tinguin permís"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Configuració del micròfon"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Configuració de privadesa"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> està utilitzant: <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> estan utilitzant el micròfon"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> ha utilitzat recentment: <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"D\'acord"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Vols activar el micròfon del vehicle?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Per continuar, activa el micròfon del sistema d\'informació i entreteniment. Això activarà el micròfon per a totes les aplicacions que tinguin permís."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Configuració de la càmera"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> està utilitzant la càmera"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> estan utilitzant la càmera"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> ha utilitzat la càmera recentment"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Multimèdia"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Centre de control"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistent"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Xip de privadesa del micròfon"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Avatar de l\'usuari"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Text del nom d\'usuari"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Abaixa la temperatura"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Apuja la temperatura"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Configuració del Bluetooth: desconnectat"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Configuració del so"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Configuració dels perfils i els comptes"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Patró de rotació no admès; utilitza un tàctil"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Pantalla tàctil bloquejada"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"La pantalla s\'ha bloquejat"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"La pantalla està bloquejada"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"La pantalla s\'ha bloquejat"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"La pantalla ara està desbloquejada"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Confirmes que vols tancar la sessió?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Es tancaran totes les aplicacions obertes"</string>
     <string name="user_logout" msgid="2934184154258330491">"Tanca la sessió"</string>
     <string name="car_guest" msgid="768913000117469596">"Convidat"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"S\'està canviant de perfil…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"S\'està afegint un perfil nou…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Pots afegir fins a <xliff:g id="USER_LIMIT">%d</xliff:g> perfils"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Vols afegir un perfil nou?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Per continuar, <xliff:g id="USER_NAME">%1$s</xliff:g> hauria de tancar la sessió a la pantalla de: <xliff:g id="SEAT_LOCATION">%2$s</xliff:g>"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Selecciona un perfil per començar"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Sessió iniciada"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Sessió iniciada a la pantalla de: <xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"No es pot afegir un perfil nou. Torna-ho a provar més tard."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"No es pot iniciar un perfil de convidat. Torna-ho a provar més tard."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"S\'està tancant la sessió…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"S\'està tancant la sessió de: <xliff:g id="USER_NAME">%s</xliff:g>. Torna-ho a provar més tard."</string>
     <string name="seat_driver" msgid="4502591979520445677">"del conductor"</string>
     <string name="seat_front" msgid="836133281052793377">"davanter"</string>
     <string name="seat_rear" msgid="403133444964528577">"posterior"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Introdueix el PIN"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Introdueix el patró"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Introdueix la contrasenya"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Tecla de retrocés"</string>
+    <string name="enter_key" msgid="747962923921283095">"Tecla de retorn"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Enrere"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Pantalla completa"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 04db6d5e..b82973ee 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Ukončit relaci"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Nový profil"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Přidat nový profil?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Po přidání nového profilu ho majitel účtu může přizpůsobit."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Aktualizaci aplikace může nainstalovat kterýkoli profil a aktualizace bude k dispozici všem."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Maximální počet profilů dosažen"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Můžete vytvořit jen jeden profil.}few{Můžete přidat až # profily.}many{Můžete přidat až # profilu.}other{Můžete přidat až # profilů.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Načítání"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> – vypnuto."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Použít <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Aplikace s oprávněním"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Nastavení mikrofonu"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Nastavení soukromí"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"Aplikace <xliff:g id="APP">%1$s</xliff:g> používá <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"Aplikace <xliff:g id="APP_LIST">%s</xliff:g> používají mikrofon"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"Aplikace <xliff:g id="APP">%1$s</xliff:g> nedávno použila <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Zapnout mikrofon vozidla?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Pokud chcete pokračovat, zapněte mikrofon informačního a zábavního systému. Mikrofon se zapne pro všechny aplikace, které mají oprávnění."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Nastavení kamery"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"Aplikace <xliff:g id="APP">%s</xliff:g> používá kameru"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"Aplikace <xliff:g id="APP_LIST">%s</xliff:g> používá kameru"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"Aplikace <xliff:g id="APP">%s</xliff:g> nedávno použila kameru"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Mapy"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Média"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Ovládací centrum"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Asistent"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Výběr soukromí mikrofonu"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Avatar uživatele"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Text uživatelského jména"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Snížit teplotu"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Zvýšit teplotu"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Nastavení rozhraní Bluetooth: odpojeno"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Nastavení zvuku"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Nastavení profilů a účtů"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Nelze použít otáčivý vstup, použijte dotykový"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Dotyková obrazovka je uzamknuta"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Obrazovka byla uzamknuta"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Obrazkova je zamknuta"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Obrazovka byla uzamknuta"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Obrazovka je odemknuta"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Opravdu se chcete odhlásit?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Touto akcí zavřete všechny otevřené aplikace"</string>
     <string name="user_logout" msgid="2934184154258330491">"Odhlásit se"</string>
     <string name="car_guest" msgid="768913000117469596">"Host"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Přepínání profilu…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Přidávání nového profilu…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Můžete přidat až <xliff:g id="USER_LIMIT">%d</xliff:g> profilů."</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Přidat nový profil?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Aby bylo možné pokračovat, uživatel <xliff:g id="USER_NAME">%1$s</xliff:g> se musí odhlásit z obrazovky <xliff:g id="SEAT_LOCATION">%2$s</xliff:g>"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Vyberte profil"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Přihlášeno"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Přihlášeno na obrazovce <xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Nový profil se nepodařilo přidat. Zkuste to později."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Profil hosta se nepodařilo spustit. Zkuste to později."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Odhlašování…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"Uživatel <xliff:g id="USER_NAME">%s</xliff:g> je odhlašován. Zkuste to později."</string>
     <string name="seat_driver" msgid="4502591979520445677">"řidiče"</string>
     <string name="seat_front" msgid="836133281052793377">"vpředu"</string>
     <string name="seat_rear" msgid="403133444964528577">"vzadu"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Zadání kódu PIN"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Zadejte gesto"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Zadejte heslo"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Klávesa Backspace"</string>
+    <string name="enter_key" msgid="747962923921283095">"Klávesa Enter"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Zpět"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Celá obrazovka"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index d378f4d7..13d4217d 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Afslut sessionen"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Ny profil"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Vil du tilføje en ny profil?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Når du har tilføjet en ny profil, kan kontoindehaveren tilpasse den."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Enhver profil kan installere en appopdatering, som derefter er tilgængelig for alle profiler."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Grænsen for antal profiler er nået"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Der kan kun oprettes én profil.}one{Du kan kun tilføje # profil.}other{Du kan kun tilføje # profiler.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Indlæser"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> er deaktiveret."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Brug <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"For apps, der har tilladelse"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Mikrofonindstillinger"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Privatlivsindstillinger"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> anvender <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> bruger mikrofonen"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> anvendte <xliff:g id="SENSOR">%2$s</xliff:g> for nylig"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Vil du aktivere bilens mikrofon?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Aktivér infotainmentsystemets mikrofon for at fortsætte. Denne handling aktiverer mikrofonen for alle apps, der har tilladelse"</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Kameraindstillinger"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> anvender kameraet"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> anvender kameraet"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> anvendte kameraet for nylig"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Medier"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Kontrolcenter"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistent"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Privatlivschip for mikrofon"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Brugeravatar"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Brugernavn (tekst)"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Sænk temperaturen"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Hæv temperaturen"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Bluetooth-indstilling: Ikke forbundet"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Lydindstillinger"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Indstillinger for profiler og konti"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Mønster understøtter ikke drejeinput – brug berøring"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Touchskærmen er låst"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Skærmen er blevet låst"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Din skærm er låst"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Skærmen er blevet låst"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Din skærm er nu låst op"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Er du sikker på, at du vil logge ud?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Dette vil lukke alle åbne apps"</string>
     <string name="user_logout" msgid="2934184154258330491">"Log ud"</string>
     <string name="car_guest" msgid="768913000117469596">"Gæst"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Skifter profil…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Ny profil tilføjes…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Du kan tilføje op til <xliff:g id="USER_LIMIT">%d</xliff:g> profiler"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Vil du tilføje en ny profil?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"For at fortsætte skal <xliff:g id="USER_NAME">%1$s</xliff:g> logge ud af skærmen ved <xliff:g id="SEAT_LOCATION">%2$s</xliff:g>"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Vælg profil for at starte"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Logget ind"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Logget ind på skærmen ved <xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Ny profil kan ikke tilføjes. Prøv igen senere."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Gæsteprofil kan ikke oprettes. Prøv igen senere."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Logger ud…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> logges ud. Prøv igen senere."</string>
     <string name="seat_driver" msgid="4502591979520445677">"chauffør"</string>
     <string name="seat_front" msgid="836133281052793377">"forside"</string>
     <string name="seat_rear" msgid="403133444964528577">"bagside"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Angiv din pinkode"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Angiv dit mønster"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Angiv din adgangskode"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Backspace-tast"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter-tast"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Tilbage"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Fuld skærm"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d5e67364..6f204b09 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Sitzung beenden"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Neues Profil"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Neues Profil hinzufügen?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Wenn du ein neues Profil hinzugefügt hast, kann es der Kontoinhaber personalisieren."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"App-Updates können über jedes Profil installiert werden und sind dann für alle Profile verfügbar."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Maximale Profilanzahl erreicht"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Du kannst maximal ein Profil erstellen.}other{Du kannst maximal # Profile hinzufügen.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Wird geladen"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> ist deaktiviert."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"<xliff:g id="SENSOR">%1$s</xliff:g> verwenden"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Für Apps mit Berechtigung"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Mikrofoneinstellungen"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Datenschutzeinstellungen"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> verwendet das <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> verwenden das Mikrofon"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> hat vor Kurzem das <xliff:g id="SENSOR">%2$s</xliff:g> verwendet"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Mikrofon des Fahrzeugs einschalten?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Wenn du fortfahren möchtest, aktiviere das Mikrofon des Infotainmentsystems. Dadurch wird das Mikrofon für alle Apps eingeschaltet, die eine Berechtigung haben."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Kameraeinstellungen"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> verwendet die Kamera"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> verwenden die Kamera"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> hat vor Kurzem die Kamera verwendet"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Medien"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Kontrollzentrum"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistant"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Datenschutz-Chip für Mikrofon"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Nutzeravatar"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Text für Nutzername"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Temperatur senken"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Temperatur erhöhen"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Bluetooth-Einstellung: Getrennt"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Toneinstellungen"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Profil- &amp; Kontoeinstellungen"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Dreheingabe nicht möglich, Touch nutzen"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Touchscreen gesperrt"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Dein Display wurde gesperrt"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Dein Bildschirm ist gesperrt"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Dein Display wurde gesperrt"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Dein Bildschirm ist jetzt entsperrt"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Möchtest du dich wirklich abmelden?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Dadurch werden alle geöffneten Apps geschlossen"</string>
     <string name="user_logout" msgid="2934184154258330491">"Abmelden"</string>
     <string name="car_guest" msgid="768913000117469596">"Gast"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Profil wird gewechselt..."</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Neues Profil wird hinzugefügt…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Du kannst maximal <xliff:g id="USER_LIMIT">%d</xliff:g> Profile hinzufügen"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Neues Profil hinzufügen?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Zum Fortfahren muss sich <xliff:g id="USER_NAME">%1$s</xliff:g> vom Bildschirm „<xliff:g id="SEAT_LOCATION">%2$s</xliff:g>“ abmelden"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Zum Starten Profil auswählen"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Angemeldet"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Auf dem Bildschirm „<xliff:g id="SEAT_LOCATION">%s</xliff:g>“ angemeldet"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Es konnte kein neues Profil hinzugefügt werden. Bitte versuche es später noch einmal."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Es konnte kein Gastprofil gestartet werden. Bitte versuche es später noch einmal."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Abmeldung erfolgt…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> wird abgemeldet. Bitte versuche es später noch einmal."</string>
     <string name="seat_driver" msgid="4502591979520445677">"Fahrer"</string>
     <string name="seat_front" msgid="836133281052793377">"vorne"</string>
     <string name="seat_rear" msgid="403133444964528577">"hinten"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"PIN eingeben"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Muster eingeben"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Passwort eingeben"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Rücktaste"</string>
+    <string name="enter_key" msgid="747962923921283095">"Schlüssel eingeben"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Zurück"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Vollbild"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 6d6c702e..4ed0eb0b 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Λήξη περιόδου σύνδεσης"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Νέο προφίλ"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Προσθήκη νέου προφίλ;"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Αφού προσθέσετε νέο προφίλ, ο κάτοχος λογαριασμού θα μπορεί να το προσαρμόσει."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Οποιοδήποτε προφίλ μπορεί να εγκατ. μια ενημέρ. εφαρμογής που θα είναι διαθέσιμη σε όλα τα προφίλ."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Συμπληρώθηκε το όριο προφίλ"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Είναι δυνατή η δημιουργία μόνο ενός προφίλ.}other{Μπορείτε να προσθέσετε έως # προφίλ.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Φόρτωση"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"Το <xliff:g id="SENSOR">%1$s</xliff:g> είναι ανενεργό."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Χρήση <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Για εφαρμογές που έχουν άδεια"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Ρυθμίσεις μικροφώνου"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Ρυθμίσεις απορρήτου"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"Η εφαρμογή <xliff:g id="APP">%1$s</xliff:g> χρησιμοποιεί το <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"Οι εφαρμογές <xliff:g id="APP_LIST">%s</xliff:g> χρησιμ. το μικρόφ."</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"Η εφαρμογή <xliff:g id="APP">%1$s</xliff:g> χρησιμοποίησε πρόσφατα το <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
@@ -47,8 +45,7 @@
     <string name="mic_privacy_chip_off_toast" msgid="8718743873640788032">"Το μικρόφωνο απενεργοποιήθηκε"</string>
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"ΟΚ"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Ενεργοποίηση μικροφώνου οχήματος;"</string>
-    <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Για να συνεχίσετε, ενεργοποιήστε το μικρόφωνο του συστήματος ενημέρωσης και ψυχαγωγίας. Με αυτήν την ενέργεια θα ενεργοποιηθεί το μικρόφωνο για όλες τις εφαρμογές που έχουν άδεια."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Ρυθμίσεις κάμερας"</string>
+    <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Για να συνεχίσετε, ενεργοποιήστε το μικρόφωνο του συστήματος ενημέρωσης και ψυχαγωγίας. Με αυτή την ενέργεια θα ενεργοποιηθεί το μικρόφωνο για όλες τις εφαρμογές που έχουν άδεια."</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"Η εφαρ. <xliff:g id="APP">%s</xliff:g> χρησιμοποιεί την κάμερα"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"Οι εφαρ. <xliff:g id="APP_LIST">%s</xliff:g> χρησιμοπ. την κάμερα"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"Η εφαρμογή <xliff:g id="APP">%s</xliff:g> χρησιμοποίησε πρόσφατα την κάμερα"</string>
@@ -57,7 +54,7 @@
     <string name="camera_privacy_chip_off_toast" msgid="7135472255099347229">"Η κάμερα απενεργοποιήθηκε"</string>
     <string name="camera_privacy_chip_dialog_ok" msgid="7285467760928137765">"OK"</string>
     <string name="sensor_privacy_start_use_camera_dialog_title" msgid="4787836783010823885">"Ενεργοποίηση κάμερας οχήματος;"</string>
-    <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7749639131326657668">"Για να συνεχίσετε, ενεργοποιήστε την κάμερα του συστήματος ενημέρωσης και ψυχαγωγίας. Με αυτήν την ενέργεια θα ενεργοποιηθεί η κάμερα για όλες τις εφαρμογές που έχουν άδεια."</string>
+    <string name="sensor_privacy_start_use_camera_dialog_content" msgid="7749639131326657668">"Για να συνεχίσετε, ενεργοποιήστε την κάμερα του συστήματος ενημέρωσης και ψυχαγωγίας. Με αυτή την ενέργεια θα ενεργοποιηθεί η κάμερα για όλες τις εφαρμογές που έχουν άδεια."</string>
     <string name="system_bar_home_label" msgid="8413273833405495948">"Αρχική οθόνη"</string>
     <string name="system_bar_phone_label" msgid="5664288201806823777">"Τηλέφωνο"</string>
     <string name="system_bar_applications_label" msgid="7081862804211786227">"Εφαρμογές"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Χάρτες"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Μέσα"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Κέντρο ελέγχου"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Βοηθός"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Τσιπ απορρήτου μικροφώνου"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Αvatar χρήστη"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Κείμενο ονόματος χρήστη"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Μείωση θερμοκρασίας"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Αύξηση θερμοκρασίας"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Ρύθμιση Bluetooth: Αποσυνδεδεμένο"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Ρυθμίσεις ήχου"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Ρυθμίσεις λογαριασμών και προφίλ"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Το μοτίβο δεν υποστ. περιστρ. Χρησ. αφή"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Κλειδωμένη οθόνη αφής"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Η οθόνη σας κλειδώθηκε"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Η οθόνη σας είναι κλειδωμένη"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Η οθόνη σας κλειδώθηκε"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Η οθόνη σας είναι ξεκλειδωμένη"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Είστε βέβαιοι ότι θέλετε να αποσυνδεθείτε;"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Με αυτή την ενέργεια θα κλείσουν όλες οι ανοικτές εφαρμογές"</string>
     <string name="user_logout" msgid="2934184154258330491">"Αποσύνδεση"</string>
     <string name="car_guest" msgid="768913000117469596">"Επισκέπτης"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Αλλαγή προφίλ…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Προσθήκη νέου προφίλ…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Μπορείτε να προσθέσετε έως <xliff:g id="USER_LIMIT">%d</xliff:g> προφίλ"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Προσθήκη νέου προφίλ;"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Για να συνεχίσετε, ο χρήστης <xliff:g id="USER_NAME">%1$s</xliff:g> θα πρέπει να αποσυνδεθεί από την οθόνη <xliff:g id="SEAT_LOCATION">%2$s</xliff:g>"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Επιλέξτε προφίλ για να ξεκινήσετε"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Έγινε σύνδεση"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Έγινε σύνδεση στην οθόνη <xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Δεν ήταν δυνατή η προσθήκη νέου προφίλ. Δοκιμάστε ξανά αργότερα."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Δεν ήταν δυνατή η εκκίνηση του προφίλ επισκέπτη. Δοκιμάστε ξανά αργότερα."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Πραγματοποιείται έξοδος…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"Γίνεται αποσύνδεση του χρήστη <xliff:g id="USER_NAME">%s</xliff:g>. Δοκιμάστε ξανά αργότερα."</string>
     <string name="seat_driver" msgid="4502591979520445677">"οδηγός"</string>
     <string name="seat_front" msgid="836133281052793377">"μπροστά"</string>
     <string name="seat_rear" msgid="403133444964528577">"πίσω"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Εισαγάγετε το PIN σας"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Εισαγάγετε το μοτίβο σας"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Εισαγάγετε κωδικό πρόσβασης"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Πλήκτρο Backspace"</string>
+    <string name="enter_key" msgid="747962923921283095">"Πλήκτρο Enter"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Πίσω"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Πλήρης οθόνη"</string>
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 45916991..a6c1b4d6 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -36,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> is off."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Use <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"For apps that have permission"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Microphone settings"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Privacy settings"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> is using the <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> are using the mic"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> used the <xliff:g id="SENSOR">%2$s</xliff:g> recently"</string>
@@ -46,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Turn on vehicle microphone?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"To continue, turn on the infotainment system microphone. This will turn on the microphone for all apps that have permission."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Camera settings"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> is using the camera"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> are using the camera"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> used the camera recently"</string>
@@ -64,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Media"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Control centre"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistant"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Mic privacy chip"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"User avatar"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"User name text"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Lower temperature"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Raise temperature"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Bluetooth setting: disconnected"</string>
@@ -88,8 +91,9 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Sound settings"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Profiles &amp; accounts settings"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Pattern does not support rotary; please use touch"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Touch screen locked"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Your screen has been locked"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Your screen is locked"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Your screen has been locked"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Your screen is now unlocked"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Are you sure that you want to log out?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"This will close all open applications"</string>
     <string name="user_logout" msgid="2934184154258330491">"Log out"</string>
@@ -119,4 +123,9 @@
     <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Enter your PIN"</string>
     <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Enter your pattern"</string>
     <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Enter your password"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Backspace key"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter key"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Back"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Full Screen"</string>
 </resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 689accb7..9824c283 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -36,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> is off."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Use <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"For apps that have permission"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Microphone settings"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Privacy settings"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> is using the <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> are using the mic"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> used the <xliff:g id="SENSOR">%2$s</xliff:g> recently"</string>
@@ -46,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Turn on vehicle microphone?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"To continue, turn on the infotainment system microphone. This will turn on the microphone for all apps that have permission."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Camera settings"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> is using the camera"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> are using the camera"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> used the camera recently"</string>
@@ -64,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Media"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Control Center"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistant"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Mic Privacy Chip"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"User Avatar"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"User Name Text"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Lower temperature"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Raise temperature"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Bluetooth Setting: Disconnected"</string>
@@ -88,8 +91,9 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Sound settings"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Profiles &amp; accounts settings"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Pattern does not support rotary; please use touch"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Touch screen locked"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Your screen has been locked"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Your screen is locked"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Your screen has been locked"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Your screen is now unlocked"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Are you sure you want to log out?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"This will close all open applications"</string>
     <string name="user_logout" msgid="2934184154258330491">"Log out"</string>
@@ -119,4 +123,9 @@
     <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Enter your PIN"</string>
     <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Enter your pattern"</string>
     <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Enter your password"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Backspace key"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter key"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Back"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Full Screen"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 45916991..a6c1b4d6 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -36,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> is off."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Use <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"For apps that have permission"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Microphone settings"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Privacy settings"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> is using the <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> are using the mic"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> used the <xliff:g id="SENSOR">%2$s</xliff:g> recently"</string>
@@ -46,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Turn on vehicle microphone?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"To continue, turn on the infotainment system microphone. This will turn on the microphone for all apps that have permission."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Camera settings"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> is using the camera"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> are using the camera"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> used the camera recently"</string>
@@ -64,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Media"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Control centre"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistant"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Mic privacy chip"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"User avatar"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"User name text"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Lower temperature"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Raise temperature"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Bluetooth setting: disconnected"</string>
@@ -88,8 +91,9 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Sound settings"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Profiles &amp; accounts settings"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Pattern does not support rotary; please use touch"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Touch screen locked"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Your screen has been locked"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Your screen is locked"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Your screen has been locked"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Your screen is now unlocked"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Are you sure that you want to log out?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"This will close all open applications"</string>
     <string name="user_logout" msgid="2934184154258330491">"Log out"</string>
@@ -119,4 +123,9 @@
     <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Enter your PIN"</string>
     <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Enter your pattern"</string>
     <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Enter your password"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Backspace key"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter key"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Back"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Full Screen"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 45916991..a6c1b4d6 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -36,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> is off."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Use <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"For apps that have permission"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Microphone settings"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Privacy settings"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> is using the <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> are using the mic"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> used the <xliff:g id="SENSOR">%2$s</xliff:g> recently"</string>
@@ -46,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Turn on vehicle microphone?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"To continue, turn on the infotainment system microphone. This will turn on the microphone for all apps that have permission."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Camera settings"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> is using the camera"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> are using the camera"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> used the camera recently"</string>
@@ -64,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Media"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Control centre"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistant"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Mic privacy chip"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"User avatar"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"User name text"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Lower temperature"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Raise temperature"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Bluetooth setting: disconnected"</string>
@@ -88,8 +91,9 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Sound settings"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Profiles &amp; accounts settings"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Pattern does not support rotary; please use touch"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Touch screen locked"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Your screen has been locked"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Your screen is locked"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Your screen has been locked"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Your screen is now unlocked"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Are you sure that you want to log out?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"This will close all open applications"</string>
     <string name="user_logout" msgid="2934184154258330491">"Log out"</string>
@@ -119,4 +123,9 @@
     <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Enter your PIN"</string>
     <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Enter your pattern"</string>
     <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Enter your password"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Backspace key"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter key"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Back"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Full Screen"</string>
 </resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index b9849efd..413641ff 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -36,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‎‎‏‏‎‎‏‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‎‎‎‎‏‏‎‎‎‎‎‎‏‏‎‎‎‏‏‏‎‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="SENSOR">%1$s</xliff:g>‎‏‎‎‏‏‏‎ is off.‎‏‎‎‏‎"</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‎‏‎‎‎‎‏‎‏‎‏‎‎‎‏‏‎‏‏‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‎‏‎‏‎‏‏‎‎‏‏‏‏‎‏‎‏‎Use ‎‏‎‎‏‏‎<xliff:g id="SENSOR">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‏‏‎‎‏‎‏‎‏‎‏‏‏‏‏‏‏‏‏‎‎For apps that have permission‎‏‎‎‏‎"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‏‎‏‎‏‎‏‎‎‎‎‏‎‏‎‎‎‎‏‎‏‎‎‏‏‏‎‎‎‏‎‎‎‏‏‏‏‏‏‎‎‏‎‎‏‎‎Microphone settings‎‏‎‎‏‎"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‏‏‎‎‎‎‎‎‎‏‏‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎Privacy settings‎‏‎‎‏‎"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‏‏‎‎‎‏‎‏‎‏‎‎‏‎‏‏‏‎‏‏‎‏‎‎‏‎‎‏‎‎‎‎‎‎‎‎‏‏‏‏‎‏‏‏‏‎‏‎‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="APP">%1$s</xliff:g>‎‏‎‎‏‏‏‎ is using the ‎‏‎‎‏‏‎<xliff:g id="SENSOR">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‎‎‏‏‎‏‎‏‏‎‏‏‏‎‏‎‏‎‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‏‎‎‏‏‎‎‏‎‎‏‎‎‏‏‎<xliff:g id="APP_LIST">%s</xliff:g>‎‏‎‎‏‏‏‎ are using the mic‎‏‎‎‏‎"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‎‏‎‏‎‏‏‏‎‏‎‎‏‏‎‏‎‎‏‏‎‎‏‎‎‏‏‎‏‎‎‎‎‎‏‎‏‎‏‏‏‎‏‎‎‏‎‎‎‎‎‎‏‎‎‏‎‎‏‏‎<xliff:g id="APP">%1$s</xliff:g>‎‏‎‎‏‏‏‎ used the ‎‏‎‎‏‏‎<xliff:g id="SENSOR">%2$s</xliff:g>‎‏‎‎‏‏‏‎ recently‎‏‎‎‏‎"</string>
@@ -46,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‎‏‏‏‎‎‏‎‎‎‏‎‎‎‏‏‏‏‎‎‏‎‏‎‏‎‏‎‏‎‏‏‎‏‏‏‏‎‏‎‏‏‎‏‎OK‎‏‎‎‏‎"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‏‎‎‎‏‏‎‎‎‎‏‎‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‏‏‎‏‎‎‎‏‎‎‎‏‏‏‏‏‏‎‎‏‎‎Turn on vehicle microphone?‎‏‎‎‏‎"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‎‎‏‎‏‎‏‎‎‏‎‏‏‎‎‎‏‏‏‏‎‎‏‎‏‏‎‎‏‏‏‎‏‎‏‎‎‎‏‎‎‏‏‎‏‎‎‎‏‎To continue, turn on the infotainment system microphone. This will turn on the microphone for all apps that have permission.‎‏‎‎‏‎"</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‏‎‎‏‎‎‎‏‏‏‎‎‏‎‎‏‏‎‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‎‎‏‏‎‎‎‎‎‏‎‏‎‏‎‎‎Camera settings‎‏‎‎‏‎"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‎‎‎‏‎‏‎‏‎‎‏‏‎‎‎‎‎‏‎‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="APP">%s</xliff:g>‎‏‎‎‏‏‏‎ is using the camera‎‏‎‎‏‎"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‏‎‏‎‏‎‎‏‎‏‎‏‏‎‎‏‎‏‏‎‎‎‏‎‏‏‎‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="APP_LIST">%s</xliff:g>‎‏‎‎‏‏‏‎ are using the camera‎‏‎‎‏‎"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎‏‏‎‎‎‎‏‏‎‎‏‏‎‎‎‏‎‏‏‎‏‎‎‎‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="APP">%s</xliff:g>‎‏‎‎‏‏‏‎ used the camera recently‎‏‎‎‏‎"</string>
@@ -64,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‏‏‏‎‏‎‏‏‏‎‎‎‎‏‏‎‏‏‏‎‏‏‎‎‏‏‎‏‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‎‎Maps‎‏‎‎‏‎"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‏‏‏‎‏‏‏‎‎‏‏‏‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‏‏‎‏‏‎‏‏‏‏‎‏‎‎‏‏‏‏‏‎Media‎‏‎‎‏‎"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‏‎‎‎‎‎‎‎‏‎‏‎‎‎‏‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‏‏‎‎‎‎‎‎‎‎‎‏‏‎‎Control Center‎‏‎‎‏‎"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‏‏‏‎‎‎‏‎‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‏‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‏‎‏‏‏‎‏‎‎‎‎‎‎Assistant‎‏‎‎‏‎"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‎‏‏‏‎‎‏‎‎‏‎‏‏‏‏‎‏‎‎‏‏‎‎‏‎‎‎‎‏‏‎‎‏‏‏‎‏‏‎‎‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎Mic Privacy Chip‎‏‎‎‏‎"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‏‎‏‏‏‎‎‏‏‎‎‎‎‏‎‎‎‏‎‎‎‏‏‎‎‏‏‏‎‎‏‎‏‏‎‏‏‎‎‏‎‏‏‏‏‎‏‎‏‎‎‏‎‎User Avatar‎‏‎‎‏‎"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‏‎‎‏‏‎‎‎‏‎‏‎‏‏‎‏‎‏‎‎‏‎‎‎‏‎‎User Name Text‎‏‎‎‏‎"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‎‏‏‏‎‎‎‏‏‎‎‎‎‏‏‎‏‏‏‎‎‎‎‏‏‏‎‎‎‎‏‏‎‎‎‎‏‏‎‎‏‏‎‏‎‎‏‎‎‏‎‏‏‎‎Lower temperature‎‏‎‎‏‎"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‎‏‏‎‎‏‎‏‏‏‎‎‎‎Raise temperature‎‏‎‎‏‎"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‎‎‎‎‎‎‎‎‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‏‎‏‎‏‏‎‏‎‎‏‏‎‏‏‎‎‏‎‎‏‎‎‎‏‎‎‎‏‎‎Bluetooth Setting: Disconnected‎‏‎‎‏‎"</string>
@@ -88,8 +91,9 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‎‎‏‏‎‎‏‏‎‏‏‎‎‏‏‎‏‎‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‎‏‏‏‎‎‏‎Sound settings‎‏‎‎‏‎"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‎‎‏‏‎‎‎‎‏‏‎‏‏‎‎‎‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‎‎‎‎‏‏‎‏‎‎‏‎‎‏‏‎‎‎‎Profiles &amp; accounts settings‎‏‎‎‏‎"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‎‏‏‏‎‏‏‎‎‎‏‎‏‎‏‏‏‎‎‏‏‏‎‎‏‎‏‎‎‏‎‏‎‏‎‎‎‏‏‎‏‎‎‎Pattern does not support rotary; please use touch‎‏‎‎‏‎"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‎‎‏‏‏‎‎‎‏‏‎‏‎‏‎‏‏‏‎‏‎‎‎‏‎‎‏‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‏‎‏‏‏‎‎Touch screen locked‎‏‎‎‏‎"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎‎‏‎‏‎‏‎‎‎‎‏‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‎‏‏‎‎‎‏‏‏‎‏‏‏‎‏‎‎‎‎‏‎‎‎‎Your screen has been locked‎‏‎‎‏‎"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‎‏‏‎‎‎‎‏‏‎‏‎‎‎‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‏‎‏‏‏‏‎‏‎Your screen is locked‎‏‎‎‏‎"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎‎‎‏‏‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‎‎‎‏‎‎‏‎‏‎‏‎‏‏‎‎Your screen has been locked‎‏‎‎‏‎"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‎‎‎‏‎‎‏‏‏‎‏‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‎‎‏‎‎‎‎‏‏‎‎‎‎Your screen is now unlocked‎‏‎‎‏‎"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‎‏‏‏‏‎‏‏‎‎‏‎‏‏‎‎‏‎‎‎‎‏‎‏‏‏‎‎‏‎‏‎‎‎‏‎‎‎‏‎‎‏‏‏‏‎‏‏‏‏‎‎‏‎Are you sure you want to log out?‎‏‎‎‏‎"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎‏‏‎‏‏‎‎‏‎‎‏‏‎‎‏‎‏‎‎‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‎‏‎‎‎‏‏‎‏‎‏‎‎‎‎‎This will close all open applications‎‏‎‎‏‎"</string>
     <string name="user_logout" msgid="2934184154258330491">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‎‎‎‎‏‏‏‏‎‎‎‏‎‎‏‏‏‏‎‎‎‎‏‎‎‏‎‏‏‏‎‏‎‎‏‏‎‏‏‏‏‎‏‏‎Log out‎‏‎‎‏‎"</string>
@@ -119,4 +123,9 @@
     <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‏‎‏‏‎‏‎‏‏‎‏‎‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‎‏‎‎‏‏‎‎‏‏‏‏‏‎‎‏‏‏‎‎‎‏‎‎‎Enter your PIN‎‏‎‎‏‎"</string>
     <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‎‎‎‏‏‏‎‎‏‎‏‎‏‏‎‏‏‏‎‏‏‎‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‏‏‎‏‎‏‏‎‎‎‏‎‎‏‏‎‎Enter your pattern‎‏‎‎‏‎"</string>
     <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‏‏‎‎‎‏‏‏‏‎‎‎‏‏‎‏‏‏‏‎‏‎‎‏‏‏‎‏‎‏‏‏‏‎‏‎‎‏‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎Enter your password‎‏‎‎‏‎"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‎‏‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎‏‏‏‏‎‎‎‎‏‏‎‏‎‎‎Backspace key‎‏‎‎‏‎"</string>
+    <string name="enter_key" msgid="747962923921283095">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‎‎‎‏‎‏‎‎‏‏‎‎‎‏‎‏‎‎‎‏‎‎‎‎‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‎‏‎‏‏‏‎Enter key‎‏‎‎‏‎"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‏‎‎‏‏‎‏‎‏‎‎‏‏‏‎‎‎‏‎‏‎‏‏‎‏‎‏‏‎‏‎‏‎‏‎‏‏‏‎‎‎‏‏‎‎‎‎‏‎‎‎‎‏‎intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end‎‏‎‎‏‎"</string>
+    <string name="back_btn" msgid="7774349944465667391">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‎‎‎‎‏‎‏‎‎‎‎‏‎‏‎‏‏‎‎‎‏‏‏‏‎‏‏‏‎‏‎‎‎‎‏‏‎‏‎‏‎‎‏‏‏‏‏‏‎Back‎‏‎‎‏‎"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‏‎‏‎‎‎‏‏‎‏‎‏‏‎‎‎‎‏‏‎‎‏‏‎‎‎‎‏‎‏‎‎‎‎‏‎‏‏‎‎‏‏‎‎‏‎‎‏‎‎‎Full Screen‎‏‎‎‏‎"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 2b9a1839..b47bfd16 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Finalizar sesión"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Perfil nuevo"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"¿Agregar un perfil nuevo?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Después de que agregas un perfil nuevo, el titular de la cuenta puede personalizarlo."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Cualquier perfil puede instalar actual. de apps, que estarán disponibles para todos los perfiles."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Se alcanzó el límite de perfiles"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Solo se puede crear un perfil.}other{Puedes agregar hasta # perfiles.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Cargando"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"Se desactivó <xliff:g id="SENSOR">%1$s</xliff:g>."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Usar <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Para apps que tienen permiso"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Configuración del micrófono"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Configuración de privacidad"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> está usando <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> están usando el micrófono"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> usó <xliff:g id="SENSOR">%2$s</xliff:g> recientemente"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"Aceptar"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"¿Quieres activar el micrófono del vehículo?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Para continuar, activa el micrófono del sistema de infoentretenimiento. Se activará el micrófono para todas las apps que tengan permiso."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Configuración de cámara"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> está usando la cámara"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> están usando la cámara"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> usó la cámara recientemente"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Mapas"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Contenido multimedia"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Centro de control"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Asistente"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Chip de privacidad del micrófono"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Avatar de usuario"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Texto de nombre de usuario"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Disminuir la temperatura"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Aumentar la temperatura"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Configuración de Bluetooth: Desconectado"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Configuración de sonido"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Configuración de perfiles y cuentas"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"No se admite patrón rotativo; usa táctil"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Pantalla táctil bloqueada"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Se bloqueó la pantalla"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Tu pantalla está bloqueada"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Se bloqueó la pantalla"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Tu pantalla ahora está desbloqueada"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"¿Confirmas que quieres salir?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Se cerrarán todas las aplicaciones abiertas"</string>
     <string name="user_logout" msgid="2934184154258330491">"Salir"</string>
     <string name="car_guest" msgid="768913000117469596">"Invitado"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Cambiando de perfil…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Agregando perfil nuevo…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Puedes agregar hasta <xliff:g id="USER_LIMIT">%d</xliff:g> perfiles"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"¿Quieres agregar un perfil nuevo?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Para continuar, <xliff:g id="USER_NAME">%1$s</xliff:g> debe salir de la pantalla de <xliff:g id="SEAT_LOCATION">%2$s</xliff:g>"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Para comenzar, selecciona un perfil"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Accediste"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Accediste en la pantalla de <xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"No se puede agregar un perfil nuevo. Vuelve a intentarlo más tarde."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"No se puede iniciar el perfil de invitado. Vuelve a intentarlo más tarde."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Saliendo…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> está saliendo. Vuelve a intentarlo más tarde."</string>
     <string name="seat_driver" msgid="4502591979520445677">"conductor"</string>
     <string name="seat_front" msgid="836133281052793377">"parte frontal"</string>
     <string name="seat_rear" msgid="403133444964528577">"parte posterior"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Ingresa tu PIN"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Ingresa tu patrón"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Ingresa tu contraseña"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Tecla de retroceso"</string>
+    <string name="enter_key" msgid="747962923921283095">"Tecla Intro"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Atrás"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Pantalla completa"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 714f26fe..3f8297c8 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Finalizar sesión"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Perfil nuevo"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"¿Añadir perfil nuevo?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Después de añadir un nuevo perfil, el titular de la cuenta puede personalizarlo."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Cualquier perfil puede instalar actualizaciones de aplicaciones, que estarán disponible para todos."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Límite de perfiles alcanzado"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Solo se puede crear un perfil.}other{Puedes crear # perfiles como máximo.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Cargando"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> se ha desactivado."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Usar <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Para aplicaciones que tienen permiso"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Ajustes del micrófono"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Configuración de privacidad"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> está usando: <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> están usando el micrófono"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> ha usado recientemente: <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"Aceptar"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"¿Activar el micrófono del vehículo?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Para continuar, activa el sistema de infoentretenimiento del micrófono. Este sistema activará el micrófono en todas las aplicaciones que tengan permiso."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Ajustes de la cámara"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> está usando la cámara"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> están usando la cámara"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> ha usado la cámara recientemente"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Mapas"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Multimedia"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Centro de control"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Asistente"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Chip de privacidad del micrófono"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Avatar de usuario"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Texto del nombre de usuario"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Bajar temperatura"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Subir temperatura"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Ajuste de Bluetooth: desconectado"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Ajustes de sonido"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Ajustes de perfiles y de cuentas"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"No puede usarse patrón de rotación; usa uno táctil"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Pantalla táctil bloqueada"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Se ha bloqueado tu pantalla"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Tu pantalla está bloqueada"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Se ha bloqueado tu pantalla"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Tu pantalla ahora está desbloqueada"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"¿Seguro que quieres cerrar sesión?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Se cerrarán todas las aplicaciones abiertas"</string>
     <string name="user_logout" msgid="2934184154258330491">"Cerrar sesión"</string>
     <string name="car_guest" msgid="768913000117469596">"Invitado"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Cambiando perfil…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Añadiendo nuevo perfil…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Puedes crear <xliff:g id="USER_LIMIT">%d</xliff:g> perfiles como máximo"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"¿Añadir perfil nuevo?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Para continuar, <xliff:g id="USER_NAME">%1$s</xliff:g> debe cerrar la sesión de la pantalla de <xliff:g id="SEAT_LOCATION">%2$s</xliff:g>"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Selecciona un perfil para empezar"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Sesión iniciada"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Sesión iniciada en la pantalla de <xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"No se puede añadir un nuevo perfil. Inténtalo de nuevo más tarde."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"No se puede iniciar el perfil de invitado. Inténtalo de nuevo más tarde."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Cerrando sesión…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> está cerrando sesión. Inténtalo de nuevo más tarde."</string>
     <string name="seat_driver" msgid="4502591979520445677">"del conductor"</string>
     <string name="seat_front" msgid="836133281052793377">"delantero"</string>
     <string name="seat_rear" msgid="403133444964528577">"trasero"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Introduce tu PIN"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Introduce tu patrón"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Introduce tu contraseña"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Tecla Retroceso"</string>
+    <string name="enter_key" msgid="747962923921283095">"Tecla Intro"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Atrás"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Pantalla completa"</string>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index f9d9ebac..e71e8856 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -36,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> on välja lülitatud."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Kasuta järgmist: <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Rakendustele, millel on luba"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Mikrofoni seaded"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Privaatsusseaded"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> kasutab järgmist: <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"Rakendused <xliff:g id="APP_LIST">%s</xliff:g> kasutavad mikrofoni"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> kasutas hiljuti järgmist: <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
@@ -46,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Kas lülitada sõiduki mikrofon sisse?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Jätkamiseks lülitage teabe ja meelelahutuse süsteemi mikrofon sisse. See lülitab mikrofoni sisse kõigi rakenduste jaoks, millel on luba."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Kaamera seaded"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> kasutab kaamerat"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> kasutavad kaamerat"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> kasutas hiljuti kaamerat"</string>
@@ -64,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Meedia"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Juhtimiskeskus"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistent"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Mikrofoni privaatsuse laast"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Kasutaja avatar"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Kasutajanime tekst"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Vähenda temperatuuri"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Tõsta temperatuuri"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Bluetoothi seade: ühenduseta"</string>
@@ -88,8 +91,9 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Heliseaded"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Profiili- ja kontoseaded"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Muster ei toeta pöördvalijat, kasutage puudutust."</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Puuteekraan on lukustatud"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Teie ekraan on lukustatud"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Teie ekraan on lukus"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Teie ekraanikuva on lukustatud"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Teie ekraan on nüüd võrgulukuta"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Kas soovite kindlasti välja logida?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Sellega suletakse kõik avatud rakendused"</string>
     <string name="user_logout" msgid="2934184154258330491">"Logi välja"</string>
@@ -119,4 +123,9 @@
     <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Sisestage PIN-kood"</string>
     <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Sisestage muster"</string>
     <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Sisestage parool"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Tagasilükkeklahv"</string>
+    <string name="enter_key" msgid="747962923921283095">"Sisestusklahv"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Tagasi"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Täisekraan"</string>
 </resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 36824b7b..b90d3281 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Amaitu saioa"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Profil berria"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Beste profil bat gehitu nahi duzu?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Profil berri bat gehitu ondoren, kontuaren jabeak pertsonalizatu egin dezake."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Edozein profilek instala ditzake aplikazio-eguneratzeak eta, guztiek izango dituzte erabilgarri."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Profilen mugara iritsi zara"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Profil bakarra sor daiteke.}other{Gehienez # profil gehi daitezke.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Kargatzen"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> desaktibatuta dago."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Erabili <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Baimena duten aplikazioekin"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Mikrofonoaren ezarpenak"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Pribatutasun-ezarpenak"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> <xliff:g id="SENSOR">%2$s</xliff:g> erabiltzen ari da"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> mikrofonoa erabiltzen ari dira"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> aplikazioak <xliff:g id="SENSOR">%2$s</xliff:g> erabili du duela gutxi"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"Ados"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Ibilgailuaren mikrofonoa aktibatu nahi duzu?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Aurrera egiteko, aktibatu informazio- eta aisia-sistemaren mikrofonoa. Horrela, mikrofonoa aktibatuta izango dute hura erabiltzeko baimena daukaten aplikazio guztiek."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Kameraren ezarpenak"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> kamera erabiltzen ari da"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> kamera erabiltzen ari dira"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> aplikazioak kamera erabili du duela gutxi"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Multimedia-edukia"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Kontrol-zentroa"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Laguntzailea"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Mikrofonoaren pribatutasunari buruzko pilula"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Erabiltzailearen abatarra"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Erabiltzaile-izenaren testua"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Jaitsi tenperatura"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Igo tenperatura"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Bluetootharen ezarpena: deskonektatuta"</string>
@@ -74,7 +75,7 @@
     <string name="status_icon_signal_mobile" msgid="7264721079060179783">"Seinalearen ezarpenak: datu-konexioa erabiltzen"</string>
     <string name="status_icon_signal_wifi" msgid="1257569337648058522">"Seinalearen ezarpenak: wifia aktibatuta"</string>
     <string name="status_icon_signal_hotspot" msgid="1023039120452006880">"Seinalearen ezarpenak: wifi-gunea aktibatuta"</string>
-    <string name="status_icon_display_status" msgid="2970020923181359144">"Bistaratze-aukerak"</string>
+    <string name="status_icon_display_status" msgid="2970020923181359144">"Bistaratze-ezarpenak"</string>
     <string name="status_icon_drive_mode" msgid="3938622431486261076">"Gidatze modua"</string>
     <string name="activity_blocked_text" msgid="5353157279548801554">"Ezin duzu erabili eginbidea gidatu bitartean"</string>
     <string name="exit_button_close_application" msgid="112227710467017144">"Itxi aplikazioa"</string>
@@ -86,41 +87,30 @@
     <string name="qc_footer_settings" msgid="5471523941092316743">"Ezarpenak"</string>
     <string name="qc_footer_bluetooth_settings" msgid="2870204430643762847">"Bluetootharen ezarpenak"</string>
     <string name="qc_footer_network_internet_settings" msgid="2480582764252681575">"Sareen eta Interneten ezarpenak"</string>
-    <string name="qc_footer_display_settings" msgid="2950539240110437704">"Bistaratze-aukerak"</string>
+    <string name="qc_footer_display_settings" msgid="2950539240110437704">"Bistaratze-ezarpenak"</string>
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Soinuaren ezarpenak"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Profilen eta kontuen ezarpenak"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Ezin da erabili biratze bidezko idazketa; erabili ukipen-keinuak"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Blokeatu da ukipen-pantaila"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Blokeatu da pantaila"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Pantaila blokeatuta dago"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Blokeatu da pantaila"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Pantaila desblokeatuta dago orain"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Ziur saioa amaitu nahi duzula?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Irekitako aplikazio guztiak itxiko dira"</string>
     <string name="user_logout" msgid="2934184154258330491">"Amaitu saioa"</string>
     <string name="car_guest" msgid="768913000117469596">"Gonbidatua"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Profila aldatzen…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Profil berria gehitzen…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"<xliff:g id="USER_LIMIT">%d</xliff:g> profil gehi daitezke gehienez"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Beste profil bat gehitu nahi duzu?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Aurrera egiteko, <xliff:g id="SEAT_LOCATION">%2$s</xliff:g> esertzen den tokiko pantailako saioa amaitu behar du <xliff:g id="USER_NAME">%1$s</xliff:g> erabiltzaileak"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Hautatu abiarazi nahi duzun profila"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Saioa hasita"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"<xliff:g id="SEAT_LOCATION">%s</xliff:g> esertzen den tokian saioa hasita"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Ezin da gehitu profil berria. Saiatu berriro geroago."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Ezin da abiarazi gonbidatu-profila. Saiatu berriro geroago."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Saioa amaitzen…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> erabiltzailearen saioa amaitzen. Saiatu berriro geroago."</string>
     <string name="seat_driver" msgid="4502591979520445677">"gidaria"</string>
     <string name="seat_front" msgid="836133281052793377">"aurrekoa"</string>
     <string name="seat_rear" msgid="403133444964528577">"atzekoa"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Idatzi PINa"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Marraztu eredua"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Idatzi pasahitza"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Atzera tekla"</string>
+    <string name="enter_key" msgid="747962923921283095">"\"Sartu\" tekla"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Atzera"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Pantaila osoa"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 566b79ae..2f67646d 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"پایان جلسه"</string>
     <string name="car_new_user" msgid="6766334721724989964">"نمایه جدید"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"نمایه جدید اضافه شود؟"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"پس‌از افزودن نمایه جدید، دارنده حساب می‌تواند آن را سفارشی‌سازی کند."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"هر نمایه‌ای می‌تواند به‌روزرسانی برنامه نصب کند و پس‌از آن برای همه نمایه‌ها دردسترس خواهد بود."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"تعداد نمایه به حد مجاز رسیده است"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{فقط یک نمایه می‌توانید بسازید.}one{می‌توانید تا # نمایه اضافه کنید.}other{می‌توانید تا # نمایه اضافه کنید.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"درحال بارگیری"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> خاموش است."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"استفاده از <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"برای برنامه‌هایی که اجازه دارند"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"تنظیمات میکروفون"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"تنظیمات حریم خصوصی"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> درحال استفاده از <xliff:g id="SENSOR">%2$s</xliff:g> است"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> از میکروفون استفاده می‌کنند"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> اخیراً از <xliff:g id="SENSOR">%2$s</xliff:g> استفاده کرده است"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"تأیید"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"میکروفون خودرو روشن شود؟"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"برای ادامه، میکروفون سیستم اطلاعات-سرگرمی را روشن کنید. با این کار، میکروفون برای همه برنامه‌هایی که اجازه دارند روشن خواهد شد."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"تنظیمات دوربین"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> درحال استفاده از دوربین است"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> درحال استفاده از دوربین هستند"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> اخیراً از دوربین استفاده کرده است"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"نقشه‌ها"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"رسانه"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"مرکز کنترل"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"دستیار"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"تراشه حریم خصوصی میکروفون"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"چهره‌نمای کاربر"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"نوشتار نام کاربری"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"کاهش دما"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"افزایش دما"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"تنظیم بلوتوث: متصل نیست"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"تنظیمات صدا"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"تنظیمات حساب و نمایه"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"الگو از چرخش پشتیبانی نمی‌کند، لطفاً لمس کنید"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"صفحه لمسی قفل است"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"صفحه‌نمایش قفل شده است"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"صفحه شما قفل است"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"صفحه‌نمایش قفل شده است"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"اکنون قفل صفحه شما باز است"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"مطمئنید می‌خواهید از سیستم خارج شوید؟"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"با این کار همه برنامه‌های باز بسته خواهد شد"</string>
     <string name="user_logout" msgid="2934184154258330491">"خروج از سیستم"</string>
     <string name="car_guest" msgid="768913000117469596">"مهمان"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"درحال عوض کردن نمایه…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"درحال افزودن نمایه جدید…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"می‌توانید حداکثر <xliff:g id="USER_LIMIT">%d</xliff:g> نمایه اضافه کنید"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"نمایه جدید اضافه شود؟"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"برای ادامه، <xliff:g id="USER_NAME">%1$s</xliff:g> باید از سیستم صفحه <xliff:g id="SEAT_LOCATION">%2$s</xliff:g> خارج شود"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"نمایه‌ای را برای شروع انتخاب کنید"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"به سیستم واردشده"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"واردشده به سیستم در صفحه <xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"نمایه جدید اضافه نشد. بعداً دوباره امتحان کنید."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"«نمایه مهمان» شروع نشد. بعداً دوباره امتحان کنید."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"درحال خروج از سیستم…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> درحال خروج از سیستم است. بعداً دوباره امتحان کنید."</string>
     <string name="seat_driver" msgid="4502591979520445677">"راننده"</string>
     <string name="seat_front" msgid="836133281052793377">"جلو"</string>
     <string name="seat_rear" msgid="403133444964528577">"عقب"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"پین خودتان را وارد کنید"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"الگویتان را وارد کنید"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"گذرواژه را وارد کنید"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"کلید پس‌بَر"</string>
+    <string name="enter_key" msgid="747962923921283095">"کلید ورود"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"برگشتن"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"تمام صفحه"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 4f763589..849a5645 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Lopeta istunto"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Uusi profiili"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Lisätäänkö uusi profiili?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Kun olet lisännyt uuden profiilin, tilin omistaja voi muokata sitä."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Kaikilla profiileilla voi asentaa sovelluspäivityksen, joka tulee kaikkien profiilien saataville."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Profiiliraja saavutettu"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Voit luoda vain yhden profiilin.}other{Voit lisätä enintään # profiilia.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Ladataan"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> ei ole päällä."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Valitse <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Sovelluksissa, joilla on lupa"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Mikrofonin asetukset"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Yksityisyysasetukset"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> käyttää tätä: <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> käyttävät mikrofonia"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> käytti äskettäin tätä: <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Laitetaanko ajoneuvon mikrofoni päälle?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Laita infotainment-järjestelmän mikrofoni päälle, niin voit jatkaa. Mikrofoni laitetaan päälle kaikissa sovelluksissa, joilla on lupa."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Kameran asetukset"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> käyttää kameraa"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> käyttävät kameraa"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> käytti kameraa äskettäin"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Media"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Hallintakeskus"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistant"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Mikrofonin yksityisyysvalitsin"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Käyttäjän avatar"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Käyttäjän nimi (teksti)"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Laske lämpötilaa"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Nosta lämpötilaa"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Bluetooth-asetus: Ei yhdistetty"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Ääniasetukset"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Profiili- ja tiliasetukset"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Kuvio ei tue kiertoa –käytä kosketusta"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Kosketusnäyttö on lukittu"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Näyttö on lukittu"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Näyttösi on lukittu"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Näyttö on lukittu"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Näyttösi lukitus on avattu"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Haluatko varmasti kirjautua ulos?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Tämä sulkee kaikki avoinna olevat sovellukset"</string>
     <string name="user_logout" msgid="2934184154258330491">"Kirjaudu ulos"</string>
     <string name="car_guest" msgid="768913000117469596">"Vieras"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Vaihdetaan profiilia…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Lisätään uutta profiilia…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Voit lisätä enintään <xliff:g id="USER_LIMIT">%d</xliff:g> profiilia"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Lisätäänkö uusi profiili?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Jatkaminen edellyttää, että <xliff:g id="USER_NAME">%1$s</xliff:g> kirjautuu ulos näytöltä: <xliff:g id="SEAT_LOCATION">%2$s</xliff:g>"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Aloita valitsemalla profiili"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Kirjautuneena sisään"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Kirjautuneena näytölle: <xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Uutta profiilia ei voi lisätä. Yritä myöhemmin uudelleen."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Vierasprofiilia ei voi käynnistää. Yritä myöhemmin uudelleen."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Kirjaudutaan ulos…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> kirjataan ulos. Yritä myöhemmin uudelleen."</string>
     <string name="seat_driver" msgid="4502591979520445677">"kuljettajan paikalla"</string>
     <string name="seat_front" msgid="836133281052793377">"edessä"</string>
     <string name="seat_rear" msgid="403133444964528577">"takana"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Lisää PIN-koodi"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Piirrä kuvio"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Lisää salasana"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Askelpalautin"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Takaisin"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Koko näyttö"</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 71cda034..d94f27d8 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Fermer la session"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Nouveau profil"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Ajouter un profil?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Une fois que vous avez ajouté un profil, le titulaire du compte peut le personnaliser."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Tout profil peut installer une mise à jour de l\'application, qui sera accessible à tous les profils."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Nombre maximal de profils atteint"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Un seul profil peut être créé.}one{Vous pouvez ajouter jusqu\'à # profil.}other{Vous pouvez ajouter jusqu\'à # profils.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Chargement en cours…"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"Le capteur <xliff:g id="SENSOR">%1$s</xliff:g> est désactivé."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Utiliser <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Pour les applications qui ont l\'autorisation"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Paramètres du microphone"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Paramètres de confidentialité"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> utilise le capteur <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> utilisent le micro"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> a récemment utilisé le capteur <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Activer le microphone du véhicule?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Pour continuer, activez le microphone du système d\'infodivertissement. Cette action activera le microphone pour toutes les applications qui ont l\'autorisation."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Paramètres de la caméra"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> utilise la caméra"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> utilisent la caméra"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> a récemment utilisé la caméra"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Contenu multimédia"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Centre de contrôle"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistant"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Puce de confidentialité pour microphone"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Avatar de l\'utilisateur"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Texte du nom d\'utilisateur"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Réduire la température"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Augmenter la température"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Paramètre Bluetooth : déconnecté"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Paramètres sonores"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Paramètres des profils et des comptes"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Schéma prend pas en charge la rotation, utilisez le toucher"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Écran tactile verrouillé"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Votre écran a été verrouillé"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Votre écran est verrouillé"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Votre écran a été verrouillé"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Votre écran est maintenant déverrouillé"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Voulez-vous vraiment vous déconnecter?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Toutes les applications ouvertes seront fermées"</string>
     <string name="user_logout" msgid="2934184154258330491">"Se déconnecter"</string>
     <string name="car_guest" msgid="768913000117469596">"Invité"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Changement de profil en cours…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Ajout d\'un profil en cours…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Vous pouvez ajouter jusqu\'à <xliff:g id="USER_LIMIT">%d</xliff:g> profils"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Ajouter un profil?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Pour continuer, <xliff:g id="USER_NAME">%1$s</xliff:g> doit se déconnecter de l\'écran du <xliff:g id="SEAT_LOCATION">%2$s</xliff:g>"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Sélectionner un profil pour commencer"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Connecté"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Connecté à l\'écran du <xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Impossible d\'ajouter un profil. Réessayez plus tard."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Impossible de lancer le profil d\'invité. Réessayez plus tard."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Déconnexion en cours…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"Déconnexion de <xliff:g id="USER_NAME">%s</xliff:g> en cours… Réessayez plus tard."</string>
     <string name="seat_driver" msgid="4502591979520445677">"conducteur"</string>
     <string name="seat_front" msgid="836133281052793377">"avant"</string>
     <string name="seat_rear" msgid="403133444964528577">"arrière"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Entrez votre NIP"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Entrez votre schéma"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Entrez votre mot de passe"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Touche Retour arrière"</string>
+    <string name="enter_key" msgid="747962923921283095">"Touche Entrée"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Retour"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Plein écran"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index be665c77..044bfc2f 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Fermer la session"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Nouveau profil"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Ajouter un profil ?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Lorsque vous avez ajouté un profil, le titulaire du compte peut le personnaliser."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Tout profil peut installer une mise à jour d\'appli, qui sera ensuite disponible pour tous les profils."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Nombre maximal de profils atteint"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Vous ne pouvez créer qu\'un seul profil.}one{Vous ne pouvez ajouter que # profil.}other{Vous pouvez ajouter jusqu\'à # profils.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Chargement…"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> est désactivé."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Utiliser <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Pour les applis qui ont l\'autorisation"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Paramètres du micro"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Paramètres de confidentialité"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> utilise <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> utilisent le micro"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> a utilisé <xliff:g id="SENSOR">%2$s</xliff:g> récemment"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Activer le micro du véhicule ?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Pour continuer, activez le micro du système d\'infoloisirs. Cela activera le micro pour toutes les applis qui ont l\'autorisation."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Paramètres de la caméra"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> utilise la caméra"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> utilisent la caméra"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> a utilisé la caméra récemment"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Médias"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Centre de contrôle"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistant"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Puce électronique de protection de la vie privée du micro"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Avatar de l\'utilisateur"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Nom d\'utilisateur"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Réduire la température"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Augmenter la température"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Paramètre Bluetooth : déconnecté"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Paramètres audio"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Paramètres des profils et comptes"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Schéma incompat. avec dispositif rotatif, appuyez"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Écran tactile verrouillé"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Votre écran a été verrouillé"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Votre écran est verrouillé"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Votre écran a été verrouillé"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Votre écran est désormais déverrouillé"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Voulez-vous vraiment vous déconnecter ?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Toutes les applications ouvertes seront fermées"</string>
     <string name="user_logout" msgid="2934184154258330491">"Se déconnecter"</string>
     <string name="car_guest" msgid="768913000117469596">"Invité"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Changement de profil…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Ajout du profil…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Vous pouvez ajouter jusqu\'à <xliff:g id="USER_LIMIT">%d</xliff:g> profils"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Ajouter un profil ?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Pour continuer, <xliff:g id="USER_NAME">%1$s</xliff:g> doit se déconnecter de l\'écran <xliff:g id="SEAT_LOCATION">%2$s</xliff:g>"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Saisissez un profil pour commencer"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Connecté"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Connecté sur l\'écran <xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Impossible d\'ajouter le profil. Réessayez plus tard."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Impossible de lancer le profil invité. Réessayez plus tard."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Déconnexion…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> est en cours de déconnexion. Réessayez plus tard."</string>
     <string name="seat_driver" msgid="4502591979520445677">"conducteur"</string>
     <string name="seat_front" msgid="836133281052793377">"avant"</string>
     <string name="seat_rear" msgid="403133444964528577">"arrière"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Saisissez votre code"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Saisissez votre schéma"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Saisissez votre mot de passe"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Touche Retour arrière"</string>
+    <string name="enter_key" msgid="747962923921283095">"Touche Entrée"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Retour"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Plein écran"</string>
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index b5a8da59..1efa31c7 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Finalizar sesión"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Novo perfil"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Queres engadir un novo perfil?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Cando engadas un novo perfil, o titular da conta poderá personalizalo."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Calquera perfil pode instalar actualizacións de apps e estarán dispoñibles para todos os perfís."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Alcanzouse o límite de perfís"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Só se pode crear 1 perfil.}other{Podes engadir ata # perfís.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Cargando"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g>: desactivouse."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Usar <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Para as aplicacións que teñan permiso"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Configuración do micrófono"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Configuración de privacidade"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> está utilizando o <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> están usando o micrófono"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> usou o <xliff:g id="SENSOR">%2$s</xliff:g> recentemente"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"Aceptar"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Queres activar o micrófono do vehículo?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Para continuar, activa o micrófono do sistema de información e entretemento. Con esta acción, activarase o micrófono para todas as aplicacións que teñan permiso."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Configuración da cámara"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> está usando a cámara"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> están usando a cámara"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> usou a cámara recentemente"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Contido multimedia"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Centro de control"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Asistente"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Chip de privacidade do micrófono"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Avatar de usuario"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Texto do nome de usuario"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Baixar a temperatura"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Subir a temperatura"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Opción de configuración de Bluetooth: desconectada"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Configuración de son"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Configuración de perfís e contas"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Manexo xiratorio incompatible; usa padrón táctil"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Bloqueouse a pantalla táctil"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Bloqueouse a túa pantalla"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"A túa pantalla está bloqueada"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Bloqueouse a túa pantalla"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"A túa pantalla agora está desbloqueada"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Seguro que queres pechar sesión?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Ao realizar esta acción, pecharanse todas as aplicacións abertas"</string>
     <string name="user_logout" msgid="2934184154258330491">"Pechar sesión"</string>
     <string name="car_guest" msgid="768913000117469596">"Convidado"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Cambiando de perfil…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Engadindo novo perfil…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Podes engadir ata <xliff:g id="USER_LIMIT">%d</xliff:g> perfís"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Queres engadir un novo perfil?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Para continuar, <xliff:g id="USER_NAME">%1$s</xliff:g> debe pechar sesión na pantalla do <xliff:g id="SEAT_LOCATION">%2$s</xliff:g>"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Selecciona un perfil para comezar"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Sesión iniciada"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Sesión iniciada na pantalla do <xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Non se puido engadir o novo perfil. Volve tentalo máis tarde."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Non se puido iniciar o perfil de convidado. Volve tentalo máis tarde."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Pechando sesión…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"Estase pechando a sesión de <xliff:g id="USER_NAME">%s</xliff:g>. Volve tentalo máis tarde."</string>
     <string name="seat_driver" msgid="4502591979520445677">"asento de conducir"</string>
     <string name="seat_front" msgid="836133281052793377">"diante"</string>
     <string name="seat_rear" msgid="403133444964528577">"detrás"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Mete o PIN"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Mete o padrón"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Mete o contrasinal"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Tecla Retroceso"</string>
+    <string name="enter_key" msgid="747962923921283095">"Tecla Introducir"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Volver"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Pantalla completa"</string>
 </resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 4bd49bfc..07df273c 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"સત્ર સમાપ્ત કરો"</string>
     <string name="car_new_user" msgid="6766334721724989964">"નવી પ્રોફાઇલ"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"નવી પ્રોફાઇલ ઉમેરવી છે?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"તમે નવી પ્રોફાઇલ ઉમેરો પછી, એકાઉન્ટ ધારક તેને કસ્ટમાઇઝ કરી શકે છે."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"કોઈપણ પ્રોફાઇલ ઍપ અપડેટ ઇન્સ્ટૉલ કરી શકે છે, જે પછી બધી પ્રોફાઇલ માટે ઉપલબ્ધ થશે."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"મહત્તમ પ્રોફાઇલ સંખ્યાએ પહોંચી ગયા"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{માત્ર એક પ્રોફાઇલ બનાવી શકાય છે.}one{તમે વધુમાં વધુ # પ્રોફાઇલ ઉમેરી શકો છો.}other{તમે વધુમાં વધુ # પ્રોફાઇલ ઉમેરી શકો છો.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"લોડ કરી રહ્યાં છીએ"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> બંધ છે."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"<xliff:g id="SENSOR">%1$s</xliff:g>નો ઉપયોગ કરો"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"પરવાનગી ધરાવતી ઍપ માટે"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"માઇક્રોફોન સેટિંગ"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"પ્રાઇવસી સેટિંગ"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g>, <xliff:g id="SENSOR">%2$s</xliff:g>નો ઉપયોગ કરી રહ્યું છે"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> માઇકનો ઉપયોગ કરી રહી છે"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> દ્વારા તાજેતરમાં જ <xliff:g id="SENSOR">%2$s</xliff:g>નો ઉપયોગ કરવામાં આવ્યો"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"ઓકે"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"શું વાહનનો માઇક્રોફોન ચાલુ કરીએ?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"આગળ વધવા માટે, ઇન્ફોટેનમેન્ટ સિસ્ટમનો માઇક્રોફોન ચાલુ કરો. આમ કરવાથી પરવાનગી ધરાવતી બધી ઍપ માટે માઇક્રોફોન ચાલુ થશે."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"કૅમેરા સેટિંગ"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> કૅમેરાનો ઉપયોગ કરી રહ્યું છે"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> કૅમેરાનો ઉપયોગ કરી રહ્યાં છે"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> દ્વારા તાજેતરમાં કૅમેરાનો ઉપયોગ કરવામાં આવ્યો"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"મીડિયા"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"નિયંત્રણ કેન્દ્ર"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistant"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"માઇક પ્રાઇવસી સંબંધી નાનકડું લેબલ"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"વપરાશકર્તાનો અવતાર"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"વપરાશકર્તાના નામ સંબંધી ટેક્સ્ટ"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"તાપમાન ઘટાડો"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"તાપમાન વધારો"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"બ્લૂટૂથનું સેટિંગ: ડિસ્કનેક્ટ કરેલું છે"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"સાઉન્ડ સેટિંગ"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"પ્રોફાઇલ અને એકાઉન્ટ સેટિંગ"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"પૅટર્ન રોટરીને સપોર્ટ કરતી નથી; ટચ વાપરો"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"ટચ સ્ક્રીન લૉક કરેલી છે"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"તમારી સ્ક્રીન લૉક કરવામાં આવી છે"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"તમારી સ્ક્રીન લૉક કરેલી છે"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"તમારી સ્ક્રીન લૉક કરવામાં આવી છે"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"તમારી સ્ક્રીન હમણાં અનલૉક કરેલી છે"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"શું તમે ખરેખર લૉગ આઉટ કરવા માગો છો?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"આ તમામ ખુલ્લી ઍપ્લિકેશનને બંધ કરશે"</string>
     <string name="user_logout" msgid="2934184154258330491">"લૉગ આઉટ કરો"</string>
     <string name="car_guest" msgid="768913000117469596">"અતિથિ"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"પ્રોફાઇલ સ્વિચ કરી રહ્યાં છીએ…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"નવી પ્રોફાઇલ ઉમેરી રહ્યાં છીએ…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"તમે વધુમાં વધુ <xliff:g id="USER_LIMIT">%d</xliff:g> પ્રોફાઇલ ઉમેરી શકો છો"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"નવી પ્રોફાઇલ ઉમેરવી છે?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"ચાલુ રાખવા માટે, <xliff:g id="USER_NAME">%1$s</xliff:g> દ્વારા <xliff:g id="SEAT_LOCATION">%2$s</xliff:g> સ્ક્રીનમાંથી સાઇન આઉટ કરવું જોઈએ"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"શરૂ કરવા માટે પ્રોફાઇલ પસંદ કરો"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"સાઇન ઇન કરેલું છે"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"<xliff:g id="SEAT_LOCATION">%s</xliff:g> સ્ક્રીન કરો પર સાઇન ઇન કરો"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"નવી પ્રોફાઇલ ઉમેરી શકતાં નથી. થોડા સમય પછી ફરી પ્રયાસ કરો."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"અતિથિની પ્રોફાઇલ શરૂ કરી શકતાં નથી. થોડા સમય પછી ફરી પ્રયાસ કરો."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"સાઇન ઇન કરી રહ્યાં છીએ…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> સાઇન આઉટ થઈ રહ્યાં છે. થોડા સમય પછી ફરી પ્રયાસ કરો."</string>
     <string name="seat_driver" msgid="4502591979520445677">"ડ્રાઇવર"</string>
     <string name="seat_front" msgid="836133281052793377">"આગળ"</string>
     <string name="seat_rear" msgid="403133444964528577">"પાછળ"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"તમારો પિન દાખલ કરો"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"તમારી પૅટર્ન દાખલ કરો"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"તમારો પાસવર્ડ દાખલ કરો"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Backspace કી"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter કી"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"પાછળ"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"પૂર્ણ સ્ક્રીન"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index d3eddfd2..916b0492 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -36,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> बंद है."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"<xliff:g id="SENSOR">%1$s</xliff:g> का इस्तेमाल करें"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"उन ऐप्लिकेशन के लिए जिन्हें अनुमति है"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"माइक्रोफ़ोन की सेटिंग"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"निजता सेटिंग"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g>, <xliff:g id="SENSOR">%2$s</xliff:g> का इस्तेमाल कर रहा है"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> माइक का इस्तेमाल कर रहे हैं"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> ने हाल ही में <xliff:g id="SENSOR">%2$s</xliff:g> का इस्तेमाल किया है"</string>
@@ -46,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"ठीक है"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"क्या आप गाड़ी के माइक्रोफ़ोन को चालू करना चाहते हैं?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"जारी रखने के लिए, सूचना और मनोरंजन की सुविधा देने वाले डिवाइस के माइक्रोफ़ोन को चालू करें. ये उन सभी ऐप्लिकेशन के लिए, माइक्रोफ़ोन को चालू कर देगा जिन्हें अनुमति है."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"कैमरे की सेटिंग"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g>, कैमरे का इस्तेमाल कर रहा है"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g>, कैमरे का इस्तेमाल कर रहे हैं"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> ने हाल ही में कैमरे का इस्तेमाल किया है"</string>
@@ -64,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"मीडिया"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"कंट्रोल सेंटर"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistant"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"माइक निजता चिप"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"इस्तेमाल करने वाले का अवतार"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"उपयोगकर्ता नाम का टेक्स्ट"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"तापमान कम करें"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"तापमान बढ़ाएं"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"ब्लूटूथ सेटिंग: डिसकनेक्ट हो गई"</string>
@@ -88,8 +91,9 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"आवाज़ की सेटिंग"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"प्रोफ़ाइल और खाता सेटिंग"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"पैटर्न, रोटरी के साथ काम नहीं करता, टच इस्तेमाल करें"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"टचस्क्रीन को लॉक किया गया"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"आपके डिवाइस की स्क्रीन को लॉक किया गया"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"डिवाइस की स्क्रीन लॉक है"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"डिवाइस की स्क्रीन को लॉक किया गया"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"फ़िलहाल, डिवाइस की स्क्रीन अनलॉक है"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"क्या आपको वाकई लॉग आउट करना है?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"इससे सभी ऐप्लिकेशन बंद हो जाएंगे"</string>
     <string name="user_logout" msgid="2934184154258330491">"लॉग आउट करें"</string>
@@ -119,4 +123,9 @@
     <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"पिन डालें"</string>
     <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"पैटर्न डालें"</string>
     <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"पासवर्ड डालें"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Backspace बटन"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter बटन"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"वापस जाएं"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"फ़ुल स्क्रीन"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 2e164903..87da4906 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Završi sesiju"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Novi profil"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Dodati novi profil?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Nakon što dodate novi profil, vlasnik računa može ga prilagoditi."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Bilo koji profil može instalirati ažuriranje aplikacije, koje će zatim biti dostupno svim profilima."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Ograničenje broja profila dosegnuto"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Može se izraditi samo jedan profil.}one{Možete dodati najviše # profil.}few{Možete dodati najviše # profila.}other{Možete dodati najviše # profila.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Učitavanje"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g>: isključeno."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Koristi sljedeće: <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Za aplikacije koje imaju dopuštenje"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Postavke mikrofona"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Postavke privatnosti"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"Aplikacija <xliff:g id="APP">%1$s</xliff:g> koristi sljedeće: <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> koriste mikrofon"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"Aplikacija <xliff:g id="APP">%1$s</xliff:g> nedavno je koristila sljedeće: <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"U redu"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Želite li uključiti mikrofon vozila?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Da biste nastavili, uključite mikrofon sustava za informiranje i zabavu. Na taj ćete način mikrofon uključiti za sve aplikacije koje imaju dopuštenje."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Postavke kamere"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"Aplikacija <xliff:g id="APP">%s</xliff:g> koristi kameru"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"Aplikacije <xliff:g id="APP_LIST">%s</xliff:g> koriste kameru"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"Aplikacija <xliff:g id="APP">%s</xliff:g> nedavno je koristila kameru"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Karte"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Mediji"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Centar za upravljanje"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Asistent"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Čip za privatnost mikrofona"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Avatar korisnika"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Tekst korisničkog imena"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Snizi temperaturu"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Povisi temperaturu"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Postavka Bluetootha: nije povezano"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Postavke zvuka"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Postavke profila i računa"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Uzorak se ne unosi rotacijski; dodirnite"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Dodirni zaslon je zaključan"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Zaslon je zaključan"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Zaslon je zaključan"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Zaslon je zaključan"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Zaslon je sad otključan"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Jeste li sigurni da se želite odjaviti?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Ovime će se zatvoriti sve otvorene aplikacije"</string>
     <string name="user_logout" msgid="2934184154258330491">"Odjava"</string>
     <string name="car_guest" msgid="768913000117469596">"Gost"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Promjena profila…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Dodavanje novog profila…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Ne možete dodati više od <xliff:g id="USER_LIMIT">%d</xliff:g> profila"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Želite li dodati novi profil?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Da biste nastavili, <xliff:g id="USER_NAME">%1$s</xliff:g> se treba odjaviti sa zaslona <xliff:g id="SEAT_LOCATION">%2$s</xliff:g>"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Odaberite profil da biste započeli"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Prijavljeni ste"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Prijavljeni ste na zaslonu <xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Dodavanje novog profila nije uspjelo. Pokušajte ponovo kasnije."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Pokretanje profila gosta nije uspjelo. Pokušajte ponovo kasnije."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Odjava…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> se odjavljuje. Pokušajte ponovo kasnije."</string>
     <string name="seat_driver" msgid="4502591979520445677">"vozač"</string>
     <string name="seat_front" msgid="836133281052793377">"prednja"</string>
     <string name="seat_rear" msgid="403133444964528577">"stražnja"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Unesite PIN"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Unesite uzorak"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Unesite zaporku"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Tipka Backspace"</string>
+    <string name="enter_key" msgid="747962923921283095">"Tipka Enter"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Natrag"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Cijeli zaslon"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index d9530ff5..00a83a95 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Munkamenet befejezése"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Új profil"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Szeretne új profilt hozzáadni?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Az Ön által hozzáadott új profilt a fióktulajdonos személyre szabhatja."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Bármelyik profil telepíthet alkalmazásfrissítést, amely az összes profil számára hozzáférhető lesz."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Elérte a profilok maximális számát"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Legfeljebb egy profilt hozhat létre.}other{Legfeljebb # profilt hozhat létre.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Betöltés"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> kikapcsolva."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"<xliff:g id="SENSOR">%1$s</xliff:g> használata"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Engedéllyel rendelkező alkalmazások számára"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Mikrofon beállításai"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Adatvédelmi beállítások"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"A(z) <xliff:g id="APP">%1$s</xliff:g> használja a következőt: <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"Használják a mikrofont: <xliff:g id="APP_LIST">%s</xliff:g>"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"A(z) <xliff:g id="APP">%1$s</xliff:g> nemrég használta a következőt: <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Bekapcsolja a jármű mikrofonját?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"A folytatáshoz kapcsolja be az infotainmentrendszer mikrofonját. Ezzel minden engedéllyel rendelkező alkalmazás számára bekapcsolja a mikrofont."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Kamerabeállítások"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"A(z) <xliff:g id="APP">%s</xliff:g> használja a kamerát"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"A kamerát használó appok: <xliff:g id="APP_LIST">%s</xliff:g>"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"A(z) <xliff:g id="APP">%s</xliff:g> nemrég használta a kamerát"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Térkép"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Média"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Vezérlőközpont"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Segéd"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Mikrofon adatvédelmi chipje"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Felhasználó avatarja"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Felhasználónév szövege"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Hőmérséklet csökkentése"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Hőmérséklet növelése"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Bluetooth-beállítás: leválasztva"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Hangbeállítások"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Profil- és fiókbeállítások"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Nem támogatott a forgó bevitel; használjon érintést"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Érintőképernyője zárolva van"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Képernyője zárolva van"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Képernyő lezárva"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Képernyője zárolva van"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Képernyő zárolása feloldva"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Biztosan kijelentkezik?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Ez bezárja az összes megnyitott alkalmazást"</string>
     <string name="user_logout" msgid="2934184154258330491">"Kijelentkezés"</string>
     <string name="car_guest" msgid="768913000117469596">"Vendég"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Profilváltás…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Új profil hozzáadása…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Legfeljebb <xliff:g id="USER_LIMIT">%d</xliff:g> profilt adhat hozzá"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Szeretne új profilt hozzáadni?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"A folytatáshoz <xliff:g id="USER_NAME">%1$s</xliff:g> felhasználónak ki kell jelentkeznie a következő képernyőről: <xliff:g id="SEAT_LOCATION">%2$s</xliff:g>"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"A kezdéshez válasszon profilt"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Bejelentkezve"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Bejelentkezve a(z) <xliff:g id="SEAT_LOCATION">%s</xliff:g> képernyőn"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Nem lehet új profilt hozzáadni. Próbálja újra később."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Nem lehet vendégprofilt indítani. Próbálja újra később."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Kijelentkezés…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> kijelentkeztetése folyamatban van. Próbálja újra később."</string>
     <string name="seat_driver" msgid="4502591979520445677">"sofőr"</string>
     <string name="seat_front" msgid="836133281052793377">"elöl"</string>
     <string name="seat_rear" msgid="403133444964528577">"hátul"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Adja meg a PIN-kódját"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Adja meg a mintáját"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Adja meg a jelszavát"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Backspace billentyű"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter billentyű"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Vissza"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Teljes képernyő"</string>
 </resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 63bf9c82..fb2b8d3f 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Ավարտել աշխատաշրջանը"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Նոր պրոֆիլ"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Ավելացնե՞լ նոր պրոֆիլ"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Երբ ավելացնեք նոր պրոֆիլը, հաշվետերը կկարողանա հարմարեցնել այն։"</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Ցանկացած պրոֆիլից հնարավոր է հավելվածի թարմացում տեղադրել, որն էլ հասանելի կլինի բոլոր պրոֆիլներին։"</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Պրոֆիլների սահմանաչափը լրացել է"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Դուք կարող եք միայն մեկ պրոֆիլ ստեղծել:}one{Դուք կարող եք առավելագույնը # պրոֆիլ ավելացնել։}other{Դուք կարող եք առավելագույնը # պրոֆիլ ավելացնել։}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Բեռնում"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g>ն անջատված է։"</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Օգտագործել <xliff:g id="SENSOR">%1$s</xliff:g>ը"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Թույլտվություն ունեցող հավելվածների համար"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Խոսափողի կարգավորումներ"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Գաղտնիության կարգավորումներ"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> հավելվածն օգտագործում է <xliff:g id="SENSOR">%2$s</xliff:g>ը"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> հավելվածներն օգտագործում են խոսափողը"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> հավելվածը վերջերս օգտագործել է <xliff:g id="SENSOR">%2$s</xliff:g>ը"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"Եղավ"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Միացնե՞լ մեքենայի խոսափողը"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Շարունակելու համար միացրեք տեղեկատվաժամանցային համակարգի խոսափողը։ Թույլտվություն ունեցող հավելվածների համար խոսափողը նույնպես կմիանա։"</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Տեսախցիկի կարգավորումներ"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g>՝ օգտագործում է տեսախցիկը"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g>՝ օգտագործում են տեսախցիկը"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> հավելվածը վերջերս օգտագործել է տեսախցիկը"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Քարտեզներ"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Մեդիա"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Կառավարման կենտրոն"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Օգնական"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Խոսափողի գաղտնիության չիպ"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Օգտատիրոջ ավատար"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Օգտանվան տեքստ"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Իջեցնել ջերմաստիճանը"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Բարձրացնել ջերմաստիճանը"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Bluetooth-ի կարգավորում. անջատված է"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Ձայնի կարգավորումներ"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Պրոֆիլների և հաշիվների կարգավորումներ"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Նախշը չի աջակցում պտտաշարժում. օգտագործեք հպում"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Հպէկրանը կողպված է"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Ձեր էկրանը կողպվել է"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Ձեր էկրանը կողպված է"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Ձեր էկրանը կողպվել է"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Ձեր էկրանն այժմ ապակողպված է"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Իսկապե՞ս ուզում եք դուրս գալ"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Բոլոր բաց հավելվածները կփակվեն"</string>
     <string name="user_logout" msgid="2934184154258330491">"Դուրս գալ"</string>
     <string name="car_guest" msgid="768913000117469596">"Հյուր"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Անցում այլ պրոֆիլի…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Նոր պրոֆիլի ավելացում…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Դուք կարող եք առավելագույնը <xliff:g id="USER_LIMIT">%d</xliff:g> պրոֆիլ ավելացնել"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Ավելացնե՞լ նոր պրոֆիլ"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Շարունակելու համար <xliff:g id="USER_NAME">%1$s</xliff:g> օգտատերը պետք է դուրս գա «<xliff:g id="SEAT_LOCATION">%2$s</xliff:g>» էկրանից"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Սկսելու համար ընտրեք պրոֆիլ"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Դուք մուտք եք գործել"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Դուք մուտք եք գործել «<xliff:g id="SEAT_LOCATION">%s</xliff:g>» էկրանին"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Չհաջողվեց ավելացնել նոր պրոֆիլը։ Փորձեք ավելի ուշ։"</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Չհաջողվեց օգտագործել հյուրի պրոֆիլը։ Փորձեք ավելի ուշ։"</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Ելք…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> օգտատերը դուրս է գրվում հաշվից։ Փորձեք ավելի ուշ։"</string>
     <string name="seat_driver" msgid="4502591979520445677">"վարորդի"</string>
     <string name="seat_front" msgid="836133281052793377">"առջևում նստած ուղևորի"</string>
     <string name="seat_rear" msgid="403133444964528577">"հետևում նստած ուղևորի"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Մուտքագրեք PIN կոդը"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Մուտքագրեք նախշը"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Մուտքագրեք գաղտնաբառը"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Backspace ստեղն"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter ստեղն"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Հետ"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Լիաէկրան"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 16af840e..b9b35727 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -36,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> nonaktif."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Gunakan <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Untuk aplikasi yang memiliki izin"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Setelan mikrofon"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Setelan privasi"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> sedang menggunakan <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> sedang menggunakan mikrofon"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> menggunakan <xliff:g id="SENSOR">%2$s</xliff:g> baru-baru ini"</string>
@@ -46,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"Oke"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Aktifkan mikrofon kendaraan?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Untuk melanjutkan, aktifkan mikrofon sistem infotainmen. Ini akan mengaktifkan mikrofon untuk semua aplikasi yang memiliki izin."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Setelan kamera"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> sedang menggunakan kamera"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> sedang menggunakan kamera"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> menggunakan kamera baru-baru ini"</string>
@@ -64,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Media"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Pusat Kontrol"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Asisten"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Chip Privasi Mikrofon"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Avatar Pengguna"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Teks Nama Pengguna"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Turunkan suhu"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Naikkan suhu"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Setelan Bluetooth: Terputus"</string>
@@ -88,8 +91,9 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Setelan suara"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Setelan akun &amp; profil"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Pola tidak mendukung rotasi; gunakan sentuhan"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Layar sentuh terkunci"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Layar Anda telah dikunci"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Layar Anda terkunci"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Layar Anda telah dikunci"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Layar Anda kini tidak terkunci"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Yakin ingin logout?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Tindakan ini akan menutup semua aplikasi yang terbuka"</string>
     <string name="user_logout" msgid="2934184154258330491">"Logout"</string>
@@ -119,4 +123,9 @@
     <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Masukkan PIN"</string>
     <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Masukkan pola"</string>
     <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Masukkan sandi"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Tombol backspace"</string>
+    <string name="enter_key" msgid="747962923921283095">"Tombol enter"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Kembali"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Layar Penuh"</string>
 </resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 0e4234aa..5015315e 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Ljúka lotu"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Nýr prófíll"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Bæta við nýjum prófíl?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Eftir að þú bætir við nýjum prófíl getur eigandi reikningsins sérsniðið hann."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Hvaða prófíll sem er getur sett upp forritsuppfærslu sem verður í kjölfarið tiltæk öllum prófílum."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Hámarki prófíla náð"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Aðeins er hægt að búa til einn prófíl.}one{Þú getur bætt við allt að # prófíl.}other{Þú getur bætt við allt að # prófílum.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Hleður"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"Slökkt er á <xliff:g id="SENSOR">%1$s</xliff:g>."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Nota <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Fyrir forrit með heimild"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Stillingar hljóðnema"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Persónuverndarstillingar"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> er að nota <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> eru að nota hljóðnemann"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> notaði <xliff:g id="SENSOR">%2$s</xliff:g> nýlega"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"Í lagi"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Kveikja á hljóðnema ökutækisins?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Kveiktu á hljóðnema upplýsinga- og afþreyingakerfisins til að halda áfram. Þetta kveikir á hljóðnemanum fyrir öll forrit með heimild."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Stillingar myndavélar"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> er að nota myndavélina"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> eru að nota myndavélina"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> notaði myndavélina nýlega"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Kort"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Efni"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Stjórnstöð"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Hjálpari"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Persónuverndarkubbur fyrir hljóðnema"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Notandamynd"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Notandanafn"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Lækka hitastig"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Hækka hitastig"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Bluetooth-stillingar: Aftengt"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Hljóðstillingar"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Prófíl- og reikningsstillingar"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Mynstur styður ekki snúning, notaðu snertingu"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Snertiskjá læst"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Skjánum hjá þér var læst"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Skjárinn er læstur"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Skjánum hjá þér var læst"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Skjárinn er ólæstur"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Ertu viss um að þú viljir skrá þig út?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Þetta mun loka öllum opnum forritum"</string>
     <string name="user_logout" msgid="2934184154258330491">"Skrá út"</string>
     <string name="car_guest" msgid="768913000117469596">"Gestur"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Skiptir um prófíl…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Bætir við nýjum prófíl…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Þú getur bætt við allt að <xliff:g id="USER_LIMIT">%d</xliff:g> prófílum"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Bæta við nýjum prófíl?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Til að halda áfram þarf <xliff:g id="USER_NAME">%1$s</xliff:g> að skrá sig út af skjánum „<xliff:g id="SEAT_LOCATION">%2$s</xliff:g>“"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Veldu prófíl til að byrja"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Innskráð(ur)"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Innskráning virk á skjánum „<xliff:g id="SEAT_LOCATION">%s</xliff:g>“"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Ekki er hægt að bæta við nýjum prófíl. Reyndu aftur síðar."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Ekki er hægt að opna gestaprófíl. Reyndu aftur síðar."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Skráir út…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"Verið er að skrá „<xliff:g id="USER_NAME">%s</xliff:g>“ út. Reyndu aftur síðar."</string>
     <string name="seat_driver" msgid="4502591979520445677">"ökumannssæti"</string>
     <string name="seat_front" msgid="836133281052793377">"framsæti"</string>
     <string name="seat_rear" msgid="403133444964528577">"í aftursæti"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Sláðu inn PIN-númer"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Færðu inn mynstrið þitt"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Sláðu inn aðgangsorð"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Bakklykill"</string>
+    <string name="enter_key" msgid="747962923921283095">"Færslulykill"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Til baka"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Allur skjárinn"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 71b6ae64..8cc8529b 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Termina sessione"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Nuovo profilo"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Aggiungere un nuovo profilo?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Dopo aver aggiunto un nuovo profilo, il proprietario dell\'account lo può personalizzare."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Ciascun profilo può installare un aggiornamento dell\'app, che sarà disponibile per tutti i profili."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Limite di profili raggiunto"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{È possibile creare un solo profilo.}other{Puoi aggiungere massimo # profili.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Caricamento"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> spento."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Usa <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Per le app provviste di autorizzazione"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Impostazioni del microfono"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Impostazioni privacy"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"L\'app <xliff:g id="APP">%1$s</xliff:g> sta usando: <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"Microfono in uso nelle app <xliff:g id="APP_LIST">%s</xliff:g>"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"L\'app <xliff:g id="APP">%1$s</xliff:g> ha usato di recente: <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Attivare il microfono del veicolo?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Per continuare, attiva il microfono del sistema di infotainment. Questa operazione attiverà il microfono per tutte le app provviste di autorizzazione."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Impostazioni fotocamera"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> sta usando la fotocamera"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> stanno usando la fotocamera"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> ha usato la fotocamera di recente"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Google Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Contenuti multimediali"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Centro di controllo"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistente"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Chip della privacy per microfono"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Avatar utente"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Testo username"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Abbassa la temperatura"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Aumenta la temperatura"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Impostazione Bluetooth: disconnesso"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Impostazioni audio"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Impostazioni del profilo e dell\'account"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Sequ. non supporta input rotatorio: usa tocco"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Touchscreen bloccato"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Lo schermo è stato bloccato"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Il tuo schermo è bloccato"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Lo schermo è stato bloccato"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Ora il tuo schermo è sbloccato"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Vuoi uscire?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Questa operazione chiuderà tutte le applicazioni aperte"</string>
     <string name="user_logout" msgid="2934184154258330491">"Esci"</string>
     <string name="car_guest" msgid="768913000117469596">"Ospite"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Cambio profilo in corso..."</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Aggiunta di un nuovo profilo in corso…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Puoi aggiungere al massimo <xliff:g id="USER_LIMIT">%d</xliff:g> profili"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Vuoi aggiungere un nuovo profilo?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Per continuare, <xliff:g id="USER_NAME">%1$s</xliff:g> deve uscire dallo schermo <xliff:g id="SEAT_LOCATION">%2$s</xliff:g>"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Seleziona il profilo da avviare"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Accesso eseguito"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Accesso eseguito sullo schermo <xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Impossibile aggiungere nuovo profilo. Riprova più tardi."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Impossibile avviare profilo ospite. Riprova più tardi."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Uscita…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> è in uscita. Riprova più tardi."</string>
     <string name="seat_driver" msgid="4502591979520445677">"conducente"</string>
     <string name="seat_front" msgid="836133281052793377">"anteriore"</string>
     <string name="seat_rear" msgid="403133444964528577">"posteriore"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Inserisci il PIN"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Inserisci la sequenza"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Inserisci la password"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Tasto Backspace"</string>
+    <string name="enter_key" msgid="747962923921283095">"Tasto Invio"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Indietro"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Schermo intero"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 01136b20..1d8c1c03 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"לסיום הסשן"</string>
     <string name="car_new_user" msgid="6766334721724989964">"פרופיל חדש"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"להוסיף פרופיל חדש?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"אחרי שמוסיפים פרופיל חדש, בעל החשבון יכול להתאים אותו אישית."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"כל פרופיל יכול להתקין עדכון לאפליקציה. העדכון יהיה זמין לכל הפרופילים."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"הגעת למספר הפרופילים המרבי"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{ניתן ליצור רק פרופיל אחד.}one{ניתן להוסיף עד # פרופילים.}two{ניתן להוסיף עד # פרופילים.}other{ניתן להוסיף עד # פרופילים.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"בטעינה"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"ה<xliff:g id="SENSOR">%1$s</xliff:g> במצב כבוי."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"שימוש ב<xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"לאפליקציות שקיבלו הרשאה"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"הגדרות המיקרופון"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"הגדרות הפרטיות"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"האפליקציה <xliff:g id="APP">%1$s</xliff:g> משתמשת ב<xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"האפליקציות <xliff:g id="APP_LIST">%s</xliff:g> משתמשות במיקרופון"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"האפליקציה <xliff:g id="APP">%1$s</xliff:g> השתמשה ב<xliff:g id="SENSOR">%2$s</xliff:g> לאחרונה"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"בסדר"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"להפעיל את המיקרופון של הרכב?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"כדי להמשיך, צריך להפעיל את המיקרופון של מערכת המידע והבידור. פעולה זו תפעיל את המיקרופון לכל האפליקציות שקיבלו הרשאה."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"הגדרות המצלמה"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"האפליקציה <xliff:g id="APP">%s</xliff:g> משתמשת במצלמה"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"האפליקציות <xliff:g id="APP_LIST">%s</xliff:g> משתמשות במצלמה"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"האפליקציה <xliff:g id="APP">%s</xliff:g> השתמשה במצלמה לאחרונה"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"מפות"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"מדיה"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"מרכז בקרה"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistant"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"שבב הפרטיות של המיקרופון"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"הדמות של המשתמש"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"טקסט של שם המשתמש"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"הורדת הטמפרטורה"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"העלאת הטמפרטורה"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"הגדרת ה-Bluetooth: מנותק"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"הגדרות צליל"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"הגדרות פרופילים וחשבונות"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"אין תמיכה בקו ביטול נעילה סיבובי. יש להשתמש במגע"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"מסך המגע ננעל"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"המסך ננעל"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"המסך שלך נעול"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"המסך ננעל"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"נעילת המסך שלך בוטלה עכשיו"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"בחרת לצאת מהחשבון. להמשיך?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"הפעולה הזו תסגור את כל האפליקציות הפתוחות"</string>
     <string name="user_logout" msgid="2934184154258330491">"התנתקות"</string>
     <string name="car_guest" msgid="768913000117469596">"אורח"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"החלפת פרופיל…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"הוספת פרופיל חדש…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"ניתן להוסיף עד <xliff:g id="USER_LIMIT">%d</xliff:g> פרופילים"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"להוסיף פרופיל חדש?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"כדי להמשיך, על <xliff:g id="USER_NAME">%1$s</xliff:g> לצאת מהמסך של <xliff:g id="SEAT_LOCATION">%2$s</xliff:g>"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"צריך לבחור פרופיל כדי להתחיל"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"מחובר"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"מחובר למסך <xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"לא ניתן להוסיף פרופיל חדש. צריך לנסות שוב מאוחר יותר."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"לא ניתן להפעיל פרופיל אורח. צריך לנסות שוב מאוחר יותר."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"בתהליך יציאה…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"מתבצעת יציאה מהמערכת של <xliff:g id="USER_NAME">%s</xliff:g>. צריך לנסות שוב מאוחר יותר."</string>
     <string name="seat_driver" msgid="4502591979520445677">"נהג/ת"</string>
     <string name="seat_front" msgid="836133281052793377">"חלק קדמי"</string>
     <string name="seat_rear" msgid="403133444964528577">"חלק אחורי"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"יש להזין קוד אימות"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"יש להזין קו ביטול נעילה"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"יש להזין סיסמה"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"מקש Backspace"</string>
+    <string name="enter_key" msgid="747962923921283095">"צריך להזין מפתח"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"חזרה"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"מסך מלא"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index ad5a7596..6b5fceed 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -36,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g>は OFF です。"</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"<xliff:g id="SENSOR">%1$s</xliff:g>の使用"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"権限が付与されているアプリ"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"マイクの設定"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"プライバシー設定"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g>が<xliff:g id="SENSOR">%2$s</xliff:g>を使用しています"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> がマイクを使用しています"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g>が最近<xliff:g id="SENSOR">%2$s</xliff:g>を使用しました"</string>
@@ -46,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"車のマイクを ON にしますか？"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"続行するには、インフォテインメント システムのマイクを ON にしてください。これにより、権限が付与されているすべてのアプリに対してマイクが ON になります。"</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"カメラ設定"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g>がカメラを使用しています"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g>がカメラを使用しています"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g>が最近カメラを使用しました"</string>
@@ -64,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"マップ"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"メディア"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"コントロール センター"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"アシスタント"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"マイクのプライバシー チップ"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"ユーザーのアバター"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"ユーザー名のテキスト"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"温度を下げる"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"温度を上げる"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Bluetooth の設定: 接続解除済み"</string>
@@ -88,8 +91,9 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"音声の設定"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"プロフィールとアカウントの設定"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"パターンは回転に非対応 - タップしてください"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"タッチ スクリーンをロックしました"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"スクリーンはロックされています"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"画面をロックしました"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"画面はロックされています"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"画面のロックを解除しました"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"ログアウトしてもよろしいですか？"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"開いているアプリケーションをすべて閉じます"</string>
     <string name="user_logout" msgid="2934184154258330491">"ログアウト"</string>
@@ -119,4 +123,9 @@
     <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"PIN を入力してください"</string>
     <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"パターンを入力してください"</string>
     <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"パスワードを入力してください"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Backspace キー"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter キー"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"戻る"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"全画面表示"</string>
 </resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index a8357c34..aa4072bb 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -36,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> გამორთულია."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"<xliff:g id="SENSOR">%1$s</xliff:g>-ის გამოყენება"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"ნებადართული აპებისთვის"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"მიკროფონის პარამეტრები"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"კონფიდენციალურობის პარამეტრები"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> იყენებს <xliff:g id="SENSOR">%2$s</xliff:g>-ს"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> მიკროფონს იყენებენ"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"აპმა <xliff:g id="APP">%1$s</xliff:g> ახლახან გამოიყენა <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
@@ -46,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"კარგი"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"ჩაირთოს ავტომობილის მიკროფონი?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"გასაგრძელებლად ჩართეთ გართობის/საინფორმაციო სისტემის მიკროფონი ეს მოქმედება ყველა ნებადართული აპს მიკროფონს ჩაურთავს."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"კამერის პარამეტრები"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> კამერას იყენებს"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> კამერას იყენებს"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g>-მა ახლახან გამოიყენა კამერა"</string>
@@ -64,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"მედია"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"მართვის საშუალებების ცენტრი"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"ასისტენტი"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"მიკროფონის კონფიდენციალურობის ჩიპი"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"მომხმარებლის ავატარი"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"მომხმარებლის სახელის ტექსტი"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"ტემპერატურის დაწევა"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"ტემპერატურის აწევა"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Bluetooth-ის პარამეტრი: კავშირი გაწყვეტილია"</string>
@@ -88,8 +91,9 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"ხმის პარამეტრები"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"პროფილებისა და ანგარიშების პარამეტრები"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"ნიმუშს არ აქვს როტაციულის მხარდაჭერა; ისარგებლეთ შეხებით"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"სენსორული ეკრანი დაბლოკილია"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"თქვენი ეკრანი დაიბლოკა"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"თქვენი ეკრანი ჩაკეტილია"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"თქვენი ეკრანი ჩაიკეტა"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"თქვენი ეკრანი ახლა განბლოკილია"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"დარწმუნებული ხართ, რომ გსურთ გამოსვლა?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"ეს დახურავს ყველა ღია აპს"</string>
     <string name="user_logout" msgid="2934184154258330491">"სისტემიდან გასვლა"</string>
@@ -119,4 +123,9 @@
     <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"შეიყვანეთ თქვენი PIN-კოდი"</string>
     <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"შეიყვანეთ თქვენი ნიმუში"</string>
     <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"შეიყვანეთ თქვენი პაროლი"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"კლავიში backspace"</string>
+    <string name="enter_key" msgid="747962923921283095">"კლავიში Enter"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"უკან"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"სრულ ეკრანზე"</string>
 </resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 16d2debc..e73094a1 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Сеансты аяқтау"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Жаңа профиль"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Жаңа профиль қосу керек пе?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Сіз жаңа профиль қосқаннан кейін, аккаунт иесі оны бейімдей алады."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Кез келген профиль қолданбаны жаңарта алады. Жаңа нұсқа кейін барлық профиль үшін қолжетімді болады."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Профильдер саны шегіне жетті"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Тек бір профиль жасауға болады.}other{Ең көбі # профиль қосуға болады.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Жүктелуде"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> өшірулі."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"<xliff:g id="SENSOR">%1$s</xliff:g> пайдалану"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Рұқсаты бар қолданбалар үшін"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Микрофон параметрлері"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Құпиялық параметрлері"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> қазір <xliff:g id="SENSOR">%2$s</xliff:g> пайдалануда."</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> микрофонды қолданып жатыр."</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> жақында <xliff:g id="SENSOR">%2$s</xliff:g> пайдаланды."</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"Жарайды"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Көлік микрофоны қосылсын ба?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Жалғастыру үшін ақпараттық-сауықтық жүйе микрофонын қосыңыз. Рұқсаты бар барлық қолданба үшін микрофон қосылады."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Камера параметрлері"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> камераны пайдалануда."</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> камераны пайдалануда."</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> жақында камераны пайдаланды."</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Мультимeдиа"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Басқару орталығы"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistant"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Микрофонның құпиялық чипі"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Пайдаланушы аватары"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Пайдаланушы атының мәтіні"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Температураны төмендету"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Температураны көтеру"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Bluetooth параметрі: ажыратулы"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Дыбыс параметрлері"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Профиль мен аккаунт параметрлері"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Өрнекті айналма түймемен емес, түрту арқылы салу керек."</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Сенсорлық экран құлыпталды"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Экраныңыз құлыпталды"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Экран құлыптаулы"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Экраныңыз құлыпталды"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Экран құлпы ашық"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Жүйеден расымен шыққыңыз келе ме?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Барлық ашық тұрған қолданбалар жабылады."</string>
     <string name="user_logout" msgid="2934184154258330491">"Жүйеден шығу"</string>
     <string name="car_guest" msgid="768913000117469596">"Қонақ"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Профиль ауысып жатыр…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Жаңа профиль қосылып жатыр…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Ең көбі <xliff:g id="USER_LIMIT">%d</xliff:g> профиль қосуға болады."</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Жаңа профиль қосу керек пе?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Жалғастыру үшін <xliff:g id="USER_NAME">%1$s</xliff:g> <xliff:g id="SEAT_LOCATION">%2$s</xliff:g> экранынан шығуы керек."</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Бастау үшін профильді таңдаңыз"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Аккаунтқа кірулі"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"<xliff:g id="SEAT_LOCATION">%s</xliff:g> экранынан аккаунтқа кірдіңіз."</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Жаңа профиль қосу мүмкін емес. Кейінірек қайталап көріңіз."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Қонақ профилін іске қосу мүмкін емес. Кейінірек қайталап көріңіз."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Аккаунттан шығып жатырсыз…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> аккаунттан шығып жатыр. Кейінірек қайталап көріңіз."</string>
     <string name="seat_driver" msgid="4502591979520445677">"жүргізуші"</string>
     <string name="seat_front" msgid="836133281052793377">"алдыңғы"</string>
     <string name="seat_rear" msgid="403133444964528577">"артқы"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"PIN кодын енгізіңіз"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Өрнекті енгізіңіз"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Құпия сөзді енгізіңіз"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Backspace пернесі"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter пернесі"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Артқа"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Толық экран"</string>
 </resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index a8851d38..d0642317 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -36,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> ត្រូវបានបិទ។"</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"ប្រើ <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"សម្រាប់កម្មវិធីដែលមានការអនុញ្ញាត"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"ការកំណត់មីក្រូហ្វូន"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"ការកំណត់ឯកជនភាព"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> កំពុងប្រើ <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> កំពុងប្រើមីក្រូហ្វូន"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> បានប្រើ <xliff:g id="SENSOR">%2$s</xliff:g> ថ្មីៗនេះ"</string>
@@ -46,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"អូខេ"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"បើកមីក្រូហ្វូនរបស់យានជំនិះឬ?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"ដើម្បីបន្ត សូមបើកមីក្រូហ្វូនប្រព័ន្ធព័ត៌មាន និងកម្សាន្ត។ ការធ្វើបែបនេះនឹងបើកមីក្រូហ្វូនសម្រាប់កម្មវិធីទាំងអស់ដែលមានការអនុញ្ញាត។"</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"ការកំណត់កាមេរ៉ា"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> កំពុងប្រើកាមេរ៉ា"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> កំពុងប្រើកាមេរ៉ា"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> បានប្រើកាមេរ៉ាថ្មីៗនេះ"</string>
@@ -64,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"ផែនទី"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"មេឌៀ"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"មជ្ឈមណ្ឌលគ្រប់គ្រង"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Google Assistant"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"ឈីបមីក្រូហ្វូនឯកជន"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"រូបអវតារអ្នកប្រើប្រាស់"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"អក្សរឈ្មោះអ្នកប្រើប្រាស់"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"បន្ថយសីតុណ្ហភាព"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"បង្កើនសីតុណ្ហភាព"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"ការកំណត់ប៊្លូធូស៖ បានផ្តាច់"</string>
@@ -88,8 +91,9 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"ការកំណត់សំឡេង"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"ការកំណត់គណនី និងកម្រងព័ត៌មាន"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"មិនអាចបង្វិលលំនាំបានទេ សូមប្រើការចុច"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"បានចាក់សោអេក្រង់ថាច់"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"អេក្រង់របស់អ្នកត្រូវបានចាក់សោ"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"អេក្រង់របស់អ្នកត្រូវបានចាក់សោ"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"អេក្រង់របស់អ្នកត្រូវបានចាក់សោ"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"ឥឡូវនេះ អេក្រង់របស់អ្នកត្រូវបានដោះសោ"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"តើអ្នកប្រាកដថាអ្នកចង់ចេញពីគណនីមែនទេ?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"ការធ្វើបែបនេះនឹងបិទកម្មវិធីដែលបើកទាំងអស់"</string>
     <string name="user_logout" msgid="2934184154258330491">"ចេញពីគណនី"</string>
@@ -119,4 +123,9 @@
     <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"បញ្ចូលកូដ PIN របស់អ្នក"</string>
     <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"បញ្ចូលលំនាំរបស់អ្នក"</string>
     <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"បញ្ចូលពាក្យសម្ងាត់របស់អ្នក"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"គ្រាប់ចុច Backspace"</string>
+    <string name="enter_key" msgid="747962923921283095">"គ្រាប់ចុច Enter"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"ថយក្រោយ"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"អេក្រង់ពេញ"</string>
 </resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 7a6f9075..b39f9161 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -36,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> ಆಫ್ ಆಗಿದೆ."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"<xliff:g id="SENSOR">%1$s</xliff:g> ಅನ್ನು ಬಳಸಿ"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"ಅನುಮತಿಯನ್ನು ಹೊಂದಿರುವ ಆ್ಯಪ್‌ಗಳಿಗಾಗಿ"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"ಮೈಕ್ರೊಫೋನ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"ಗೌಪ್ಯತೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g>, <xliff:g id="SENSOR">%2$s</xliff:g> ಅನ್ನು ಬಳಸುತ್ತಿದೆ"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> ಮೈಕ್ ಅನ್ನು ಬಳಸುತ್ತಿವೆ"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> ಇತ್ತೀಚೆಗೆ <xliff:g id="SENSOR">%2$s</xliff:g> ಅನ್ನು ಬಳಸಿದೆ"</string>
@@ -46,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"ಸರಿ"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"ವಾಹನದ ಮೈಕ್ರೊಫೋನ್‌ ಅನ್ನು ಆನ್ ಮಾಡಬೇಕೆ?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"ಮುಂದುವರಿಸಲು, ಇನ್‌ಫೋಟೈನ್‌ಮೆಂಟ್ ಸಿಸ್ಟಂ ಮೈಕ್ರೊಫೋನ್ ಆನ್ ಮಾಡಿ. ಇದು ಅನುಮತಿಯನ್ನು ಹೊಂದಿರುವ ಎಲ್ಲಾ ಆ್ಯಪ್‌ಗಳಿಗಾಗಿ ಮೈಕ್ರೊಫೋನ್ ಅನ್ನು ಆನ್ ಮಾಡುತ್ತದೆ."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"ಕ್ಯಾಮರಾ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> ಕ್ಯಾಮರಾವನ್ನು ಬಳಸುತ್ತಿದೆ"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> ಕ್ಯಾಮರಾವನ್ನು ಬಳಸುತ್ತಿವೆ"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> ಇತ್ತೀಚೆಗೆ ಕ್ಯಾಮರಾವನ್ನು ಬಳಸಿದೆ"</string>
@@ -64,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"ಮಾಧ್ಯಮ"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"ಕಂಟ್ರೋಲ್ ಸೆಂಟರ್"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistant"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"ಮೈಕ್ ಗೌಪ್ಯತೆ ಚಿಪ್"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"ಬಳಕೆದಾರರ ಅವತಾರ್"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"ಬಳಕೆದಾರರ ಹೆಸರಿನ ಪಠ್ಯ"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"ತಾಪಮಾನವನ್ನು ಕಡಿಮೆ ಮಾಡಿ"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"ತಾಪಮಾನವನ್ನು ಹೆಚ್ಚಿಸಿ"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"ಬ್ಲೂಟೂತ್ ಸೆಟ್ಟಿಂಗ್: ಡಿಸ್‌ಕನೆಕ್ಟ್ ಆಗಿದೆ"</string>
@@ -88,8 +91,9 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"ಸೌಂಡ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"ಪ್ರೊಫೈಲ್‌ಗಳು ಮತ್ತು ಖಾತೆಗಳ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"ಪ್ಯಾಟರ್ನ್ ರೋಟರಿಯನ್ನು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ, ಸ್ಪರ್ಶಿಸಿ"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"ಟಚ್ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಗಿದೆ"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಅನ್ನು ಲಾಕ್ ಮಾಡಲಾಗಿದೆ"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಗಿದೆ"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಅನ್ನು ಲಾಕ್ ಮಾಡಲಾಗಿದೆ"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಈಗ ಅನ್‌ಲಾಕ್ ಆಗಿದೆ"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"ನೀವು ಲಾಗ್ ಔಟ್ ಮಾಡಲು ಬಯಸುತ್ತೀರಾ?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"ಇದು ಎಲ್ಲಾ ತೆರೆದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಮುಚ್ಚುತ್ತದೆ"</string>
     <string name="user_logout" msgid="2934184154258330491">"ಲಾಗ್‌ ಔಟ್‌ ಮಾಡಿ"</string>
@@ -119,4 +123,9 @@
     <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"ನಿಮ್ಮ ಪಿನ್ ನಮೂದಿಸಿ"</string>
     <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"ನಿಮ್ಮ ಪ್ಯಾಟರ್ನ್ ನಮೂದಿಸಿ"</string>
     <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸಿ"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"ಬ್ಯಾಕ್‌ಸ್ಪೇಸ್ ಕೀ"</string>
+    <string name="enter_key" msgid="747962923921283095">"ಕೀ ಅನ್ನು ನಮೂದಿಸಿ"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"ಹಿಂದಕ್ಕೆ"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"ಪೂರ್ಣ ಸ್ಕ್ರೀನ್"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 6818a33c..f8fefd53 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"세션 종료"</string>
     <string name="car_new_user" msgid="6766334721724989964">"새 프로필"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"새 프로필을 추가하시겠습니까?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"새 프로필을 추가한 후 계정 소유자가 맞춤설정할 수 있습니다."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"어느 프로필이든 앱 업데이트를 설치할 수 있으며, 설치하고 나면 모든 프로필에서 사용할 수 있게 됩니다."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"최대 프로필 개수에 도달"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{프로필은 1개만 만들 수 있습니다.}other{프로필은 #개까지 만들 수 있습니다.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"로드 중"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g>이(가) 꺼져 있습니다."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"<xliff:g id="SENSOR">%1$s</xliff:g> 사용"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"권한 있는 앱용"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"마이크 설정"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"개인 정보 보호 설정"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> 앱이 <xliff:g id="SENSOR">%2$s</xliff:g>를 사용 중입니다."</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g>에서 마이크 사용 중"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> 앱이 최근에 <xliff:g id="SENSOR">%2$s</xliff:g>를 사용했습니다."</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"확인"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"차량 마이크를 사용 설정하시겠습니까?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"계속하려면 인포테인먼트 시스템 마이크를 사용 설정하세요. 그러면 권한이 있는 모든 앱에서 마이크가 사용 설정됩니다."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"카메라 설정"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> 앱이 카메라를 사용 중입니다."</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> 앱이 카메라를 사용 중입니다."</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> 앱이 최근에 카메라를 사용했습니다."</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"지도"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"미디어"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"제어 센터"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"어시스턴트"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"마이크 개인 정보 보호 칩"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"사용자 아바타"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"사용자 이름 텍스트"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"온도 내리기"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"온도 올리기"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"블루투스 설정: 연결 해제됨"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"소리 설정"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"프로필 및 계정 설정"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"로터리 패턴은 지원되지 않습니다. 터치를 사용하세요."</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"터치스크린 잠김"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"화면 잠김"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"화면이 잠겨 있음"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"화면 잠김"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"화면이 잠금 해제됨"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"로그아웃하시겠습니까?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"모든 열려 있는 애플리케이션이 닫힙니다."</string>
     <string name="user_logout" msgid="2934184154258330491">"로그아웃"</string>
     <string name="car_guest" msgid="768913000117469596">"게스트"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"프로필 전환 중…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"새 프로필 추가 중…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"프로필은 <xliff:g id="USER_LIMIT">%d</xliff:g>개까지 추가할 수 있습니다."</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"새 프로필을 추가하시겠습니까?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"계속하려면 <xliff:g id="USER_NAME">%1$s</xliff:g>님이 <xliff:g id="SEAT_LOCATION">%2$s</xliff:g> 화면에서 로그아웃해야 합니다."</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"프로필을 선택하여 시작하세요."</string>
+    <string name="logged_in_text" msgid="742324514947999718">"로그인됨"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"<xliff:g id="SEAT_LOCATION">%s</xliff:g> 화면에 로그인됨"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"새 프로필을 추가할 수 없습니다. 나중에 다시 시도해 주세요."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"게스트 프로필을 시작할 수 없습니다. 나중에 다시 시도해 주세요."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"로그아웃 중…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g>님이 로그아웃 중입니다. 나중에 다시 시도해 주세요."</string>
     <string name="seat_driver" msgid="4502591979520445677">"드라이버"</string>
     <string name="seat_front" msgid="836133281052793377">"전면"</string>
     <string name="seat_rear" msgid="403133444964528577">"후면"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"PIN 입력"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"패턴 입력"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"비밀번호 입력"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"백스페이스 키"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter 키"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=true;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"뒤로"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"전체 화면"</string>
 </resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index d915c7db..bb2b3000 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Сеансты бүтүрүү"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Жаңы профиль"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Жаңы профиль кошулсунбу?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Жаңы профилди кошконуңуздан кийин аккаунттун ээси аны тууралай алат."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Бардык профилдер колдонмо жаңыртуусун орното алат. Ал бардык профилдерде жеткиликтүү болот."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Профилдердин саны чекке жетти"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Бир профилди гана түзүүгө болот.}other{# профилге чейин кошууга болот.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Жүктөлүүдө"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> өчүк."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"<xliff:g id="SENSOR">%1$s</xliff:g> колдонуу"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Уруксаты бар колдонмолор үчүн"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Микрофондун параметрлери"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Купуялык параметрлери"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> төмөнкүнү колдонуп жатат: <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> микрофонду колдонуп жатышат"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> жакында төмөнкүнү колдонду: <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"Макул"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Унаанын микрофону күйгүзүлсүнбү?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Улантуу үчүн инфозоок тутумунун микрофонун күйгүзүңүз. Ушуну менен уруксаты бар бардык колдонмолор үчүн микрофон иштетилет."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Камеранын параметрлери"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> камераны колдонуп жатат"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> камераны колдонуп жатышат"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> жакында камераны колдонду"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Карталар"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Медиа"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Көзөмөлдөө борбору"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Жардамчы"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Микрофондун купуялык чиби"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Колдонуучунун аватары"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Колдонуучу атынын тексти"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Температураны төмөндөтүү"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Температураны жогорулатуу"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Bluetooth параметри: Ажыратылды"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Добуштун параметрлери"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Профилдердин жана аккаунттардын параметрлери"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Графикалык ачкычта буруу колдоого алынбайт; тийүүнү колдонуңуз"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Сенсордук экран кулпуланды"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Экраныңыз кулпуланды"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Экраныңыз кулпуланды"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Экраныңыз кулпуланды"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Экраныңыздын кулпусу ачылды"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Чын эле чыгасызбы?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Ушуну менен ачылып турган бардык колдонмолор жабылат"</string>
     <string name="user_logout" msgid="2934184154258330491">"Чыгуу"</string>
     <string name="car_guest" msgid="768913000117469596">"Конок"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Башка профилге которулууда…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Жаңы профиль кошулууда…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"<xliff:g id="USER_LIMIT">%d</xliff:g> профилге чейин кошууга болот"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Жаңы профилди кошосузбу?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Улантуу үчүн <xliff:g id="USER_NAME">%1$s</xliff:g> <xliff:g id="SEAT_LOCATION">%2$s</xliff:g> экранынан чыгышы керек"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Иштетүү үчүн профилди тандаңыз"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Кирип турасыз"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"<xliff:g id="SEAT_LOCATION">%s</xliff:g> экранына кирип турасыз"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Жаңы профиль кошулбай жатат. Кийинчерээк кайталап көрүңүз."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Конок профили иштебей жатат. Кийинчерээк кайталап көрүңүз."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Чыгып жатасыз…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> чыгып жатат. Кийинчерээк кайталап көрүңүз."</string>
     <string name="seat_driver" msgid="4502591979520445677">"айдоочу"</string>
     <string name="seat_front" msgid="836133281052793377">"маңдайкы"</string>
     <string name="seat_rear" msgid="403133444964528577">"арткы"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"PIN кодуңузду киргизиңиз"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Графикалык ачкычты тартыңыз"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Сырсөзүңүздү киргизиңиз"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Backspace баскычы"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter баскычы"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Артка"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Толук экран"</string>
 </resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index e516f3fa..f393ede5 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"ສິ້ນສຸດເຊດຊັນ"</string>
     <string name="car_new_user" msgid="6766334721724989964">"ໂປຣໄຟລ໌ໃໝ່"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"ເພີ່ມໂປຣໄຟລ໌ໃໝ່ບໍ?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"ຫຼັງຈາກທ່ານເພີ່ມໂປຣໄຟລ໌ໃໝ່ແລ້ວ, ເຈົ້າຂອງບັນຊີຈະສາມາດປັບແຕ່ງໄດ້."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"ທຸກໂປຣໄຟລ໌ສາມາດຕິດຕັ້ງການອັບເດດແອັບ, ເຊິ່ງຈະພ້ອມໃຫ້ໂປຣໄຟລ໌ທັງໝົດນຳໃຊ້ໄດ້ໃນພາຍຫຼັງ."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"ຮອດຂີດຈຳກັດໂປຣໄຟລ໌ແລ້ວ"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{ສາມາດສ້າງໄດ້ພຽງໂປຣໄຟລ໌ດຽວເທົ່ານັ້ນ.}other{ທ່ານສາມາດເພີ່ມໄດ້ເຖິງ # ໂປຣໄຟລ໌.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"ກຳລັງໂຫຼດ"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> ປິດຢູ່."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"ໃຊ້ <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"ສຳລັບແອັບທີ່ມີການອະນຸຍາດ"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"ການຕັ້ງຄ່າໄມໂຄຣໂຟນ"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"ການຕັ້ງຄ່າຄວາມເປັນສ່ວນຕົວ"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> ກຳລັງໃຊ້ <xliff:g id="SENSOR">%2$s</xliff:g> ຢູ່"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> ກຳລັງໃຊ້ໄມ"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> ໃຊ້ <xliff:g id="SENSOR">%2$s</xliff:g> ເມື່ອບໍ່ດົນມານີ້"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"ຕົກລົງ"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"ເປີດໄມໂຄຣໂຟນຂອງພາຫະນະບໍ?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"ເພື່ອສືບຕໍ່, ກະລຸນາເປີດໄມໂຄຣໂຟນຂອງລະບົບສາລະບັນເທີງ. ນີ້ຈະເປີດໄມໂຄຣໂຟນສຳລັບແອັບທັງໝົດທີ່ມີການອະນຸຍາດ."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"ຕັ້ງຄ່າກ້ອງ"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> ກຳລັງໃຊ້ກ້ອງຢູ່"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> ກຳລັງໃຊ້ກ້ອງຢູ່"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> ໄດ້ໃຊ້ກ້ອງເມື່ອບໍ່ດົນມານີ້"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"ແຜນທີ່"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"ສື່"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"ສູນຄວບຄຸມ"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"ຜູ້ຊ່ວຍ"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"ຊິບຄວາມເປັນສ່ວນຕົວຂອງໄມ"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"ຮູບແທນຕົວຂອງຜູ້ໃຊ້"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"ຂໍ້ຄວາມຊື່ຜູ້ໃຊ້"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"ປັບອຸນຫະພູມຕ່ຳລົງ"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"ປັບອຸນຫະພູມສູງຂຶ້ນ"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"ການຕັ້ງຄ່າ Bluetooth: ຢຸດການເຊື່ອມຕໍ່ແລ້ວ"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"ການຕັ້ງຄ່າສຽງ"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"ການຕັ້ງຄ່າໂປຣໄຟລ໌ ແລະ ບັນຊີ"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"ຮູບແບບບໍ່ຮອງຮັບປຸ່ມໝຸນ, ກະລຸນາໃຊ້ໜ້າຈໍສຳຜັດ"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"ໜ້າຈໍສຳຜັດລັອກຢູ່"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"ໜ້າຈໍຂອງທ່ານຖືກລັອກ"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"ໜ້າຈໍຂອງທ່ານລັອກຢູ່"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"ໜ້າຈໍຂອງທ່ານຖືກລັອກ"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"ຕອນນີ້ປົດລັອກໜ້າຈໍຂອງທ່ານແລ້ວ"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"ທ່ານແນ່ໃຈບໍວ່າຕ້ອງການອອກຈາກລະບົບ?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"ສິ່ງນີ້ຈະປິດແອັບພລິເຄຊັນທີ່ເປີດທັງໝົດ"</string>
     <string name="user_logout" msgid="2934184154258330491">"ອອກຈາກລະບົບ"</string>
     <string name="car_guest" msgid="768913000117469596">"ແຂກ"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"ກຳລັງສະຫຼັບໂປຣໄຟລ໌…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"ກຳລັງເພີ່ມໂປຣໄຟລ໌ໃໝ່…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"ທ່ານສາມາດເພີ່ມໄດ້ສູງສຸດ <xliff:g id="USER_LIMIT">%d</xliff:g> ໂປຣໄຟລ໌"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"ເພີ່ມໂປຣໄຟລ໌ໃໝ່ບໍ?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"ເພື່ອສືບຕໍ່, <xliff:g id="USER_NAME">%1$s</xliff:g> ຄວນອອກຈາກລະບົບໜ້າຈໍຂອງ <xliff:g id="SEAT_LOCATION">%2$s</xliff:g>"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"ເລືອກໂປຣໄຟລ໌ເພື່ອເລີ່ມ"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"ເຂົ້າສູ່ລະບົບແລ້ວ"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"ເຂົ້າສູ່ລະບົບຢູ່ໜ້າຈໍ <xliff:g id="SEAT_LOCATION">%s</xliff:g> ແລ້ວ"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"ບໍ່ສາມາດເພີ່ມໂປຣໄຟລ໌ໃໝ່ໄດ້. ກະລຸນາລອງໃໝ່ໃນພາຍຫຼັງ."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"ບໍ່ສາມາດເລີ່ມໂປຣໄຟລ໌ແຂກໄດ້. ກະລຸນາລອງໃໝ່ໃນພາຍຫຼັງ."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"ກຳລັງອອກຈາກລະບົບ…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> ກຳລັງຖືກໃຫ້ອອກຈາກລະບົບ. ກະລຸນາລອງໃໝ່ໃນພາຍຫຼັງ."</string>
     <string name="seat_driver" msgid="4502591979520445677">"ຄົນຂັບລົດ"</string>
     <string name="seat_front" msgid="836133281052793377">"ໜ້າ"</string>
     <string name="seat_rear" msgid="403133444964528577">"ທາງຫຼັງ"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"ໃສ່ລະຫັດ PIN ຂອງທ່ານ"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"ໃສ່ຮູບແບບຂອງທ່ານ"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"ໃສ່ລະຫັດຜ່ານຂອງທ່ານ"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"ປຸ່ມລຶບກັບຫຼັງ"</string>
+    <string name="enter_key" msgid="747962923921283095">"ປຸ່ມເອັນເທີ"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"ກັບຄືນ"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"ເຕັມຈໍ"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 2d99b41e..b5cfaa73 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Baigti seansą"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Naujas profilis"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Pridėti naują profilį?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Kai pridėsite naują profilį, paskyros savininkas galės jį tinkinti."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Bet kuriame profilyje galima įdiegti programos naujinį, kurį galima pasiekti visuose profiliuose."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Pasiektas profilių apribojimas"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Galima sukurti tik vieną profilį.}one{Galite pridėti iki # profilio.}few{Galite pridėti iki # profilių.}many{Galite pridėti iki # profilio.}other{Galite pridėti iki # profilių.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Įkeliama"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> – išjungta."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Naudoti: <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Programoms, turinčioms leidimą"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Mikrofono nustatymai"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Privatumo nustatymai"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"Programa „<xliff:g id="APP">%1$s</xliff:g>“ naudoja: <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"Naudoja mikrofoną: <xliff:g id="APP_LIST">%s</xliff:g>"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"Programa „<xliff:g id="APP">%1$s</xliff:g>“ neseniai naudojo: <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"Gerai"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Įjungti transporto priemonės mikrofoną?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Norėdami tęsti, įjunkite informacinės pramoginės sistemos mikrofoną. Tai atlikus, mikrofonas bus įjungtas visoms leidimą turinčioms programoms."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Fotoaparato nustatymai"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"Programa „<xliff:g id="APP">%s</xliff:g>“ naudoja fotoaparatą"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"Programos (<xliff:g id="APP_LIST">%s</xliff:g>) naudoja fotoaparatą"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"Programa „<xliff:g id="APP">%s</xliff:g>“ neseniai naudojo fotoaparatą"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Žemėlapiai"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Medija"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Valdymo centras"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Padėjėjas"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Mikrofono privatumo fragmentas"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Naudotojo pseudoportretas"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Naudotojo vardo tekstas"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Sumažinti temperatūrą"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Padidinti temperatūrą"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"„Bluetooth“ nustatymas: atsijungta"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Garso nustatymai"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Profilių ir paskyrų nustatymai"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Atr. pieš. negalima nubr. sukam. įvest. vald."</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Jutiklinis ekranas užrakintas"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Jūsų ekranas užrakintas"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Jūsų ekranas užrakintas"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Jūsų ekranas užrakintas"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Jūsų ekranas dabar atrakintas"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Ar tikrai norite atsijungti?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Bus uždarytos visos atidarytos programos"</string>
     <string name="user_logout" msgid="2934184154258330491">"Atsijungti"</string>
     <string name="car_guest" msgid="768913000117469596">"Svečias"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Perjungiamas profilis…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Pridedamas naujas profilis…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Galite pridėti daugiausia tiek profilių: <xliff:g id="USER_LIMIT">%d</xliff:g>"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Pridėti naują profilį?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Jei norite tęsti, <xliff:g id="USER_NAME">%1$s</xliff:g> turėtų atsijungti nuo <xliff:g id="SEAT_LOCATION">%2$s</xliff:g> ekrano"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Profilio pasirinkimas norint pradėti"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Prisijungta"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Prisijungta <xliff:g id="SEAT_LOCATION">%s</xliff:g> ekrane"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Nepavyko pridėti naujo profilio. Vėliau bandykite dar kartą."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Nepavyko paleisti svečio profilio. Vėliau bandykite dar kartą."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Atsijungiama…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> atsijungė. Vėliau bandykite dar kartą."</string>
     <string name="seat_driver" msgid="4502591979520445677">"vairuotojas"</string>
     <string name="seat_front" msgid="836133281052793377">"priekis"</string>
     <string name="seat_rear" msgid="403133444964528577">"galas"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Įveskite PIN kodą"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Nubrėžkite atrakinimo piešinį"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Įveskite slaptažodį"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Naikinimo klavišas"</string>
+    <string name="enter_key" msgid="747962923921283095">"Klavišas „Enter“"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Atgal"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Visas ekranas"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 34cf70e4..38b23dfc 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Beigt sesiju"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Jauns profils"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Vai pievienot jaunu profilu?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Kad būsiet pievienojis jaunu profilu, konta īpašnieks varēs to pielāgot."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Jebkurā profilā var instalēt lietotnes atjauninājumu, kas pēc tam būs pieejams visos profilos."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Sasniegts profilu ierobežojums"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Var izveidot tikai vienu profilu.}zero{Varat pievienot ne vairāk kā # profilus.}one{Varat pievienot ne vairāk kā # profilu.}other{Varat pievienot ne vairāk kā # profilus.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Notiek ielāde…"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> ir izslēgtā stāvoklī."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Izmantot šādu sensoru: <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Lietotnēm, kurām ir atļauja"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Mikrofona iestatījumi"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Konfidencialitātes iestatījumi"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> pašlaik izmanto šādu sensoru: <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"Lietotnes <xliff:g id="APP_LIST">%s</xliff:g> izmanto mikrofonu"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> nesen izmantoja šādu sensoru: <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"Labi"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Vai ieslēgt transportlīdzekļa mikrofonu?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Lai turpinātu, ieslēdziet informatīvi izklaidējošās sistēmas mikrofonu. Tādējādi mikrofons tiks ieslēgts visām lietotnēm, kurām ir atļauja."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Kameras iestatījumi"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> pašlaik izmanto kameru"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"Šīs lietotnes izmanto kameru: <xliff:g id="APP_LIST">%s</xliff:g>"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> nesen izmantoja kameru"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Multivide"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Vadības centrs"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Asistents"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Mikrofona konfidencialitātes žetons"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Lietotāja iemiesojums"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Lietotājvārda teksts"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Pazemināt temperatūru"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Paaugstināt temperatūru"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Bluetooth iestatījums: savienojums pārtraukts"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Skaņas iestatījumi"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Profilu un kontu iestatījumi"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Tiek atbalstīta skārienievade, bet ne rotācija."</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Skārienekrāns ir bloķēts"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Jūsu ekrāns ir bloķēts"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Jūsu ekrāns ir bloķēts"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Jūsu ekrāns ir bloķēts"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Jūsu ekrāns tagad ir atbloķēts"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Vai tiešām vēlaties atteikties?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Tādējādi tiks aizvērtas visas atvērtās lietojumprogrammas."</string>
     <string name="user_logout" msgid="2934184154258330491">"Atteikties"</string>
     <string name="car_guest" msgid="768913000117469596">"Viesis"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Notiek profila pārslēgšana…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Notiek jauna profila pievienošana…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Varat pievienot ne vairāk kā <xliff:g id="USER_LIMIT">%d</xliff:g> profilus."</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Vai pievienot jaunu profilu?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Lai turpinātu, lietotājam <xliff:g id="USER_NAME">%1$s</xliff:g> ir jāizrakstās no šī lietotāja ekrāna: <xliff:g id="SEAT_LOCATION">%2$s</xliff:g>."</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Atlasiet profilu, lai sāktu"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Esat pierakstījies"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Esat pierakstījies šī lietotāja ekrānā: <xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Nevar pievienot jaunu profilu. Vēlāk mēģiniet vēlreiz."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Nevar izveidot viesa profilu. Vēlāk mēģiniet vēlreiz."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Notiek izrakstīšanās…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"Notiek lietotāja <xliff:g id="USER_NAME">%s</xliff:g> izrakstīšana. Vēlāk mēģiniet vēlreiz."</string>
     <string name="seat_driver" msgid="4502591979520445677">"vadītāja sēdeklī"</string>
     <string name="seat_front" msgid="836133281052793377">"priekšējā sēdeklī"</string>
     <string name="seat_rear" msgid="403133444964528577">"aizmugurējā sēdeklī"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Ievadiet PIN"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Ievadiet kombināciju"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Ievadiet paroli"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Atkāpšanās taustiņš"</string>
+    <string name="enter_key" msgid="747962923921283095">"Ievadīšanas taustiņš"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Atpakaļ"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Pilnekrāna režīms"</string>
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 0dc67f0e..507a3903 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Заврши ја сесијата"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Нов профил"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Да се додаде нов профил?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Откако ќе додадете нов профил, сопственикот на сметката може да го приспособи."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Секој профил може да инсталира ажурирање на апликација, што потоа ќе биде достапно за сите профили."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Достигнат е максимален број профили"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Може да се создаде само еден профил.}one{Може да додадете најмногу # профил.}other{Може да додадете најмногу # профили.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Се вчитува"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> е исклучен."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Користи <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"за апликациите што имаат дозвола"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Поставки за микрофонот"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Поставки за приватност"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> користи <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> го користат микрофонот"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> користеше <xliff:g id="SENSOR">%2$s</xliff:g> неодамна"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"Во ред"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Да се вклучи микрофонот на возилото?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"За да продолжите, вклучете го микрофонот на системот за информации и забава. Ова ќе го вклучи микрофонот за сите апликации што имаат дозвола."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Поставки на камерата"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> ја користи камерата"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> ја користат камерата"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> ја користеше камерата неодамна"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Карти"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Аудиовизуелни содржини"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Контролен центар"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Помошник"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Чип за приватност на микрофонот"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Аватар на корисникот"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Текст за корисничкото име"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Намалете ја температурата"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Зголемете ја температурата"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Поставка за Bluetooth: прекината врска"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Поставки за звук"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Поставки за профили и сметки"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Шемата не поддржува вртење; користете допир"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Допирниот екран е заклучен"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Вашиот екран е заклучен"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Вашиот екран е заклучен"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Вашиот екран е заклучен"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Вашиот екран сега е отклучен"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Дали сте сигурни дека сакате да се одјавите?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Ова ќе ги затвори сите отворени апликации"</string>
     <string name="user_logout" msgid="2934184154258330491">"Одјавете се"</string>
     <string name="car_guest" msgid="768913000117469596">"Гостин"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Се менува профилот…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Се додава нов профил…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Може да додадете најмногу <xliff:g id="USER_LIMIT">%d</xliff:g> профили"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Дали да се додаде нов профил?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"За да продолжи, <xliff:g id="USER_NAME">%1$s</xliff:g> треба да се одјави од екранот на <xliff:g id="SEAT_LOCATION">%2$s</xliff:g>"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Изберете профил за да започнете"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Најавени сте"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Најавени сте на екранот на <xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Не може да се додаде нов профил. Обидете се повторно подоцна."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Не може да се започне гостински профил. Обидете се повторно подоцна."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Се одјавува…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> се одјавува. Обидете се повторно подоцна."</string>
     <string name="seat_driver" msgid="4502591979520445677">"возачкото"</string>
     <string name="seat_front" msgid="836133281052793377">"предното"</string>
     <string name="seat_rear" msgid="403133444964528577">"задното"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Внесете го PIN-кодот"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Внесете ја шемата"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Внесете ја лозинката"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Копче Backspace"</string>
+    <string name="enter_key" msgid="747962923921283095">"Копче Enter"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Назад"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Цел екран"</string>
 </resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 12c437b9..b6eec117 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -36,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> ഓഫാണ്."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"<xliff:g id="SENSOR">%1$s</xliff:g> ഉപയോഗിക്കുക"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"അനുമതിയുള്ള ആപ്പുകൾക്ക്"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"മൈക്രോഫോൺ ക്രമീകരണങ്ങൾ"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"സ്വകാര്യതാ ക്രമീകരണം"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> ആപ്പ് <xliff:g id="SENSOR">%2$s</xliff:g> ഉപയോഗിക്കുന്നു"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> എന്നിവ മൈക്ക് ഉപയോഗിക്കുന്നു"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> ആപ്പ് അടുത്തിടെ <xliff:g id="SENSOR">%2$s</xliff:g> ഉപയോഗിച്ചു"</string>
@@ -46,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"ശരി"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"വാഹനത്തിന്റെ മൈക്രോഫോൺ ഓണാക്കണോ?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"തുടരാൻ, ഇൻഫോറ്റേയിൻമെന്റ് സി‌സ്‌റ്റം മൈക്രോഫോൺ ഓണാക്കുക. ഇത് അനുമതിയുള്ള എല്ലാ ആപ്പുകൾക്കും മൈക്രോഫോൺ ഓണാക്കും."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"ക്യാമറാ ക്രമീകരണം"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> ആപ്പ് ക്യാമറ ഉപയോഗിക്കുന്നു"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> ആപ്പുകൾ ക്യാമറ ഉപയോഗിക്കുന്നു"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> ആപ്പ് അടുത്തിടെ ക്യാമറ ഉപയോഗിച്ചു"</string>
@@ -64,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"മീഡിയ"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"നിയന്ത്രണ കേന്ദ്രം"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistant"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"മൈക്ക് സ്വകാര്യതാ ചിപ്പ്"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"ഉപയോക്താവിന്റെ അവതാർ"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"ഉപയോക്തൃനാമത്തിന്റെ ടെക്സ്റ്റ്"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"താപനില കുറയ്ക്കുക"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"താപനില കൂട്ടുക"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Bluetooth ക്രമീകരണം: വിച്ഛേദിച്ചു"</string>
@@ -88,8 +91,9 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"ശബ്‌ദ ക്രമീകരണം"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"പ്രൊഫൈലുകളും അക്കൗണ്ടുകളും ക്രമീകരണം"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"റോട്ടറിക്ക് പാറ്റേണിന്റെ പിന്തുണയില്ല, ടച്ച് ഉപയോഗിക്കൂ"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"ടച്ച്‌ സ്‌ക്രീൻ ലോക്ക് ചെയ്തു"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"നിങ്ങളുടെ സ്ക്രീൻ ലോക്ക് ചെയ്തിരിക്കുന്നു"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"നിങ്ങളുടെ സ്ക്രീൻ ലോക്ക് ചെയ്തിരിക്കുന്നു"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"നിങ്ങളുടെ സ്ക്രീൻ ലോക്ക് ചെയ്തിരിക്കുന്നു"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"നിങ്ങളുടെ സ്ക്രീൻ ഇപ്പോൾ അൺലോക്ക് ചെയ്തിരിക്കുന്നു"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"ലോഗ് ഔട്ട് ചെയ്യണമെന്ന് ഉറപ്പാണോ?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"ഇത്, തുറന്നിരിക്കുന്ന എല്ലാ ആപ്പുകളും അടയ്ക്കും"</string>
     <string name="user_logout" msgid="2934184154258330491">"ലോഗൗട്ട് ചെയ്യുക"</string>
@@ -119,4 +123,9 @@
     <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"പിൻ നൽകുക"</string>
     <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"നിങ്ങളുടെ പാറ്റേൺ നൽകുക"</string>
     <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"പാസ്‌വേഡ് നൽകുക"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Backspace കീ"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter കീ"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"മടങ്ങുക"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"പൂർണ്ണ സ്ക്രീൻ"</string>
 </resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 5665eabd..3c3b1b40 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Харилцан үйлдлийг дуусгах"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Шинэ профайл"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Шинэ профайл нэмэх үү?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Таныг шинэ профайл нэмсний дараа бүртгэл эзэмшигч үүнийг өөрчлөх боломжтой."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Дурын профайл аппын шинэчлэлт суулгах боломжтой ба ингэснээр энэ нь бүх профайлд боломжтой болно."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Профайлын хязгаарт хүрсэн"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Зөвхөн нэг профайл үүсгэх боломжтой.}other{Та # хүртэлх профайл нэмэх боломжтой.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Ачаалж байна"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> унтраалттай байна."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"<xliff:g id="SENSOR">%1$s</xliff:g>-г ашиглах"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Зөвшөөрөлтэй аппуудад"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Микрофоны тохиргоо"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Нууцлалын тохиргоо"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> <xliff:g id="SENSOR">%2$s</xliff:g>-г ашиглаж байна"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> микрофоныг ашиглаж байна"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> <xliff:g id="SENSOR">%2$s</xliff:g>-г саяхан ашигласан"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Тээврийн хэрэгслийн микрофоныг асаах уу?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Үргэлжлүүлэхийн тулд инфотэйнмент системийн микрофоныг асаана уу. Энэ нь зөвшөөрөлтэй бүх аппын микрофоныг асаах болно."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Камерын тохиргоо"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> камерыг ашиглаж байна"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> камерыг ашиглаж байна"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> саяхан камер ашигласан"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Газрын зураг"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Медиа"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Хяналтын төв"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Туслах"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Микрофоны нууцлалын чип"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Хэрэглэгчийн аватар"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Хэрэглэгчийн нэрийн текст"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Температурыг багасгах"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Температурыг өсгөх"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Bluetooth тохиргоо: салсан"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Дууны тохиргоо"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Профайл болон бүртгэлийн тохиргоо"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Хээ нь эргүүлэхийг дэмждэггүй. Хүрэлт ашиглана уу"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Мэдрэгчтэй дэлгэцийг түгжсэн"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Таны дэлгэцийг түгжсэн байна"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Таны дэлгэцийг түгжсэн"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Таны дэлгэцийг түгжсэн байна"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Одоо таны дэлгэцийн түгжээг тайлсан"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Та гарахдаа итгэлтэй байна уу?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Энэ нь бүх нээлттэй аппликэйшнийг хаана"</string>
     <string name="user_logout" msgid="2934184154258330491">"Гарах"</string>
     <string name="car_guest" msgid="768913000117469596">"Зочин"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Профайл сэлгэж байна…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Шинэ профайл нэмж байна…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Та <xliff:g id="USER_LIMIT">%d</xliff:g> хүртэлх профайл нэмэх боломжтой"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Шинэ профайл нэмэх үү?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Үргэлжлүүлэхийн тулд <xliff:g id="USER_NAME">%1$s</xliff:g> <xliff:g id="SEAT_LOCATION">%2$s</xliff:g> дэлгэцээс гарах ёстой"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Эхлүүлэхийн тулд профайл сонгох"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Нэвтэрсэн"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"<xliff:g id="SEAT_LOCATION">%s</xliff:g> дэлгэцэд нэвтэрсэн"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Шинэ профайл нэмэх боломжгүй. Дараа дахин оролдоно уу."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Зочны профайлыг эхлүүлэх боломжгүй. Дараа дахин оролдоно уу."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Гарч байна…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g>-г гаргаж байна. Дараа дахин оролдоно уу."</string>
     <string name="seat_driver" msgid="4502591979520445677">"жолооч"</string>
     <string name="seat_front" msgid="836133281052793377">"урд тал"</string>
     <string name="seat_rear" msgid="403133444964528577">"ар тал"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"ПИН-ээ оруулна уу"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Хээгээ оруулна уу"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Нууц үгээ оруулна уу"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Ухраах товч"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter товч"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Буцах"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Бүтэн дэлгэц"</string>
 </resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 3fef706c..d8d5b4fa 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"सेशन संपवा"</string>
     <string name="car_new_user" msgid="6766334721724989964">"नवीन प्रोफाइल"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"नवीन प्रोफाइल जोडायची आहे का?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"तुम्ही नवीन प्रोफाइल जोडल्यावर, खातेधारक ती कस्टमाइझ करू शकतो."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"कोणतीही प्रोफाइल ही अ‍ॅप अपडेट इंस्टॉल करू शकते, जे त्यानंतर सर्व प्रोफाइलसाठी उपलब्ध असेल."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"प्रोफाइलची मर्यादा गाठली आहे"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{फक्त एक प्रोफाइल तयार केली जाऊ शकते.}other{तुम्ही कमाल # प्रोफाइल जोडू शकता.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"लोड करत आहे"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> बंद आहे."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"<xliff:g id="SENSOR">%1$s</xliff:g> वापरा"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"परवानगी असलेल्या ॲप्ससाठी"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"मायक्रोफोनची सेटिंग्ज"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"गोपनीयता सेटिंग्ज"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> हे <xliff:g id="SENSOR">%2$s</xliff:g> वापरत आहे"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> माइक वापरत आहेत"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> ने अलीकडे <xliff:g id="SENSOR">%2$s</xliff:g> वापरला होता"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"ओके"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"वाहनातील मायक्रोफोन सुरू करायचा का?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"पुढे सुरू ठेवण्यासाठी, इंफोटेनमेंट सिस्टीम मायक्रोफोन सुरू करा. हे परवानगी असलेल्या सर्व ॲप्ससाठी मायक्रोफोन सुरू करेल."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"कॅमेरा सेटिंग्ज"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> कॅमेरा वापरत आहे"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> कॅमेरा वापरत आहेत"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> ने अलीकडे कॅमेरा वापरला होता"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"मीडिया"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"नियंत्रण केंद्र"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistant"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"माइक गोपनीयता चिप"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"वापरकर्ता अवतार"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"वापरकर्ता नाव मजकूर"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"तापमान कमी करा"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"तापमान वाढवा"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"ब्लूटूथ सेटिंग: डिस्कनेक्ट केले आहे"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"आवाजाची सेटिंग्ज"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"प्रोफाइल आणि खात्यांची सेटिंग्ज"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"रोटरीला पॅटर्नचा सपोर्ट नाही; कृपया टच वापरा"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"टच स्क्रीन लॉक केली आहे"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"तुमची स्क्रीन लॉक करण्यात आली आहे"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"तुमची स्क्रीन लॉक केली आहे"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"तुमची स्क्रीन लॉक केली आहे"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"तुमची स्क्रीन आता अनलॉक केली आहे"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"तुम्हाला नक्की लॉग आउट करायचे आहे का?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"यामुळे उघडी असलेली सर्व अ‍ॅप्लिकेशन बंद केली जातील"</string>
     <string name="user_logout" msgid="2934184154258330491">"लॉग आउट करा"</string>
     <string name="car_guest" msgid="768913000117469596">"अतिथी"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"प्रोफाइल स्विच करत आहे…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"नवीन प्रोफाइल जोडत आहे…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"तुम्ही कमाल <xliff:g id="USER_LIMIT">%d</xliff:g> प्रोफाइल जोडू शकता."</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"नवीन प्रोफाइल जोडायची आहे का?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"पुढे सुरू ठेवण्यासाठी, <xliff:g id="USER_NAME">%1$s</xliff:g> यांनी <xliff:g id="SEAT_LOCATION">%2$s</xliff:g> स्क्रीनमधून साइन आउट करणे आवश्यक आहे"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"सुरू करण्यासाठी प्रोफाइल निवडा"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"साइन इन केले"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"<xliff:g id="SEAT_LOCATION">%s</xliff:g> स्क्रीनवर साइन इन करा"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"नवीन प्रोफाइल जोडू शकत नाही. नंतर पुन्हा प्रयत्न करा."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"अतिथी प्रोफाइल सुरू करू शकत नाही. नंतर पुन्हा प्रयत्न करा."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"साइन आउट करत आहे…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> यांना साइन आउट केले जात आहे. नंतर पुन्हा प्रयत्न करा."</string>
     <string name="seat_driver" msgid="4502591979520445677">"ड्रायव्हर"</string>
     <string name="seat_front" msgid="836133281052793377">"समोरचा"</string>
     <string name="seat_rear" msgid="403133444964528577">"मागचा डबा"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"तुमचा पिन एंटर करा"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"तुमचा पॅटर्न एंटर करा"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"तुमचा पासवर्ड एंटर करा"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"बॅकस्‍पेस की"</string>
+    <string name="enter_key" msgid="747962923921283095">"एंटर की"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"मागे जा"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"फुल स्क्रीन"</string>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 220ece07..85d8ce77 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Tamatkan sesi"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Profil Baharu"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Tambah profil baharu?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Selepas anda menambah profil baharu, pemegang akaun boleh menyesuaikan profil tersebut."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Mana-mana profil boleh memasang kemaskinian apl yang akan tersedia untuk semua profil."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Had profil dicapai"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Hanya satu profil boleh dibuat.}other{Anda boleh menambahkan sehingga # profil.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Memuatkan"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> dimatikan."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Gunakan <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Untuk apl yang mempunyai kebenaran"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Tetapan mikrofon"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Tetapan privasi"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> sedang menggunakan <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> sedang menggunakan mikrofon"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> menggunakan <xliff:g id="SENSOR">%2$s</xliff:g> baru-baru ini"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Hidupkan mikrofon kenderaan?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Untuk meneruskan, hidupkan mikrofon sistem maklumat hibur. Tindakan ini akan menghidupkan mikrofon untuk semua aplikasi yang mempunyai kebenaran."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Tetapan kamera"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> sedang menggunakan kamera"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> sedang menggunakan kamera"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> menggunakan kamera baru-baru ini"</string>
@@ -63,9 +60,13 @@
     <string name="system_bar_applications_label" msgid="7081862804211786227">"Aplikasi"</string>
     <string name="system_bar_climate_control_label" msgid="4091187805919276017">"Kawalan Iklim"</string>
     <string name="system_bar_notifications_label" msgid="6039158514903928210">"Pemberitahuan"</string>
-    <string name="system_bar_maps_label" msgid="7883864993280235380">"Peta"</string>
+    <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Media"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Pusat Kawalan"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistant"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Cip Privasi Mikrofon"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Avatar Pengguna"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Teks Nama Pengguna"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Kurangkan suhu"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Tinggikan suhu"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Tetapan Bluetooth: Diputuskan Sambungan"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Tetapan bunyi"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Tetapan profil &amp; akaun"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Corak tak sokong putaran; guna sentuhan"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Skrin sentuh dikunci"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Skrin anda telah dikunci"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Skrin anda dikunci"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Skrin anda telah dikunci"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Kini skrin anda dibuka kunci"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Adakah anda pasti mahu log keluar?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Tindakan ini akan menutup semua aplikasi yang dibuka"</string>
     <string name="user_logout" msgid="2934184154258330491">"Log keluar"</string>
     <string name="car_guest" msgid="768913000117469596">"Tetamu"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Menukar profil…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Menambah profil baharu…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Anda boleh menambahkan hingga <xliff:g id="USER_LIMIT">%d</xliff:g> profil"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Tambah profil baharu?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Untuk meneruskan, <xliff:g id="USER_NAME">%1$s</xliff:g> mestilah log keluar dari skrin <xliff:g id="SEAT_LOCATION">%2$s</xliff:g>"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Pilih profil untuk bermula"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Dilog masuk"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Dilog masuk pada skrin <xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Tidak dapat menambah profil baharu. Cuba lagi nanti."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Tidak dapat memulakan profil Tetamu. Cuba lagi nanti."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Melog keluar…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> sedang dilog keluar. Cuba lagi nanti."</string>
     <string name="seat_driver" msgid="4502591979520445677">"pemandu"</string>
     <string name="seat_front" msgid="836133281052793377">"hadapan"</string>
     <string name="seat_rear" msgid="403133444964528577">"belakang"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Masukkan PIN anda"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Masukkan corak anda"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Masukkan kata laluan anda"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Kekunci undur ruang"</string>
+    <string name="enter_key" msgid="747962923921283095">"Kekunci enter"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=true;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Kembali"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Skrin Penuh"</string>
 </resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 98d095ed..3ecc1f3a 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"စက်ရှင်ပြီးဆုံးရန်"</string>
     <string name="car_new_user" msgid="6766334721724989964">"ပရိုဖိုင်အသစ်"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"ပရိုဖိုင်အသစ် ထည့်မလား။"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"သင်ပရိုဖိုင်အသစ် ထည့်ပြီးနောက် အကောင့်ပိုင်ရှင်က ၎င်းကို စိတ်ကြိုက်လုပ်နိုင်သည်။"</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"မည်သည့်ပရိုဖိုင်မဆို အက်ပ်အပ်ဒိတ်အသစ် ထည့်သွင်းနိုင်ပြီး ၎င်းကို ပရိုဖိုင်အားလုံးတွင် ရနိုင်မည်။"</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"ပရိုဖိုင်ကန့်သတ်ချက် ပြည့်သွားပါပြီ"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{ပရိုဖိုင်တစ်ခုသာ ပြုလုပ်နိုင်သည်။}other{ပရိုဖိုင် # ခုအထိ ထည့်နိုင်သည်။}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"ဖွင့်နေသည်"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> ပိတ်ထားသည်။"</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"<xliff:g id="SENSOR">%1$s</xliff:g> သုံးရန်"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"ခွင့်ပြုချက်ရှိသော အက်ပ်များအတွက်"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"မိုက်ခရိုဖုန်း ဆက်တင်များ"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"ကန့်သတ်ဆက်တင်များ"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> သည် <xliff:g id="SENSOR">%2$s</xliff:g> ကို သုံးနေသည်"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> တို့သည် မိုက်ကို သုံးနေသည်"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> သည် ဤ <xliff:g id="SENSOR">%2$s</xliff:g> ကို မကြာသေးမီကသုံးထားသည်"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"ယာဉ်၏မိုက်ခရိုဖုန်း ဖွင့်မလား။"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"ရှေ့ဆက်ရန် သတင်းနှင့်ဖျော်ဖြေရေး စနစ် မိုက်ခရိုဖုန်း ဖွင့်ပါ။ ၎င်းသည် ခွင့်ပြုချက်ရှိသော အက်ပ်အားလုံးအတွက် မိုက်ခရိုဖုန်းကို ဖွင့်ပါမည်။"</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"ကင်မရာဆက်တင်များ"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> သည် ကင်မရာကို သုံးနေသည်"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> တို့သည် ကင်မရာကို သုံးနေသည်"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> သည် ကင်မရာကို မကြာသေးမီကသုံးထားသည်"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"မီဒီယာ"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"ထိန်းချုပ်ဋ္ဌာန"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistant"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"MIC ကိုယ်ရေးအချက်အလက်လုံခြုံမှု ချစ်ပ်"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"အသုံးပြုသူ ချန်နယ်ပုံ"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"အသုံးပြုသူအမည် စာသား"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"အပူလျှော့ရန်"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"အပူတိုးရန်"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"ဘလူးတုသ် ဆက်တင်- ချိတ်မထားပါ"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"အသံဆက်တင်များ"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"ပရိုဖိုင်နှင့် အကောင့် ဆက်တင်များ"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"ပုံစံကလှည့်ပတ်မှုကို မထောက်ပံ့၍ ထိတွေ့မှုကိုသုံးပါ"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"တို့ထိမျက်နှာပြင် လော့ခ်ချထားသည်"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"စခရင် လော့ခ်ချထားသည်"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"သင့်ဖန်သားပြင် ပိတ်ထားသည်"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"စခရင် လော့ခ်ချထားသည်"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"သင့်ဖန်သားပြင် ယခု ဖွင့်ထားသည်"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"စနစ်မှထွက်လိုသည်မှာ သေချာပါသလား။"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"၎င်းက ဖွင့်ထားသော အပလီကေးရှင်းအားလုံးကို ပိတ်မည်"</string>
     <string name="user_logout" msgid="2934184154258330491">"စနစ်မှထွက်ရန်"</string>
     <string name="car_guest" msgid="768913000117469596">"ဧည့်သည်"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"ပရိုဖိုင် ပြောင်းနေသည်…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"ပရိုဖိုင်အသစ် ထည့်နေသည်…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"ပရိုဖိုင် <xliff:g id="USER_LIMIT">%d</xliff:g> ခုအထိ ထည့်နိုင်သည်"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"ပရိုဖိုင်အသစ် ထည့်မလား။"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"ရှေ့ဆက်ရန် <xliff:g id="USER_NAME">%1$s</xliff:g> သည် <xliff:g id="SEAT_LOCATION">%2$s</xliff:g> စခရင်မှ ထွက်ရမည်"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"စတင်ရန် ပရိုဖိုင် ရွေးပါ"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"လက်မှတ်ထိုးဝင်ထားသည်"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"<xliff:g id="SEAT_LOCATION">%s</xliff:g> စခရင်တွင် လက်မှတ်ထိုးဝင်ထားသည်"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"ပရိုဖိုင်အသစ် ထည့်၍မရပါ။ နောက်မှ ထပ်စမ်းကြည့်ပါ။"</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"‘ဧည့်သည်ပရိုဖိုင်’ စတင်၍မရပါ။ နောက်မှ ထပ်စမ်းကြည့်ပါ။"</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"ထွက်နေသည်…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> ထွက်နေသည်။ နောက်မှ ထပ်စမ်းကြည့်ပါ။"</string>
     <string name="seat_driver" msgid="4502591979520445677">"ယာဉ်မောင်းသူ"</string>
     <string name="seat_front" msgid="836133281052793377">"အရှေ့"</string>
     <string name="seat_rear" msgid="403133444964528577">"နောက်ဘက်"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"ပင်နံပါတ် ထည့်ပါ"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"ပုံဖော်ခြင်း ထည့်ပါ"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"စကားဝှက် ထည့်ပါ"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"နောက်ပြန်ခလုတ်"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter ခလုတ်"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"နောက်သို့"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"ဖန်သားပြင်အပြည့်"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index f48c25ca..1e77eecf 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Avslutt økten"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Ny profil"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Vil du legge til en ny profil?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Når du har lagt til en ny profil, kan kontoeieren tilpasse den."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Alle profiler kan installere appoppdateringer, som deretter blir tilgjengelige for alle profilene."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Grensen for antall profiler er nådd"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Du kan bare opprette én profil.}other{Du kan legge til opptil # profiler.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Laster inn"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> er av."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Bruk <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"For apper som har tillatelse"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Mikrofoninnstillinger"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Personverninnstillinger"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> bruker <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> bruker mikrofonen"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> har nylig brukt <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Vil du slå på mikrofonen i kjøretøyet?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"For å fortsette, slå på mikrofonen til infotainment-systemet. Dette gjør at mikrofonen slås på for alle apper som har tillatelse."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Kamerainnstillinger"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> bruker kameraet"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> bruker kameraet"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> har nylig brukt kameraet"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Media"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Kontrollsenter"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistent"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Personvernbrikke for mikrofonen"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Brukerbilde"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Brukernavn (tekst)"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Skru ned temperaturen"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Skru opp temperaturen"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Bluetooth-innstilling: frakoblet"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Lydinnstillinger"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Profil- og kontoinnstillinger"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Mønsteret støtter ikke rotasjon. Bruk berøring."</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Berøringsskjermen er låst"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Skjermen din er låst"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Skjermen er låst"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Skjermen er låst"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Nå er skjermen låst opp"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Er du sikker på at du vil logge av?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Dette fører til at alle åpne apper lukkes"</string>
     <string name="user_logout" msgid="2934184154258330491">"Logg av"</string>
     <string name="car_guest" msgid="768913000117469596">"Gjest"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Bytter profil …"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Legger til en ny profil …"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Du kan legge til opptil <xliff:g id="USER_LIMIT">%d</xliff:g> profiler"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Vil du legge til en ny profil?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"For å fortsette må <xliff:g id="USER_NAME">%1$s</xliff:g> logge av <xliff:g id="SEAT_LOCATION">%2$s</xliff:g>-skjermen"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Velg en profil for å komme i gang"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Pålogget"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Pålogget på <xliff:g id="SEAT_LOCATION">%s</xliff:g>-skjermen"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Kan ikke legge til en ny profil. Prøv på nytt senere."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Kan ikke åpne gjesteprofilen. Prøv på nytt senere."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Logger av …"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> logges av. Prøv på nytt senere."</string>
     <string name="seat_driver" msgid="4502591979520445677">"for sjåføren"</string>
     <string name="seat_front" msgid="836133281052793377">"foran"</string>
     <string name="seat_rear" msgid="403133444964528577">"bak"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Skriv inn PIN-koden din"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Legg inn mønsteret ditt"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Skriv inn passordet ditt"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Tilbake-tasten"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter-tasten"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Tilbake"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Fullskjerm"</string>
 </resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 7f8bdaca..179da894 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"सत्र अन्त्य गर्नुहोस्"</string>
     <string name="car_new_user" msgid="6766334721724989964">"नयाँ प्रोफाइल"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"नयाँ प्रोफाइल थप्ने हो?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"तपाईंले नयाँ प्रोफाइल हालेपछि खातावाला उक्त प्रोफाइल कस्टमाइज गर्न सक्नुहुन्छ।"</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"जुनसुकै प्रोफाइलबाट एपको अपडेट इन्स्टल गर्न मिल्छ र अपडेट गरिएको एप सबै प्रोफाइलमा उपलब्ध हुन्छ।"</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"योभन्दा बढी प्रोफाइल थप्न मिल्दैन"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{तपाईं एउटा मात्र प्रोफाइल बनाउन सक्नुहुन्छ।}other{तपाईं बढीमा # वटा प्रोफाइल थप्न सक्नुहुन्छ।}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"लोड गरिँदै"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> अफ छ।"</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"<xliff:g id="SENSOR">%1$s</xliff:g> प्रयोग गर्नुहोस्"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"अनुमति प्राप्त एपहरूका हकमा"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"माइक्रोफोनसम्बन्धी सेटिङ"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"गोपनीयतासम्बन्धी सेटिङ"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> ले <xliff:g id="SENSOR">%2$s</xliff:g> प्रयोग गरिरहेको छ"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> ले माइक्रोफोन प्रयोग गरिरहेका छन्"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> ले हालसालै <xliff:g id="SENSOR">%2$s</xliff:g> प्रयोग गरेको थियो"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"ठिक छ"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"सवारी साधनको माइक्रोफोन अन गर्ने हो?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"जारी राख्न इन्फोटेनमेन्ट प्रणालीको माइक्रोफोन अन गर्नुहोस्। यस कार्यले अनुमति प्राप्त एपहरूमा माइक्रोफोन अन गर्छ।"</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"क्यामेराका सेटिङ"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> ले क्यामेरा प्रयोग गर्दै छ"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> ले क्यामेरा प्रयोग गर्दै छन्"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> ले हालसालै क्यामेरा प्रयोग गरेको थियो"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"नक्सा"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"मिडिया"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"कन्ट्रोल सेन्टर"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"सहायक"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"माइकको गोपनीयतासम्बन्धी चिप"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"प्रयोगकर्ताको अवतार"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"युजरनेम टेक्स्ट"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"तापक्रम घटाउनुहोस्"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"तापक्रम बढाउनुहोस्"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"ब्लुटुथसम्बन्धी सेटिङ: डिस्कनेक्ट गरिएको"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"ध्वनिसम्बन्धी सेटिङ"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"प्रोफाइल तथा खातासम्बन्धी सेटिङ"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"रोटरी प्रयोग गरी प्याटर्न कोर्न मिल्दैन, स्क्रिनमा छोएर कोर्नुहोस्"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"टच स्क्रिन लक गरिएको छ"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"तपाईंको स्क्रिन लक गरिएको छ"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"तपाईंको स्क्रिन लक गरिएको छ"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"तपाईंको स्क्रिन लक गरिएको छ"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"तपाईंको स्क्रिन अब अनलक गरिएको छ"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"तपाईंले लग आउट गर्न खोज्नुभएकै हो?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"यसो गर्दा सबै खुला एपहरू बन्द हुने छन्"</string>
     <string name="user_logout" msgid="2934184154258330491">"लग आउट गर्नुहोस्"</string>
     <string name="car_guest" msgid="768913000117469596">"अतिथि"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"प्रोफाइल परिवर्तन गरिँदै छ…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"नयाँ प्रोफाइल हालिँदै छ…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"तपाईं बढीमा <xliff:g id="USER_LIMIT">%d</xliff:g> वटा प्रोफाइल हाल्न सक्नुहुन्छ"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"नयाँ प्रोफाइल हाल्ने हो?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"जारी राख्न <xliff:g id="USER_NAME">%1$s</xliff:g> ले <xliff:g id="SEAT_LOCATION">%2$s</xliff:g> को स्क्रिनबाट साइन आउट गर्नु पर्ने हुन्छ"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"सुरु गर्न प्रोफाइल चयन गर्नुहोस्"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"साइन इन गरिएको छ"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"<xliff:g id="SEAT_LOCATION">%s</xliff:g> को स्क्रिनमा साइन इन गरिएको छ"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"नयाँ प्रोफाइल हाल्न सकिएन। पछि फेरि प्रयास गर्नुहोस्।"</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"अतिथि प्रोफाइल सुरु गर्न सकिएन। पछि फेरि प्रयास गर्नुहोस्।"</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"साइन आउट गरिँदै छ…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> को प्रोफाइल साइन आउट गरिँदै छ। पछि फेरि प्रयास गर्नुहोस्।"</string>
     <string name="seat_driver" msgid="4502591979520445677">"चालकको सिट"</string>
     <string name="seat_front" msgid="836133281052793377">"अगाडिको सिट"</string>
     <string name="seat_rear" msgid="403133444964528577">"पछाडिको सिट"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"आफ्नो PIN हाल्नुहोस्"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"आफ्नो प्याटर्न कोर्नुहोस्"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"आफ्नो पासवर्ड हाल्नुहोस्"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"ब्याकस्पेस की"</string>
+    <string name="enter_key" msgid="747962923921283095">"इन्टर की"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"पछाडि"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"फुल स्क्रिन"</string>
 </resources>
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index 7d752c72..50baf38c 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -15,12 +15,6 @@
   ~ limitations under the License
   -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <color name="car_accent">#356FE5</color>
-    <color name="system_bar_background_opaque">#ff0c1013</color>
-
     <!-- The background color of the notification shade -->
     <color name="notification_shade_background_color">#E0000000</color>
-    
-    <!-- The color of the ripples on the untinted notifications -->
-    <color name="notification_ripple_untinted_color">?android:attr/colorControlHighlight</color>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index c5b42157..75e9b220 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Sessie beëindigen"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Nieuw profiel"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Nieuw profiel toevoegen?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Nadat je een nieuw profiel hebt toegevoegd, kan de accounthouder het aanpassen."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Elk profiel kan een app-update installeren, die dan beschikbaar komt voor alle profielen."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Maximaal aantal profielen bereikt"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Je kunt maar één profiel maken.}other{Je kunt maximaal # profielen toevoegen.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Laden"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> staat uit."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"<xliff:g id="SENSOR">%1$s</xliff:g> gebruiken"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Voor apps die toestemming hebben"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Microfooninstellingen"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Privacyinstellingen"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> gebruikt de <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> gebruiken de microfoon"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> heeft de <xliff:g id="SENSOR">%2$s</xliff:g> recent gebruikt"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Voertuigmicrofoon aanzetten?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Zet de microfoon van het infotainmentsysteem aan om door te gaan. Hierdoor wordt de microfoon aangezet voor alle apps die toestemming hebben."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Camera-instellingen"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> gebruikt de camera"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> gebruiken de camera"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> heeft de camera recent gebruikt"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Media"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Controlecentrum"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistent"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Privacychip voor microfoon"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Avatar van gebruiker"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Tekst gebruikersnaam"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Temperatuur verlagen"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Temperatuur verhogen"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Bluetooth-instelling: verbinding verbroken"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Geluidsinstellingen"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Profiel- en accountinstellingen"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Patroon ondersteunt geen draaien, gebruik tikken"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Touchscreen vergrendeld"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Je scherm is vergrendeld"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Je scherm is vergrendeld"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Je scherm is vergrendeld"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Je scherm is nu ontgrendeld"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Weet je zeker dat je wilt uitloggen?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Hierdoor worden alle geopende apps gesloten"</string>
     <string name="user_logout" msgid="2934184154258330491">"Uitloggen"</string>
     <string name="car_guest" msgid="768913000117469596">"Gast"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Van profiel wisselen…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Nieuw profiel toevoegen…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Je kunt maximaal <xliff:g id="USER_LIMIT">%d</xliff:g> profielen toevoegen"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Nieuw profiel toevoegen?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"<xliff:g id="USER_NAME">%1$s</xliff:g> moet uitloggen van het scherm <xliff:g id="SEAT_LOCATION">%2$s</xliff:g> om door te gaan"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Selecteer het profiel om te starten"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Ingelogd"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Ingelogd op het scherm <xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Kan nieuw profiel niet toevoegen. Probeer het later opnieuw."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Kan gastprofiel niet starten. Probeer het later opnieuw."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Uitloggen…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> wordt uitgelogd. Probeer het later opnieuw."</string>
     <string name="seat_driver" msgid="4502591979520445677">"bestuurder"</string>
     <string name="seat_front" msgid="836133281052793377">"voor"</string>
     <string name="seat_rear" msgid="403133444964528577">"achter"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Geef je pincode op"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Geef je patroon op"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Geef je wachtwoord op"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Backspace-toets"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter-toets"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Terug"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Volledig scherm"</string>
 </resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 225d3eb9..94c27315 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"ସେସନ ଶେଷ କରନ୍ତୁ"</string>
     <string name="car_new_user" msgid="6766334721724989964">"ନୂଆ ପ୍ରୋଫାଇଲ"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"ନୂଆ ପ୍ରୋଫାଇଲ ଯୋଗ କରିବେ?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"ଆପଣ ଏକ ନୂଆ ପ୍ରୋଫାଇଲ ଯୋଗ କରିବା ପରେ, ଆକାଉଣ୍ଟ ହୋଲ୍ଡର ଏହାକୁ କଷ୍ଟମାଇଜ କରିପାରିବେ।"</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"ଯେ କୌଣସି ପ୍ରୋଫାଇଲ ଏକ ଆପ ଅପଡେଟ ଇନଷ୍ଟଲ କରିପାରିବ, ଯାହା ପରେ ସମସ୍ତ ପ୍ରୋଫାଇଲ ପାଇଁ ଉପଲବ୍ଧ ହେବ।"</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"ଅଧିକ ପ୍ରୋଫାଇଲ ପାଇଁ ଅନୁମତି ନାହିଁ"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{କେବଳ ଗୋଟିଏ ପ୍ରୋଫାଇଲ ତିଆରି କରାଯାଇପାରିବ।}other{ଆପଣ #ଟି ପର୍ଯ୍ୟନ୍ତ ପ୍ରୋଫାଇଲ ଯୋଗ କରିପାରିବେ।}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"ଲୋଡ୍ କରାଯାଉଛି"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> ବନ୍ଦ ଅଛି।"</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"<xliff:g id="SENSOR">%1$s</xliff:g> ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"ଅନୁମତି ଥିବା ଆପ୍ସ ପାଇଁ"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"ମାଇକ୍ରୋଫୋନ ସେଟିଂସ"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"ଗୋପନୀୟତା ସେଟିଂସ"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> <xliff:g id="SENSOR">%2$s</xliff:g> ବ୍ୟବହାର କରୁଛି"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> ମାଇକ୍ ବ୍ୟବହାର କରୁଛନ୍ତି"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> ବର୍ତ୍ତମାନ <xliff:g id="SENSOR">%2$s</xliff:g> ବ୍ୟବହାର କରିଛି"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"ଠିକ୍ ଅଛି"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"ଗାଡ଼ିର ମାଇକ୍ରୋଫୋନ ଚାଲୁ କରିବେ କି?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"ଜାରି ରଖିବା ପାଇଁ, ଇନଫୋଟେନମେଣ୍ଟ ସିଷ୍ଟମ ମାଇକ୍ରୋଫୋନକୁ ଚାଲୁ କରନ୍ତୁ। ଏହା ଅନୁମତି ଥିବା ସମସ୍ତ ଆପ ପାଇଁ ମାଇକ୍ରୋଫୋନ ଚାଲୁ କରିବ।"</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"କ୍ୟାମେରା ସେଟିଂସ"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> କ୍ୟାମେରା ବ୍ୟବହାର କରୁଛି"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> କ୍ୟାମେରା ବ୍ୟବହାର କରୁଛି"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> ବର୍ତ୍ତମାନ କ୍ୟାମେରା ବ୍ୟବହାର କରିଛି"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"ମିଡିଆ"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"ନିୟନ୍ତ୍ରଣ କେନ୍ଦ୍ର"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistant"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"ମାଇକ ଗୋପନୀୟତା ଚିପ"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"ୟୁଜର ଅବତାର"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"ୟୁଜରନେମ ଟେକ୍ସଟ"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"ତାପମାତ୍ରା କମାନ୍ତୁ"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"ତାପମାତ୍ରା ବଢ଼ାନ୍ତୁ"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"ବ୍ଲୁଟୁଥ ସେଟିଂ: ବିଚ୍ଛିନ୍ନ କରାଯାଇଛି"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"ସାଉଣ୍ଡ ସେଟିଂସ"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"ପ୍ରୋଫାଇଲ ଏବଂ ଆକାଉଣ୍ଟ ସେଟିଂସ"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"ରୋଟାରୀକୁ ପାଟର୍ନ ସମର୍ଥନ କରେ ନାହିଁ, ସ୍ପର୍ଶ ବ୍ୟବହାର କର"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"ଟଚ ସ୍କ୍ରିନ ଲକ କରାଯାଇଛି"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"ଆପଣଙ୍କ ସ୍କ୍ରିନକୁ ଲକ କରାଯାଇଛି"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"ଆପଣଙ୍କ ସ୍କ୍ରିନକୁ ଲକ କରାଯାଇଛି"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"ଆପଣଙ୍କ ସ୍କ୍ରିନକୁ ଲକ କରାଯାଇଛି"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"ଆପଣଙ୍କ ସ୍କ୍ରିନକୁ ବର୍ତ୍ତମାନ ଅନଲକ କରାଯାଇଛି"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"ଆପଣ ଲଗ ଆଉଟ କରିବାକୁ ଚାହୁଁଥିବା ସୁନିଶ୍ଚିତ?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"ଏହା ଖୋଲା ଥିବା ସମସ୍ତ ଆପ୍ଲିକେସନକୁ ବନ୍ଦ କରିଦେବ"</string>
     <string name="user_logout" msgid="2934184154258330491">"ଲଗ ଆଉଟ କରନ୍ତୁ"</string>
     <string name="car_guest" msgid="768913000117469596">"ଅତିଥି"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"ପ୍ରୋଫାଇଲ ସୁଇଚ କରୁଛନ୍ତି…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"ନୂଆ ପ୍ରୋଫାଇଲ ଯୋଗ କରୁଛନ୍ତି…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"ଆପଣ <xliff:g id="USER_LIMIT">%d</xliff:g>ଟି ପର୍ଯ୍ୟନ୍ତ ପ୍ରୋଫାଇଲ ଯୋଗ କରିପାରିବେ"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"ନୂଆ ପ୍ରୋଫାଇଲ ଯୋଗ କରିବେ?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"ଜାରି ରଖିବା ପାଇଁ <xliff:g id="USER_NAME">%1$s</xliff:g> <xliff:g id="SEAT_LOCATION">%2$s</xliff:g> ସ୍କ୍ରିନରୁ ସାଇନ ଆଉଟ କରିବା ଉଚିତ"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"ଆରମ୍ଭ କରିବାକୁ ପ୍ରୋଫାଇଲ ଚୟନ କରନ୍ତୁ"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"ସାଇନ ଇନ କରାଯାଇଛି"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"<xliff:g id="SEAT_LOCATION">%s</xliff:g> ସ୍କ୍ରିନରେ ସାଇନ ଇନ କରାଯାଇଛି"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"ନୂଆ ପ୍ରୋଫାଇଲ ଯୋଗ କରାଯାଇପାରିବ ନାହିଁ। ପରେ ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"ଅତିଥି ପ୍ରୋଫାଇଲ ଆରମ୍ଭ କରାଯାଇପାରିବ ନାହିଁ। ପରେ ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"ସାଇନ ଆଉଟ କରାଯାଉଛି…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g>ଙ୍କୁ ସାଇନ ଆଉଟ କରାଯାଉଛି। ପରେ ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
     <string name="seat_driver" msgid="4502591979520445677">"ଡ୍ରାଇଭର"</string>
     <string name="seat_front" msgid="836133281052793377">"ସାମ୍ନା"</string>
     <string name="seat_rear" msgid="403133444964528577">"ପଛ"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"ଆପଣଙ୍କ PIN ଲେଖନ୍ତୁ"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"ଆପଣଙ୍କ ପାଟର୍ନ ଲେଖନ୍ତୁ"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"ଆପଣଙ୍କ ପାସୱାର୍ଡ ଲେଖନ୍ତୁ"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Backspace କୀ"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter କୀ"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"ପଛକୁ ଫେରନ୍ତୁ"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"ପୂର୍ଣ୍ଣ ସ୍କ୍ରିନ"</string>
 </resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 4a55e7c1..50a5065e 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"ਸੈਸ਼ਨ ਸਮਾਪਤ ਕਰੋ"</string>
     <string name="car_new_user" msgid="6766334721724989964">"ਨਵਾਂ ਪ੍ਰੋਫਾਈਲ"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"ਕੀ ਨਵਾਂ ਪ੍ਰੋਫਾਈਲ ਸ਼ਾਮਲ ਕਰਨਾ ਹੈ?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"ਨਵਾਂ ਪ੍ਰੋਫਾਈਲ ਸ਼ਾਮਲ ਕਰਨ ਤੋਂ ਬਾਅਦ, ਖਾਤਾ ਧਾਰਕ ਉਸਨੂੰ ਵਿਉਂਤਬੱਧ ਕਰ ਸਕਦਾ ਹੈ।"</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"ਕੋਈ ਵੀ ਪ੍ਰੋਫਾਈਲ ਐਪ ਸੰਬੰਧੀ ਅੱਪਡੇਟ ਸਥਾਪਤ ਕਰ ਸਕਦਾ ਹੈ, ਜੋ ਉਸ ਤੋਂ ਬਾਅਦ ਸਾਰੇ ਪ੍ਰੋਫਾਈਲਾਂ ਲਈ ਉਪਲਬਧ ਹੋਵੇਗਾ।"</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"ਪ੍ਰੋਫਾਈਲ ਬਣਾਉਣ ਦੀ ਸੀਮਾ ਪੂਰੀ ਹੋ ਗਈ"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{ਸਿਰਫ਼ ਇੱਕ ਪ੍ਰੋਫਾਈਲ ਬਣਾਇਆ ਜਾ ਸਕਦਾ ਹੈ।}one{ਤੁਸੀਂ # ਤੱਕ ਪ੍ਰੋਫਾਈਲ ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ।}other{ਤੁਸੀਂ # ਤੱਕ ਪ੍ਰੋਫਾਈਲ ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ।}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> ਬੰਦ ਹੈ।"</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"<xliff:g id="SENSOR">%1$s</xliff:g> ਵਰਤੋ"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"ਇਜਾਜ਼ਤ ਵਾਲੀਆਂ ਐਪਾਂ ਲਈ"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"ਪਰਦੇਦਾਰੀ ਸੈਟਿੰਗਾਂ"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g>, <xliff:g id="SENSOR">%2$s</xliff:g> ਦੀ ਵਰਤੋਂ ਕਰ ਰਹੀ ਹੈ"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> ਮਾਈਕ ਦੀ ਵਰਤੋਂ ਕਰ ਰਹੀਆਂ ਹਨ"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> ਨੇ ਹਾਲ ਹੀ ਵਿੱਚ <xliff:g id="SENSOR">%2$s</xliff:g> ਦੀ ਵਰਤੋਂ ਕੀਤੀ"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"ਠੀਕ ਹੈ"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"ਕੀ ਵਾਹਨ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਹੈ?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"ਜਾਰੀ ਰੱਖਣ ਲਈ, ਵਾਹਨ ਆਡੀਓ ਸਿਸਟਮ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਨੂੰ ਚਾਲੂ ਕਰੋ। ਇਹ ਇਜਾਜ਼ਤ ਵਾਲੀਆਂ ਸਾਰੀਆਂ ਐਪਾਂ ਲਈ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਨੂੰ ਚਾਲੂ ਕਰ ਦੇਵੇਗਾ।"</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"ਕੈਮਰਾ ਸੈਟਿੰਗਾਂ"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> ਕੈਮਰੇ ਦੀ ਵਰਤੋਂ ਕਰ ਰਹੀ ਹੈ"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> ਕੈਮਰੇ ਦੀ ਵਰਤੋਂ ਕਰ ਰਹੀਆਂ ਹਨ"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> ਨੇ ਹਾਲ ਹੀ ਵਿੱਚ ਕੈਮਰੇ ਦੀ ਵਰਤੋਂ ਕੀਤੀ"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"ਮੀਡੀਆ"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"ਕੰਟਰੋਲ ਕੇਂਦਰ"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistant"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"ਮਾਈਕ ਪਰਦੇਦਾਰੀ ਚਿੱਪ"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"ਵਰਤੋਂਕਾਰ ਅਵਤਾਰ"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"ਵਰਤੋਂਕਾਰ ਨਾਮ ਦੀ ਲਿਖਤ"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"ਤਾਪਮਾਨ ਘਟਾਓ"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"ਤਾਪਮਾਨ ਵਧਾਓ"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"ਬਲੂਟੁੱਥ ਸੈਟਿੰਗ: ਡਿਸਕਨੈਕਟ ਕੀਤਾ ਗਿਆ"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"ਧੁਨੀ ਸੈਟਿੰਗਾਂ"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"ਪ੍ਰੋਫਾਈਲ ਅਤੇ ਖਾਤਾ ਸੈਟਿੰਗਾਂ"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"ਪੈਟਰਨ ਰੋਟਰੀ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦਾ, ਕਿਰਪਾ ਕਰਕੇ ਸਪਰਸ਼ ਵਰਤੋ"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"ਟੱਚ-ਸਕ੍ਰੀਨ ਨੂੰ ਲਾਕ ਕੀਤਾ ਗਿਆ"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਨੂੰ ਲਾਕ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਲਾਕ ਹੈ"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਨੂੰ ਲਾਕ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਹੁਣ ਅਣਲਾਕ ਹੈ"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"ਕੀ ਤੁਸੀਂ ਪੱਕਾ ਲੌਗ-ਆਊਟ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"ਇਸ ਨਾਲ ਸਾਰੀ ਖੁੱਲ੍ਹੀਆਂ ਐਪਲੀਕੇਸ਼ਨਾਂ ਬੰਦ ਹੋ ਜਾਣਗੀਆਂ"</string>
     <string name="user_logout" msgid="2934184154258330491">"ਲੌਗ-ਆਊਟ ਕਰੋ"</string>
     <string name="car_guest" msgid="768913000117469596">"ਮਹਿਮਾਨ"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਸਵਿੱਚ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"ਨਵਾਂ ਪ੍ਰੋਫਾਈਲ ਸ਼ਾਮਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"ਤੁਸੀਂ <xliff:g id="USER_LIMIT">%d</xliff:g> ਪ੍ਰੋਫਾਈਲਾਂ ਤੱਕ ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"ਕੀ ਨਵਾਂ ਪ੍ਰੋਫਾਈਲ ਸ਼ਾਮਲ ਕਰਨਾ ਹੈ?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"ਜਾਰੀ ਰੱਖਣ ਲਈ, <xliff:g id="USER_NAME">%1$s</xliff:g> ਨੂੰ <xliff:g id="SEAT_LOCATION">%2$s</xliff:g> ਦੀ ਸਕ੍ਰੀਨ ਤੋਂ ਸਾਈਨ-ਆਊਟ ਕਰਨਾ ਪਵੇਗਾ"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਪ੍ਰੋਫਾਈਲ ਚੁਣੋ"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"ਸਾਈਨ-ਇਨ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"<xliff:g id="SEAT_LOCATION">%s</xliff:g> ਦੀ ਸਕ੍ਰੀਨ \'ਤੇ ਸਾਈਨ-ਇਨ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"ਨਵਾਂ ਪ੍ਰੋਫਾਈਲ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ। ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"ਮਹਿਮਾਨ ਪ੍ਰੋਫਾਈਲ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ। ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"ਸਾਈਨ-ਆਊਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> ਨੂੰ ਸਾਈਨ-ਆਊਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ। ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
     <string name="seat_driver" msgid="4502591979520445677">"ਡਰਾਈਵਰ"</string>
     <string name="seat_front" msgid="836133281052793377">"ਅਗਲਾ"</string>
     <string name="seat_rear" msgid="403133444964528577">"ਪਿਛਲਾ"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"ਆਪਣਾ ਪਿੰਨ ਦਾਖਲ ਕਰੋ"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"ਆਪਣਾ ਪੈਟਰਨ ਦਾਖਲ ਕਰੋ"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"ਆਪਣਾ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Backspace ਕੁੰਜੀ"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter ਕੁੰਜੀ"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"ਪਿੱਛੇ"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"ਪੂਰੀ ਸਕ੍ਰੀਨ"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index acecca1f..2b7eef3c 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Zakończ sesję"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Nowy profil"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Dodać nowy profil?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Gdy dodasz nowy profil, właściciel konta może go dostosować."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Każdy profil może instalować aktualizację aplikacji, która będzie dostępna na wszystkich profilach."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Osiągnięto limit liczby profili"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Możesz utworzyć tylko 1 profil.}few{Możesz dodać maksymalnie # profile.}many{Możesz dodać maksymalnie # profili.}other{Możesz dodać maksymalnie # profilu.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Ładuję"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"Moduł <xliff:g id="SENSOR">%1$s</xliff:g> został wyłączony."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Używaj modułu: <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Dotyczy aplikacji z uprawnieniami"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Ustawienia mikrofonu"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Ustawienia prywatności"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"Aplikacja <xliff:g id="APP">%1$s</xliff:g> używa modułu: <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"Aplikacje <xliff:g id="APP_LIST">%s</xliff:g> używają mikrofonu"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"Aplikacja <xliff:g id="APP">%1$s</xliff:g> używała niedawno modułu: <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Włączyć mikrofon pojazdu?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Aby kontynuować, włącz system multimedialno-rozrywkowy. Spowoduje to włączenie mikrofonu dla wszystkich aplikacji, które mają uprawnienia."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Ustawienia kamery"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"Aplikacja <xliff:g id="APP">%s</xliff:g> używa kamery"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"Aplikacje <xliff:g id="APP_LIST">%s</xliff:g> używają kamery"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"Aplikacja <xliff:g id="APP">%s</xliff:g> używała niedawno kamery"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Mapy"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Multimedia"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Centrum sterowania"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Asystent"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Element prywatności mikrofonu"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Awatar użytkownika"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Tekst nazwy użytkownika"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Obniż temperaturę"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Podnieś temperaturę"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Ustawienie Bluetooth: rozłączono"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Ustawienia dźwięku"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Ustawienia profili i kont"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Wzór nie obsługuje pokrętła, użyj dotyku"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Ekran dotykowy został zablokowany"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Twój ekran został zablokowany"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Ekran jest zablokowany"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Twój ekran został zablokowany"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Ekran jest odblokowany"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Czy na pewno chcesz się wylogować?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Spowoduje to zamknięcie wszystkich otwartych aplikacji"</string>
     <string name="user_logout" msgid="2934184154258330491">"Wyloguj się"</string>
     <string name="car_guest" msgid="768913000117469596">"Gość"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Przełączam profil…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Dodaję nowy profil…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Limit profili, które można dodać, to <xliff:g id="USER_LIMIT">%d</xliff:g>"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Dodać nowy profil?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Aby kontynuować, <xliff:g id="USER_NAME">%1$s</xliff:g> musi wylogować się z ekranu <xliff:g id="SEAT_LOCATION">%2$s</xliff:g>"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Aby rozpocząć, wybierz profil"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Zalogowano"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Zalogowano na ekranie <xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Nie udało się dodać nowego profilu. Spróbuj później."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Nie udało się uruchomić profilu gościa. Spróbuj później."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Wylogowuję…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> wylogowuje się. Spróbuj później."</string>
     <string name="seat_driver" msgid="4502591979520445677">"kierowcy"</string>
     <string name="seat_front" msgid="836133281052793377">"przednim"</string>
     <string name="seat_rear" msgid="403133444964528577">"tylnym"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Wpisz kod PIN"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Narysuj wzór"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Wpisz hasło"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Klawisz Backspace"</string>
+    <string name="enter_key" msgid="747962923921283095">"Klawisz Enter"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Wstecz"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Pełny ekran"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index b090b0ea..a959fbf0 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -36,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> desativado(a)."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Usar <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Para as apps que têm autorização"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Definições do microfone"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Definições de privacidade"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"A app <xliff:g id="APP">%1$s</xliff:g> está a usar: <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> estão a utilizar o microfone"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"Recentemente, a app <xliff:g id="APP">%1$s</xliff:g> usou: <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
@@ -46,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Ativar o microfone do veículo?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Para continuar, ative o microfone do sistema de infoentretenimento. Esta ação irá ativar o microfone para todas as apps que têm autorização."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Definições da câmara"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"A app <xliff:g id="APP">%s</xliff:g> está a usar a câmara"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"As apps <xliff:g id="APP_LIST">%s</xliff:g> estão a usar a câmara"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"A app <xliff:g id="APP">%s</xliff:g> usou a câmara recentemente"</string>
@@ -64,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Mapas"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Multimédia"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Centro de controlo"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistente"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Chip de privacidade do microfone"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Avatar do utilizador"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Texto do nome de utilizador"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Diminuir a temperatura"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Aumentar a temperatura"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Definição do Bluetooth: desligado"</string>
@@ -88,8 +91,9 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Definições de som"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Definições de perfis e contas"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"O padrão não sup. control. rotativo; use o toque"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Ecrã tátil bloqueado"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"O ecrã foi bloqueado"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"O ecrã está bloqueado"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"O ecrã foi bloqueado"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"O ecrã está agora desbloqueado"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Quer mesmo terminar sessão?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Esta ação fecha todas as aplicações abertas"</string>
     <string name="user_logout" msgid="2934184154258330491">"Terminar sessão"</string>
@@ -119,4 +123,9 @@
     <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Introduza o PIN"</string>
     <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Introduza o padrão"</string>
     <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Introduza a palavra-passe"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Tecla de retrocesso"</string>
+    <string name="enter_key" msgid="747962923921283095">"Tecla Enter"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Anterior"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Ecrã inteiro"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 79361c11..78ca663e 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Encerrar sessão"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Novo perfil"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Adicionar novo perfil?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Após adicionar um novo perfil, ele pode ser personalizado pelo proprietário da conta."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Qualquer perfil pode instalar uma atualização de app, que vai ficar disponível para todos os perfis."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Limite de perfis atingido"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Só um perfil pode ser criado.}one{É possível adicionar até # perfil.}other{É possível adicionar até # perfis.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Carregando"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"Desativado: <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Usar <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Para apps com permissão"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Configurações do microfone"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Configurações de privacidade"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"O app <xliff:g id="APP">%1$s</xliff:g> está usando o <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"Os apps <xliff:g id="APP_LIST">%s</xliff:g> estão usando microfone"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"O app <xliff:g id="APP">%1$s</xliff:g> usou o <xliff:g id="SENSOR">%2$s</xliff:g> recentemente"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Ativar o microfone do veículo?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Para continuar, ative o microfone do sistema de infoentretenimento. Isso ativará o microfone para todos os apps que tiverem essa permissão."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Configurações da câmera"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"O app <xliff:g id="APP">%s</xliff:g> está usando a câmera"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"Os apps <xliff:g id="APP_LIST">%s</xliff:g> estão usando a câmera"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"O app <xliff:g id="APP">%s</xliff:g> usou a câmera recentemente"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Mídia"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Central de controle"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistente"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Chip de privacidade do microfone"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Avatar do usuário"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Texto do nome do usuário"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Diminuir temperatura"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Aumentar temperatura"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Configuração do Bluetooth: desconectado"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Configurações de som"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Configurações de perfis e contas"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Sem seletor giratório, use o toque"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Tela touchscreen bloqueada"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Sua tela foi bloqueada"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Sua tela está bloqueada"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Sua tela foi bloqueada"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Sua tela está desbloqueada"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Você quer mesmo sair?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Esta ação vai fechar todos os aplicativos"</string>
     <string name="user_logout" msgid="2934184154258330491">"Sair"</string>
     <string name="car_guest" msgid="768913000117469596">"Convidado"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Alternando entre perfis..."</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Adicionando novo perfil…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"É possível adicionar até <xliff:g id="USER_LIMIT">%d</xliff:g> perfis."</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Adicionar novo perfil?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Para continuar, o usuário <xliff:g id="USER_NAME">%1$s</xliff:g> precisa sair da tela <xliff:g id="SEAT_LOCATION">%2$s</xliff:g>"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Selecione um perfil para começar"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Conectado"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Faça login na tela <xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Não foi possível adicionar um novo perfil. Tente novamente mais tarde."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Não foi possível iniciar um perfil de visitante. Tente novamente mais tarde."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Saindo…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> está saindo. Tente novamente mais tarde."</string>
     <string name="seat_driver" msgid="4502591979520445677">"do motorista"</string>
     <string name="seat_front" msgid="836133281052793377">"dianteiro"</string>
     <string name="seat_rear" msgid="403133444964528577">"traseiro"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Informe seu PIN"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Digite seu padrão"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Digite sua senha"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Tecla backspace"</string>
+    <string name="enter_key" msgid="747962923921283095">"Tecla Enter"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Voltar"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Tela cheia"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 20015318..f9e634ea 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Încheie sesiunea"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Profil nou"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Adaugi un profil nou?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"După ce adaugi un profil nou, titularul de cont îl poate personaliza"</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Orice profil poate instala o actualizare, care va fi apoi disponibilă pentru toate profilurile."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Ai atins limita de profiluri"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Poți crea un singur profil.}few{Poți să adaugi până la # profiluri.}other{Poți să adaugi până la # de profiluri.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Se încarcă"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> este dezactivat."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Folosește <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Pentru aplicațiile care au permisiunea"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Setări microfon"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Setări de confidențialitate"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> folosește <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> folosesc microfonul"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> a folosit recent <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Pornești microfonul din vehicul?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Ca să continui, pornește microfonul sistemului de infotainment. Acest lucru va porni microfonul pentru toate aplicațiile care au permisiunea."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Setările camerei foto"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> folosește camera foto"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> folosesc camera foto"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> a folosit recent camera foto"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Media"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Centrul de control"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Asistent"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Cip de confidențialitate microfon"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Avatarul utilizatorului"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Text pentru numele de utilizator"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Redu temperatura"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Crește temperatura"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Setarea Bluetooth: deconectată"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Setări de sunet"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Setări pentru profiluri și conturi"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Modelul nu acceptă accesul prin rotire. Folosește atingerea."</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"S-a blocat ecranul tactil"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"S-a blocat ecranul"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Ecranul este blocat"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"S-a blocat ecranul"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Ecranul este deblocat"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Sigur dorești să te deconectezi?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Astfel, se vor închide toate aplicațiile deschise"</string>
     <string name="user_logout" msgid="2934184154258330491">"Deconectează-te"</string>
     <string name="car_guest" msgid="768913000117469596">"Invitat"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Se schimbă profilul…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Se adaugă un profil nou…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Poți adăuga până la <xliff:g id="USER_LIMIT">%d</xliff:g> profiluri"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Adaugi un profil nou?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Ca să continue, <xliff:g id="USER_NAME">%1$s</xliff:g> trebuie să se deconecteze din ecranul <xliff:g id="SEAT_LOCATION">%2$s</xliff:g>"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Selectează profilul de pornit"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Conectat"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Conectat pe ecranul <xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Nu poți adăuga profilul nou. Încearcă din nou mai târziu."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Nu se poate porni Profilul de invitat. Încearcă din nou mai târziu."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Se deconectează…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> se deconectează. Încearcă din nou mai târziu."</string>
     <string name="seat_driver" msgid="4502591979520445677">"locul șoferului"</string>
     <string name="seat_front" msgid="836133281052793377">"locul din față"</string>
     <string name="seat_rear" msgid="403133444964528577">"locul din spate"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Introdu codul PIN"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Introdu modelul"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Introdu parola"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Tasta Backspace"</string>
+    <string name="enter_key" msgid="747962923921283095">"Tasta Enter"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Înapoi"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Ecran complet"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 44a90e44..e89e1460 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Закончить сеанс"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Новый профиль"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Добавить профиль?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"После добавления профиля владелец аккаунта может изменять его."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Из любого профиля можно установить обновление приложения. Оно станет доступно во всех профилях."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Нельзя создать больше профилей"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Можно создать только один профиль.}one{Можно добавить до # профиля.}few{Можно добавить до # профилей.}many{Можно добавить до # профилей.}other{Можно добавить до # профиля.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Загрузка…"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g>: отключено."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Использовать <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Для приложений, у которых есть разрешение"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Настройки микрофона"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Настройки конфиденциальности"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"Приложение \"<xliff:g id="APP">%1$s</xliff:g>\" использует <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> используют микрофон"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"Приложение \"<xliff:g id="APP">%1$s</xliff:g>\" недавно использовало <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"ОК"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Включить микрофон в автомобиле?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Чтобы продолжить, включите микрофон информационно-развлекательной системы. Он также включится для всех приложений, имеющих разрешение."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Настройки камеры"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"Приложение \"<xliff:g id="APP">%s</xliff:g>\" использует камеру"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> используют камеру"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"Приложение \"<xliff:g id="APP">%s</xliff:g>\" недавно использовало камеру"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Карты"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Мультимедиа"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Центр управления"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Ассистент"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Чип защиты конфиденциальности для микрофона"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Аватар пользователя"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Имя пользователя (текст)"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Уменьшить температуру"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Увеличить температуру"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Bluetooth: нет подключения"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Настройки звука"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Настройки профилей и аккаунтов"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Граф. ключ невозможно ввести вращением."</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Сенсорный экран заблокирован"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Экран заблокирован"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Экран заблокирован"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Экран заблокирован"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Экран разблокирован"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Вы уверены, что хотите выйти?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Все открытые приложения будут закрыты."</string>
     <string name="user_logout" msgid="2934184154258330491">"Выйти"</string>
     <string name="car_guest" msgid="768913000117469596">"Гость"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Смена профиля…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Добавление профиля…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Количество профилей ограничено (не более <xliff:g id="USER_LIMIT">%d</xliff:g>)."</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Добавить профиль?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Чтобы продолжить, пользователь <xliff:g id="USER_NAME">%1$s</xliff:g> должен выйти из аккаунта на экране \"<xliff:g id="SEAT_LOCATION">%2$s</xliff:g>\"."</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Выберите профиль"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Вход выполнен"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Вход выполнен на экране \"<xliff:g id="SEAT_LOCATION">%s</xliff:g>\""</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Не удалось добавить профиль. Повторите попытку позже."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Не удалось использовать гостевой профиль. Повторите попытку позже."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Выход…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"Сейчас выходит пользователь <xliff:g id="USER_NAME">%s</xliff:g>. Повторите попытку позже."</string>
     <string name="seat_driver" msgid="4502591979520445677">"на водительском сиденье"</string>
     <string name="seat_front" msgid="836133281052793377">"на переднем сиденье"</string>
     <string name="seat_rear" msgid="403133444964528577">"на заднем сиденье"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Введите PIN-код"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Введите графический ключ"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Введите пароль"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Клавиша Backspace"</string>
+    <string name="enter_key" msgid="747962923921283095">"Клавиша Ввод"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Назад"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Полноэкранный режим"</string>
 </resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index bf1af433..86e94e0a 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"සැසිය නිමා කරන්න"</string>
     <string name="car_new_user" msgid="6766334721724989964">"නව පැතිකඩ"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"නව පැතිකඩ එක් කරන්නද?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"ඔබ නව පැතිකඩක් එක් කළ පසු, ගිණුම් හිමියාට එය අභිරුචිකරණය කළ හැක."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"ඕනෑම පැතිකඩකට යෙදුම් යාවත්කාලීනයක් ස්ථාපනය කළ හැකි අතර, එය පසුව සියලු පැතිකඩවලට ලබා ගත හැකි වනු ඇත."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"පැතිකඩ සීමාව ළඟා විය"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{එක් පැතිකඩක් පමණක් තැනිය හැකිය.}one{ඔබට පැතිකඩවල් #ක් දක්වා එක් කළ හැකිය.}other{ඔබට පැතිකඩවල් #ක් දක්වා එක් කළ හැකිය.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"පූරණය වෙමින්"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> ක්‍රියාවිරහිතයි."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"<xliff:g id="SENSOR">%1$s</xliff:g> භාවිත කරන්න"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"අවසර ඇති යෙදුම් සඳහා"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"මයික්‍රෆෝන සැකසීම්"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"පෞද්ගලිකත්ව සැකසීම්"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> <xliff:g id="SENSOR">%2$s</xliff:g> භාවිත කරමින් ඇත"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> මයික්‍රෆෝනය භාවිත කරමින්"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> මෑතකදී <xliff:g id="SENSOR">%2$s</xliff:g> භාවිත කළේය"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"හරි"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"මයික්‍රෆෝනය ක්‍රියාත්මක කරන්නද?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"ඉදිරියට යාමට, තොරතුරු විනෝදාස්වාද පද්ධති මයික්‍රෆෝනය ක්‍රියාත්මක කරන්න අවසර ඇති සියලු යෙදුම් සඳහා මෙය මයික්‍රෆෝනය ක්‍රියාත්මක කරනු ඇත."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"කැමරා සැකසීම්"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> කැමරාව භාවිත කරමින් ඇත"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> කැමරාව භාවිත කරමින් ඇත"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> මෑතකදී කැමරාව භාවිත කළේය"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"සිතියම්"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"මාධ්‍ය"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"පාලන මධ්‍යස්ථානය"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"සහායක"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"මයික් පෞද්ගලිකත්ව චිපය"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"පරිශීලක නියුරුව"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"පරිශීලක නාම පෙළ"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"උෂ්ණත්වය අවම කරන්න"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"උෂ්ණත්වය ඉහළ නංවන්න"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"බ්ලූටූත් සැකසීම: විසන්ධි විය"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"ශබ්ද සැකසීම්"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"පැතිකඩවල් &amp; ගිණුම් සැකසීම්"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"රටාව භ්‍රමණ සහාය නොදක්වයි; කරුණාකර ස්පර්ශය භාවිත කරන්න"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"ස්පර්ශ තිරය අගුළු දමා ඇත"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"ඔබේ තිරය අගුළු දමා ඇත"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"ඔබේ තිරය අගුළු දමා ඇත"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"ඔබේ තිරය අගුළු දමා ඇත"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"ඔබේ තිරය දැන් අගුළු හැර ඇත"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"වරනය විය යුතු බව ඔබට සහතික ද?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"මෙය සියලු විවෘත යෙදුම් වසනු ඇත"</string>
     <string name="user_logout" msgid="2934184154258330491">"වරන්න"</string>
     <string name="car_guest" msgid="768913000117469596">"අමුත්තා"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"පැතිකඩ මාරු කරමින්…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"නව පැතිකඩ එක් කරමින්…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"ඔබට පැතිකඩවල් <xliff:g id="USER_LIMIT">%d</xliff:g>ක් දක්වා එක් කළ හැක."</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"නව පැතිකඩ එක් කරන්න ද?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"ඉදිරියට යාම සඳහා, <xliff:g id="USER_NAME">%1$s</xliff:g> <xliff:g id="SEAT_LOCATION">%2$s</xliff:g> තිරයෙන් වරනය විය යුතු වේ"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"ආරම්භ කිරීමට පැතිකඩ තෝරන්න"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"පුරන ලදි"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"<xliff:g id="SEAT_LOCATION">%s</xliff:g> තිරය මත පුරනය වී ඇත"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"නව පැතිකඩ එක් කළ නොහැක. පසුව නැවත උත්සාහ කරන්න."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"අමුත්තාගේ පැතිකඩ ආරම්භ කළ නොහැක. පසුව නැවත උත්සාහ කරන්න."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"වරනය වෙමින්…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> වරනය වෙමින් පවතී. පසුව නැවත උත්සාහ කරන්න."</string>
     <string name="seat_driver" msgid="4502591979520445677">"රියදුරු"</string>
     <string name="seat_front" msgid="836133281052793377">"ඉදිරිපස"</string>
     <string name="seat_rear" msgid="403133444964528577">"පසුපස"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"ඔබේ PIN ඇතුළු කරන්න"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"ඔබේ රටාව ඇතුළු කරන්න"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"ඔබේ මුරපදය ඇතුළු කරන්න"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"බැක්ස්පේස් යතුර"</string>
+    <string name="enter_key" msgid="747962923921283095">"එන්ටර් යතුර"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"ආපසු"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"පූර්ණ තිරය"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index a749473c..53ce43a2 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -36,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"Zariadenie <xliff:g id="SENSOR">%1$s</xliff:g> je vypnuté."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Použiť zariadenie <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"V prípade aplikácií, ktoré majú povolenie"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Nastavenia mikrofónu"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Nastavenia ochrany súkromia"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> používa <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> používajú mikrofón"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"Aplikácia <xliff:g id="APP">%1$s</xliff:g> nedávno použila <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
@@ -46,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Chcete zapnúť mikrofón vozidla?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Ak chcete pokračovať, zapnite mikrofón palubného systému. Mikrofón tak zapnete pre všetky aplikácie, ktoré majú povolenie."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Nastavenia kamery"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> používa kameru"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> používajú kameru"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"Aplikácia <xliff:g id="APP">%s</xliff:g> nedávno použila kameru"</string>
@@ -64,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Mapy"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Médiá"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Ovládacie centrum"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Asistent"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Výber súkromia mikrofónu"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Avatar používateľa"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Text používateľského mena"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Znížiť teplotu"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Zvýšiť teplotu"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Nastavenie Bluetooth: odpojené"</string>
@@ -88,8 +91,9 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Nastavenia zvuku"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Nastavenia profilov a účtov"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Vzor nepodporuje otočné ovládanie, zadajte ho klepnutím"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Dotyková obrazovka je uzamknutá"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Obrazovka bola uzamknutá"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Obrazovka je uzamknutá"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Obrazovka bola uzamknutá"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Obrazovka je odomknutá"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Naozaj sa chcete odhlásiť?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Týmto zavriete všetky otvorené aplikácie"</string>
     <string name="user_logout" msgid="2934184154258330491">"Odhlásiť sa"</string>
@@ -119,4 +123,9 @@
     <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Zadajte PIN"</string>
     <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Zadajte vzor"</string>
     <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Zadajte heslo"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Kláves Backspace"</string>
+    <string name="enter_key" msgid="747962923921283095">"Kláves Enter"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Späť"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Celá obrazovka"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index f4b0a771..e7b5f3f4 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Končaj sejo"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Nov profil"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Želite dodati nov profil?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Ko dodate nov profil, ga lahko imetnik računa prilagodi."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Posodobitev aplikacije, ki bo nato na voljo vsem profilom, je mogoče namestiti s poljubnim profilom."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Dosežena omejitev števila profilov"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Ustvariti je mogoče samo en profil.}one{Dodati je mogoče do # profil.}two{Dodati je mogoče do # profila.}few{Dodati je mogoče do # profile.}other{Dodati je mogoče do # profilov.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Nalaganje"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"To je izklopljeno: <xliff:g id="SENSOR">%1$s</xliff:g>."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Uporaba tega: <xliff:g id="SENSOR">%1$s</xliff:g>."</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Za aplikacije z dovoljenjem."</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Nastavitve mikrofona"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Nastavitve zasebnosti"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"Aplikacija <xliff:g id="APP">%1$s</xliff:g> uporablja to: <xliff:g id="SENSOR">%2$s</xliff:g>."</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> uporabljajo mikrofon."</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"Aplikacija <xliff:g id="APP">%1$s</xliff:g> je nedavno uporabila to: <xliff:g id="SENSOR">%2$s</xliff:g>."</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"V redu"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Želite vklopiti mikrofon vozila?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Če želite nadaljevati, vklopite mikrofon informativno-razvedrilnega sistema. S tem bo mikrofon vklopljen za vse aplikacije z dovoljenjem."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Nastavitve kamere"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"Aplikacija <xliff:g id="APP">%s</xliff:g> uporablja kamero."</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> uporabljajo kamero."</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"Aplikacija <xliff:g id="APP">%s</xliff:g> je nedavno uporabljala kamero."</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Zemljevidi"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Predstavnost"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Nadzorno središče"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Pomočnik"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Čip za zasebnost pri mikrofonu"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Avatar uporabnika"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Besedilo imena uporabnika"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Znižanje temperature"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Zvišanje temperature"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Nastavitev Bluetootha: Povezava je prekinjena"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Nastavitve zvoka"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Nastavitve profilov in računov"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Vzorec ne podpira sukanja; uporabite dotik"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Zaslon na dotik je zaklenjen"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Vaš zaslon je zaklenjen"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Zaslon je zdaj zaklenjen"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Vaš zaslon je zaklenjen"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Zaslon je zdaj odklenjen"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Ali ste prepričani, da se želite odjaviti?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"S tem bomo zaprte vse odprte aplikacije."</string>
     <string name="user_logout" msgid="2934184154258330491">"Odjava"</string>
     <string name="car_guest" msgid="768913000117469596">"Gost"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Preklapljanje profila …"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Dodajanje novega profila …"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Dodati je mogoče do toliko profilov: <xliff:g id="USER_LIMIT">%d</xliff:g>"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Želite dodati nov profil?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Če želite nadaljevati, se mora uporabniki <xliff:g id="USER_NAME">%1$s</xliff:g> odjaviti z zaslona »<xliff:g id="SEAT_LOCATION">%2$s</xliff:g>«"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Izberite profil, če želite začeti"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Prijavljen"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Prijavljen na zaslonu »<xliff:g id="SEAT_LOCATION">%s</xliff:g>«"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Novega profila ni mogoče dodati. Poskusite znova pozneje."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Profila gosta ni mogoče začeti. Poskusite znova pozneje."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Odjava …"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"Poteka odjava uporabnika <xliff:g id="USER_NAME">%s</xliff:g>. Poskusite znova pozneje."</string>
     <string name="seat_driver" msgid="4502591979520445677">"voznikov sedež"</string>
     <string name="seat_front" msgid="836133281052793377">"sprednji sedež"</string>
     <string name="seat_rear" msgid="403133444964528577">"zadnji sedež"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Vnesite kodo PIN"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Vnesite vzorec"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Vnesite geslo"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Vračalka"</string>
+    <string name="enter_key" msgid="747962923921283095">"Tipka Enter"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Nazaj"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Celozaslonski način"</string>
 </resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index ffa433e9..91b97a07 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Jepi fund sesionit"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Profili i ri"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Të shtohet një profil i ri?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Pasi shton një profil të ri, mbajtësi i llogarisë mund ta personalizojë atë."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Çdo profil mund të instalojë një përditësim aplikacioni, që do të ofrohet për të gjitha profilet."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Është arritur kufiri i profileve"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Mund të krijohet vetëm një profil.}other{Mund të shtosh deri në # profile.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Po ngarkohet"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> është çaktivizuar."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Përdor <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Për aplikacionet që kanë leje"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Cilësimet e mikrofonit"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Cilësimet e privatësisë"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> po përdor <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> po përdorin mikrofonin"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> ka përdorur <xliff:g id="SENSOR">%2$s</xliff:g> së fundi"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"Në rregull"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Të aktivizohet mikrofoni i automjetit?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Për të vazhduar, aktivizo mikrofonin e sistemit info-argëtues. Kjo do të aktivizojë mikrofonin për të gjitha aplikacionet që kanë leje."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Cilësimet e kamerës"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> po përdor kamerën"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> po përdorin kamerën"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> ka përdorur kamerën së fundi"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Media"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Qendra e kontrollit"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Asistenti"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Çipi i privatësisë së mikrofonit"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Simboli i përdoruesit"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Teksti i emrit të përdoruesit"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Ul temperaturën"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Ngri temperaturën"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Cilësimi i Bluetooth-it: Shkëputur"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Cilësimet e zërit"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Cilësimet e profileve dhe të llogarive"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Motivi me rrotullim nuk mbështetet; përdor prekjen"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Ekrani i prekjes u kyç"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Ekrani yt është kyçur"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Ekrani yt është i kyçur"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Ekrani yt është kyçur"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Ekrani yt është i shkyçur tani"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"E konfirmon që dëshiron të dalësh?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Kjo do të mbyllë të gjitha aplikacionet e hapura"</string>
     <string name="user_logout" msgid="2934184154258330491">"Dil"</string>
     <string name="car_guest" msgid="768913000117469596">"Vizitor"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Po ndryshohet profili…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Po shtohet profili i ri…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Mund të shtosh deri në <xliff:g id="USER_LIMIT">%d</xliff:g> profile"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Të shtohet profili i ri?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Për të vazhduar, <xliff:g id="USER_NAME">%1$s</xliff:g> duhet të dalë nga ekrani i <xliff:g id="SEAT_LOCATION">%2$s</xliff:g>"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Zgjidh profilin për të filluar"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Identifikuar"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Identifikuar në ekranin e <xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Nuk mund të shtohet profili i ri. Provo përsëri më vonë."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Profili i vizitorit nuk mund të fillohet. Provo përsëri më vonë."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Po del…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> po del. Provo përsëri më vonë."</string>
     <string name="seat_driver" msgid="4502591979520445677">"drejtuesi"</string>
     <string name="seat_front" msgid="836133281052793377">"ana e përparme"</string>
     <string name="seat_rear" msgid="403133444964528577">"ana e pasme"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Fut kodin PIN"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Fut motivin"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Fut fjalëkalimin"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Tasti Backspace"</string>
+    <string name="enter_key" msgid="747962923921283095">"Tasti Enter"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Pas"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Ekran i plotë"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 4f7fcf45..98c7b26d 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Заврши сесију"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Нови профил"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Желите да додате нови профил?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Када додате нов профил, власник налога може да га прилагоди."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Сваки профил може да инсталира ажурирање апликације, које ће затим бити доступно свим профилима."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Достигнут максималан број профила"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Можете да направите само један профил.}one{Можете да додате највише # профил.}few{Можете да додате највише # профила.}other{Можете да додате највише # профила.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Учитава се"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"Сензор <xliff:g id="SENSOR">%1$s</xliff:g> је искључен."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Користи: <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"За апликације које имају дозволу"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Подешавања микрофона"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Подешавања приватности"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> користи: <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"Апликације <xliff:g id="APP_LIST">%s</xliff:g> користе микрофон"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"Апликација <xliff:g id="APP">%1$s</xliff:g> је недавно користила: <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"Потврди"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Желите да укључите микрофон возила?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Да бисте наставили, укључите микрофон система за инфо-забаву. Овим ће се укључити микрофон за све апликације које имају дозволу."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Подешавања камере"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> користи камеру"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"Апликације <xliff:g id="APP_LIST">%s</xliff:g> користе камеру"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"Апликација <xliff:g id="APP">%s</xliff:g> је недавно користила камеру"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Мапе"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Медији"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Контролни центар"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Помоћник"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Елемент за приватност микрофона"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Аватар корисника"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Текст корисничког имена"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Смањи температуру"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Повећај температуру"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Подешавање Bluetooth-а: Није повезано"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Подешавања звука"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Подешавања профила и налога"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Шаблон не допушта кружне покрете; користите додир"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Додирни екран је закључан"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Екран је закључан"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Екран је закључан"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Екран је закључан"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Екран је откључан"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Да ли стварно желите да се одјавите?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Ово ће затворити све отворене апликације"</string>
     <string name="user_logout" msgid="2934184154258330491">"Одјави ме"</string>
     <string name="car_guest" msgid="768913000117469596">"Гост"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Мења се профил…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Додаје се нови профил…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Можете да додате највише <xliff:g id="USER_LIMIT">%d</xliff:g> профила"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Желите да додате нови профил?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Да бисте наставили, <xliff:g id="USER_NAME">%1$s</xliff:g> треба да се одјави са екрана за:<xliff:g id="SEAT_LOCATION">%2$s</xliff:g>"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Изаберите профил да бисте започели"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Пријављени сте"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Пријављени сте на екрану за: <xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Не можете да додате нов профил. Пробајте поново касније."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Не можете да покренете профил госта. Пробајте поново касније."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Одјављујете се…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> се одјављује. Пробајте поново касније."</string>
     <string name="seat_driver" msgid="4502591979520445677">"возач"</string>
     <string name="seat_front" msgid="836133281052793377">"предње"</string>
     <string name="seat_rear" msgid="403133444964528577">"задње"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Унесите PIN"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Унесите шаблон"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Унесите лозинку"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Тастер backspace"</string>
+    <string name="enter_key" msgid="747962923921283095">"Тастер Enter"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Назад"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Цео екран"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 0c96f207..13ecbf01 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Avsluta session"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Ny profil"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Vill du lägga till en profil?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"När du har lagt till en ny profil kan kontoinnehavaren anpassa den."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Alla profilen kan installera en appuppdatering, som då blir tillgänglig för alla profiler."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Maximalt antal profiler har nåtts"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Det går bara att skapa en profil.}other{Du kan lägga till högst # profiler.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Läser in"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> är avstängd."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Använd <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"För appar som har behörighet"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Mikrofoninställningar"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Integritetsinställningar"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> använder <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> använder mikrofonen"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> använde <xliff:g id="SENSOR">%2$s</xliff:g> nyligen"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Vill du aktivera fordonets mikrofon?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Aktivera infotainmentsystemets mikrofon om du vill fortsätta. Mikrofonen aktiveras för alla appar som har behörighet."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Kamerainställningar"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> använder kameran"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> använder kameran"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> använde kameran nyligen"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Media"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Kontrollcenter"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistent"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Integritetschip för mikrofon"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Användaravatar"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Text för användarnamn"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Sänk temperaturen"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Höj temperaturen"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Bluetooth-inställning: Frånkopplad"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Ljudinställningar"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Profil- och kontoinställningar"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Mönstret stödjer inte rotation – använd tryck"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Pekskärmen är låst"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Skärmen har låsts"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Skärmen är låst"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Skärmen har låsts"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Skärmen är nu upplåst"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Är du säker på att du vill logga ut?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Detta stänger alla öppna appar"</string>
     <string name="user_logout" msgid="2934184154258330491">"Logga ut"</string>
     <string name="car_guest" msgid="768913000117469596">"Gäst"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Byter profil …"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Lägger till ny profil …"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Du kan lägga till högst <xliff:g id="USER_LIMIT">%d</xliff:g> profiler"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Vill du lägga till en profil?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Om du vill fortsätta ska <xliff:g id="USER_NAME">%1$s</xliff:g> logga ut från skärmen för <xliff:g id="SEAT_LOCATION">%2$s</xliff:g>"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Välj en profil för att starta"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Inloggad"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Inloggad på skärmen för <xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Det gick inte att lägga till en ny profil. Försök igen senare."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Det gick inte att starta gästprofilen. Försök igen senare."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Loggar ut …"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> loggas ut. Försök igen senare."</string>
     <string name="seat_driver" msgid="4502591979520445677">"förarsätet"</string>
     <string name="seat_front" msgid="836133281052793377">"framsätet"</string>
     <string name="seat_rear" msgid="403133444964528577">"baksätet"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Ange din pinkod"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Ange ditt mönster"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Ange ditt lösenord"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Backstegstangent"</string>
+    <string name="enter_key" msgid="747962923921283095">"Returtangent"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Tillbaka"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Helskärm"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 06933138..89c6b4e2 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Maliza kipindi"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Wasifu Mpya"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Ungependa kuweka wasifu mpya?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Baada ya kuweka wasifu mpya, mmiliki wa akaunti anaweza kuuwekea mapendeleo."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Wasifu wowote unaweza kusakinisha sasisho la programu, litakalopatikana katika wasifu wote."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Umefikisha kikomo cha wasifu"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Unaweza kuweka wasifu mmoja pekee.}other{Unaweza kuweka hadi wasifu #.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Inapakia"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> imezimwa"</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Tumia <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Kwenye programu zilizo na ruhusa"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Mipangilio ya maikrofoni"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Mipangilio ya faragha"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> inatumia <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> zinatumia maikrofoni"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> ilitumia <xliff:g id="SENSOR">%2$s</xliff:g> hivi karibuni"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"Sawa"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Ungependa kuwasha maikrofoni ya gari?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Ili uendelee, washa maikrofoni ya mfumo wa burudani na habari. Hatua hii itawasha maikrofoni kwenye programu zote zilizo na ruhusa."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Mipangilio ya kamera"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> inatumia kamera"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> zinatumia kamera"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> ilitumia kamera hivi karibuni"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Ramani"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Maudhui"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Kituo cha Kudhibiti"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Programu ya Mratibu"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Chipu ya Faragha ya Maikrofoni"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Ishara ya Mtumiaji"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Maandishi ya Jina la Mtumiaji"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Punguza halijoto"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Ongeza halijoto"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Mipangilio ya Bluetooth: Imetenganishwa"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Mipangilio ya sauti"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Mipangilio ya akaunti na wasifu"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Mchoro hautumii zana ya kuzungusha; tafadhali tumia zana ya kugusa"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Skrini ya kugusa imefungwa"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Skrini yako imefungwa"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Skrini yako imefungwa"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Skrini yako imefungwa"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Skrini yako sasa imefunguliwa"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Una uhakika unataka kuondoka kwenye programu?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Hali hii itafunga programu zote zilizo wazi"</string>
     <string name="user_logout" msgid="2934184154258330491">"Ondoka"</string>
     <string name="car_guest" msgid="768913000117469596">"Mgeni"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Inabadilisha wasifu…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Inaweka wasifu mpya…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Unaweza kuweka hadi wasifu <xliff:g id="USER_LIMIT">%d</xliff:g>"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Ungependa kuweka wasifu mpya?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Ili uendelee, <xliff:g id="USER_NAME">%1$s</xliff:g> anapaswa kuondoka katika akaunti ya skrini ya <xliff:g id="SEAT_LOCATION">%2$s</xliff:g>"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Chagua wasifu ili uanze"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Umeingia katika akaunti"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Umeingia katika akaunti kwenye skrini ya <xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Huwezi kuweka wasifu mpya. Jaribu tena baadaye."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Huwezi kuanzisha Wasifu wa mgeni. Jaribu tena baadaye."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Inaondoka katika akaunti…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> anaondolewa katika akaunti. Jaribu tena baadaye."</string>
     <string name="seat_driver" msgid="4502591979520445677">"dereva"</string>
     <string name="seat_front" msgid="836133281052793377">"mbele"</string>
     <string name="seat_rear" msgid="403133444964528577">"nyuma"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Weka PIN yako"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Weka mchoro wako"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Weka nenosiri lako"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Kitufe cha Backspace"</string>
+    <string name="enter_key" msgid="747962923921283095">"Kitufe cha Enter"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Rudi nyuma"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Skrini Nzima"</string>
 </resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 407d7255..7ad08a1a 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"அமர்வை நிறைவுசெய்க"</string>
     <string name="car_new_user" msgid="6766334721724989964">"புதிய சுயவிவரம்"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"புதிய சுயவிவரத்தைச் சேர்க்கவா?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"நீங்கள் புதிய சுயவிவரத்தைச் சேர்த்த பிறகு அந்தப் பயனர் அதைப் பிரத்தியேகமாக்கலாம்."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"எந்தச் சுயவிவரமும் ஆப்ஸ் புதுப்பிப்பை நிறுவலாம், பிறகு அதை அனைத்துச் சுயவிவரங்களும் பயன்படுத்தலாம்."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"சுயவிவர வரம்பை அடைந்துவிட்டீர்கள்"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{ஒரு சுயவிவரத்தை மட்டுமே உருவாக்க முடியும்.}other{# சுயவிவரங்கள் வரை சேர்க்க முடியும்.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"ஏற்றுகிறது"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> முடக்கப்பட்டுள்ளது."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"<xliff:g id="SENSOR">%1$s</xliff:g> ஐ உபயோகித்தல்"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"அனுமதியுள்ள ஆப்ஸுக்கு"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"மைக்ரோஃபோன் அமைப்புகள்"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"தனியுரிமை அமைப்புகள்"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> ஆப்ஸ் <xliff:g id="SENSOR">%2$s</xliff:g> ஐ உபயோகிக்கிறது"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> மைக்ரோஃபோனை உபயோகிக்கின்றன"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> ஆப்ஸ் சமீபத்தில் <xliff:g id="SENSOR">%2$s</xliff:g> ஐ உபயோகித்தது"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"சரி"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"வாகனத்தின் மைக்ரோஃபோனை இயக்கவா?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"தொடர்வதற்கு இன்ஃபோடெயின்மென்ட் சிஸ்டம் மைக்ரோஃபோனை இயக்கவும். இது அனுமதியுள்ள எல்லா ஆப்ஸிலும் மைக்ரோஃபோனை இயக்கும்."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"கேமரா அமைப்புகள்"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> ஆப்ஸ் கேமராவை உபயோகிக்கிறது"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> ஆப்ஸ் கேமராவை உபயோகிக்கின்றன"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> ஆப்ஸ் சமீபத்தில் கேமராவை உபயோகித்தது"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"மீடியா"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"கட்டுப்பாட்டு மையம்"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistant"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"மைக் தனியுரிமைச் சிப்"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"பயனரின் தோற்றப் படம்"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"பயனர் பெயரின் வார்த்தைகள்"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"வெப்பநிலையைக் குறை"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"வெப்பநிலையை அதிகரி"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"புளூடூத் அமைப்பு: இணைப்பு நீக்கப்பட்டுள்ளது"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"ஒலி அமைப்புகள்"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"சுயவிவரங்கள் &amp; கணக்கு அமைப்புகள்"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"தொடுதல் முறையைப் பயன்படுத்தவும்"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"தொடுதிரை லாக் செய்யப்பட்டது"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"உங்கள் திரை லாக் செய்யப்பட்டது"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"உங்கள் திரை லாக் செய்யப்பட்டுள்ளது"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"உங்கள் திரை லாக் செய்யப்பட்டது"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"உங்கள் திரை இப்போது அன்லாக் செய்யப்பட்டுள்ளது"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"நிச்சயமாக வெளியேற விரும்புகிறீர்களா?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"திறந்திருக்கும் அனைத்து ஆப்ஸையும் இது மூடும்"</string>
     <string name="user_logout" msgid="2934184154258330491">"வெளியேறு"</string>
     <string name="car_guest" msgid="768913000117469596">"கெஸ்ட்"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"சுயவிவரத்தை மாற்றுகிறது…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"புதிய சுயவிவரத்தைச் சேர்க்கிறது…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"நீங்கள் <xliff:g id="USER_LIMIT">%d</xliff:g> சுயவிவரங்கள் வரை சேர்க்க முடியும்"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"புதிய சுயவிவரத்தைச் சேர்க்க வேண்டுமா?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"தொடர, <xliff:g id="SEAT_LOCATION">%2$s</xliff:g> திரையில் இருந்து <xliff:g id="USER_NAME">%1$s</xliff:g> வெளியேற வேண்டும்"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"தொடங்க, சுயவிவரத்தைத் தேர்ந்தெடுங்கள்"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"உள்நுழைந்துள்ளீர்கள்"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"<xliff:g id="SEAT_LOCATION">%s</xliff:g> திரையில் உள்நுழைந்துள்ளீர்கள்"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"புதிய சுயவிவரத்தைச் சேர்க்க முடியவில்லை. பிறகு மீண்டும் முயலவும்."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"விருந்தினர் சுயவிவரத்தைத் தொடங்க முடியவில்லை. பிறகு மீண்டும் முயலவும்."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"வெளியேறுகிறது…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> வெளியேறுகிறார். பிறகு மீண்டும் முயலவும்."</string>
     <string name="seat_driver" msgid="4502591979520445677">"ஓட்டுநர்"</string>
     <string name="seat_front" msgid="836133281052793377">"முன்புறம்"</string>
     <string name="seat_rear" msgid="403133444964528577">"பின்புறம்"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"உங்கள் பின்னை உள்ளிடவும்"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"உங்கள் பேட்டர்னை உள்ளிடவும்"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"உங்கள் கடவுச்சொல்லை உள்ளிடவும்"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Backspace பட்டன்"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter பட்டன்"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"பின்செல்"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"முழுத்திரை"</string>
 </resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 373d018a..6d0543fe 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -30,13 +30,13 @@
     <string name="user_add_user_message_setup" msgid="1639791240776969175">"మీరు కొత్త ప్రొఫైల్‌ను జోడించిన తర్వాత, ఖాతాదారు దానిని అనుకూలీకరించవచ్చు."</string>
     <string name="user_add_user_message_update" msgid="4507063398890966360">"ఏదైనా ప్రొఫైల్ యాప్ అప్‌డేట్‌ను ఇన్‌స్టాల్ చేయగలదు, అది అన్ని ప్రొఫైల్స్‌కు అందుబాటులో ఉంటుంది."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"ప్రొఫైల్ పరిమితిని చేరుకున్నారు"</string>
-    <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{ఒక ప్రొఫైల్‌ను మాత్రమే క్రియేట్ చేయగలరు.}other{మీరు గరిష్టంగా # ప్రొఫైల్స్‌ను జోడించవచ్చు.}}"</string>
+    <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{ఒక ప్రొఫైల్‌ను మాత్రమే క్రియేట్ చేయగలరు.}other{మీరు గరిష్ఠంగా # ప్రొఫైల్స్‌ను జోడించవచ్చు.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"లోడ్ అవుతోంది"</string>
     <string name="car_loading_profile_developer_message" msgid="737810794567935702">"యూజర్‌ను లోడ్ చేస్తోంది (<xliff:g id="FROM_USER">%1$d</xliff:g> నుండి <xliff:g id="TO_USER">%2$d</xliff:g> వరకు)"</string>
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> ఆఫ్‌లో ఉంది."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"<xliff:g id="SENSOR">%1$s</xliff:g>ను ఉపయోగించండి"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"అనుమతి ఉన్న యాప్‌ల కోసం"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"మైక్రోఫోన్ సెట్టింగ్‌లు"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"గోప్యతా సెట్టింగ్‌లు"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g>, <xliff:g id="SENSOR">%2$s</xliff:g>ను ఉపయోగిస్తోంది"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g>, మైక్‌ను ఉపయోగిస్తున్నాయి"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g>, ఇటీవల <xliff:g id="SENSOR">%2$s</xliff:g>ను ఉపయోగించింది"</string>
@@ -46,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"సరే"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"వాహన మైక్రోఫోన్‌ను ఆన్ చేయాలా?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"కొనసాగించడానికి, సమాచారంతో కూడిన వినోదం సిస్టమ్ మైక్రోఫోన్‌ను ఆన్ చేయండి. ఇది అనుమతి ఉన్న అన్ని యాప్‌ల మైక్రోఫోన్‌ను ఆన్ చేస్తుంది."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"కెమెరా సెట్టింగ్‌లు"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> కెమెరాను ఉపయోగిస్తోంది"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> కెమెరాను ఉపయోగిస్తోంది"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> ఇటీవల కెమెరాను ఉపయోగించింది"</string>
@@ -64,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"మీడియా"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"కంట్రోల్ కేంద్రం"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistant"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"మైక్ గోప్యత చిప్"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"యూజర్ అవతార్"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"యూజర్ నేమ్ టెక్స్ట్"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"ఉష్ణోగ్రతను తగ్గించండి"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"ఉష్ణోగ్రతను పెంచండి"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"బ్లూటూత్ సెట్టింగ్: డిస్‌కనెక్ట్ చేయబడింది"</string>
@@ -88,8 +91,9 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"సౌండ్ సెట్టింగ్‌లు"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"ప్రొఫైళ్లు &amp; ఖాతాల సెట్టింగ్‌లు"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"ఆకృతి రోటరీకి సపోర్ట్ చేయదు; \'తాకండి\'"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"టచ్ స్క్రీన్ లాక్ చేయబడింది"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"మీ స్క్రీన్ లాక్ చేయబడింది"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"మీ స్క్రీన్ లాక్ అయ్యింది"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"మీ స్క్రీన్ లాక్ చేయబడింది"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"మీ స్క్రీన్ ఇప్పుడు అన్‌లాక్ అయ్యింది"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"మీరు ఖచ్చితంగా లాగ్ అవుట్ చేయాలనుకుంటున్నారా?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"ఇది అన్ని ఓపెన్ అప్లికేషన్‌లను మూసివేస్తుంది"</string>
     <string name="user_logout" msgid="2934184154258330491">"లాగ్ అవుట్ చేయండి"</string>
@@ -97,7 +101,7 @@
     <string name="user_switching_message" msgid="5346172662613832946">"ప్రొఫైల్ స్విచ్ అవుతోంది…"</string>
     <string name="user_adding_message" msgid="4700853604381151415">"కొత్త ప్రొఫైల్‌ను జోడిస్తోంది…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"మీరు గరిష్టంగా <xliff:g id="USER_LIMIT">%d</xliff:g> ప్రొఫైల్స్‌ను జోడించవచ్చు"</string>
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"మీరు గరిష్ఠంగా <xliff:g id="USER_LIMIT">%d</xliff:g> ప్రొఫైల్స్‌ను జోడించవచ్చు"</string>
     <string name="confirm_add_user_title" msgid="75853419607883551">"కొత్త ప్రొఫైల్‌ను జోడించాలా?"</string>
     <string name="already_logged_in_message" msgid="3657131706472825219">"కొనసాగించడానికి, <xliff:g id="USER_NAME">%1$s</xliff:g> <xliff:g id="SEAT_LOCATION">%2$s</xliff:g> స్క్రీన్ నుండి సైన్ అవుట్ చేయాలి"</string>
     <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"ప్రారంభించడానికి ప్రొఫైల్‌ను ఎంచుకోండి"</string>
@@ -119,4 +123,9 @@
     <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"మీ PINను ఎంటర్ చేయండి"</string>
     <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"మీ ఆకృతిని ఎంటర్ చేయండి"</string>
     <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"మీ పాస్‌వర్డ్‌ను ఎంటర్ చేయండి"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Backspace కీ"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter కీ"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"వెనుకకు"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"ఫుల్ స్క్రీన్"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 0be8903c..94e52280 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"จบเซสชัน"</string>
     <string name="car_new_user" msgid="6766334721724989964">"โปรไฟล์ใหม่"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"เพิ่มโปรไฟล์ใหม่ใช่ไหม"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"หลังจากที่คุณเพิ่มโปรไฟล์ใหม่แล้ว เจ้าของบัญชีดังกล่าวจะปรับแต่งได้"</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"ทุกโปรไฟล์สามารถติดตั้งอัปเดตแอป ซึ่งจะพร้อมให้โปรไฟล์ทั้งหมดใช้งานได้ในภายหลัง"</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"มีโปรไฟล์ถึงขีดจำกัดแล้ว"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{สร้างได้เพียงโปรไฟล์เดียวเท่านั้น}other{คุณเพิ่มโปรไฟล์ได้สูงสุด # โปรไฟล์}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"กำลังโหลด"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g>ปิดอยู่"</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"ใช้<xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"สำหรับแอปที่มีสิทธิ์"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"การตั้งค่าไมโครโฟน"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"การตั้งค่าความเป็นส่วนตัว"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> กำลังใช้<xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> กำลังใช้ไมค์"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> ใช้<xliff:g id="SENSOR">%2$s</xliff:g>เมื่อเร็วๆ นี้"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"ตกลง"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"เปิดไมโครโฟนในรถไหม"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"หากต้องการดำเนินการต่อ ให้เปิดไมโครโฟนของระบบสาระบันเทิง ซึ่งจะเป็นการจะเปิดไมโครโฟนสำหรับทุกแอปที่มีสิทธิ์"</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"การตั้งค่ากล้อง"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> กำลังใช้กล้อง"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> กำลังใช้กล้อง"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> ใช้กล้องเมื่อเร็วๆ นี้"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"แผนที่"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"สื่อ"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"ศูนย์ควบคุม"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistant"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"ชิปความเป็นส่วนตัวของไมค์"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"รูปโปรไฟล์ผู้ใช้"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"ข้อความชื่อผู้ใช้"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"ลดอุณหภูมิ"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"เพิ่มอุณหภูมิ"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"การตั้งค่าบลูทูธ: ยกเลิกการเชื่อมต่อแล้ว"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"การตั้งค่าเสียง"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"การตั้งค่าโปรไฟล์และบัญชี"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"รูปแบบไม่รองรับปุ่มหมุน โปรดใช้หน้าจอสัมผัส"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"หน้าจอสัมผัสล็อกอยู่"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"หน้าจอล็อกอยู่"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"หน้าจอล็อกอยู่"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"หน้าจอล็อกอยู่"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"หน้าจอปลดล็อกแล้ว"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"คุณแน่ใจไหมว่าต้องการออกจากระบบ"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"การดำเนินการนี้จะปิดแอปพลิเคชันที่เปิดอยู่ทั้งหมด"</string>
     <string name="user_logout" msgid="2934184154258330491">"ออกจากระบบ"</string>
     <string name="car_guest" msgid="768913000117469596">"ผู้ใช้ชั่วคราว"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"กำลังสลับโปรไฟล์…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"กำลังเพิ่มโปรไฟล์ใหม่…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"คุณเพิ่มได้สูงสุด <xliff:g id="USER_LIMIT">%d</xliff:g> โปรไฟล์"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"เพิ่มโปรไฟล์ใหม่ใช่ไหม"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"<xliff:g id="USER_NAME">%1$s</xliff:g> ควรออกจากระบบหน้าจอของ<xliff:g id="SEAT_LOCATION">%2$s</xliff:g>เพื่อดำเนินการต่อ"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"เลือกโปรไฟล์เพื่อเริ่ม"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"ลงชื่อเข้าใช้แล้ว"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"ลงชื่อเข้าใช้หน้าจอของ<xliff:g id="SEAT_LOCATION">%s</xliff:g>แล้ว"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"เพิ่มโปรไฟล์ใหม่ไม่ได้ ลองอีกครั้งในภายหลัง"</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"เริ่มโปรไฟล์ผู้ใช้ชั่วคราวไม่ได้ ลองอีกครั้งในภายหลัง"</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"กำลังออกจากระบบ…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> กำลังออกจากระบบ ลองอีกครั้งในภายหลัง"</string>
     <string name="seat_driver" msgid="4502591979520445677">"คนขับ"</string>
     <string name="seat_front" msgid="836133281052793377">"ด้านหน้า"</string>
     <string name="seat_rear" msgid="403133444964528577">"ด้านหลัง"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"ป้อน PIN"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"ป้อนรูปแบบ"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"ป้อนรหัสผ่าน"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"แป้น Backspace"</string>
+    <string name="enter_key" msgid="747962923921283095">"แป้น Enter"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"กลับ"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"เต็มหน้าจอ"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 8590facb..f2176b0f 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Tapusin ang session"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Bagong Profile"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Magdagdag ng bagong profile?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Pagkatapos mong magdagdag ng bagong profile, puwede itong i-customize ng may-ari ng account."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Makakapag-install ng update sa app ang anumang profile, na magiging available sa lahat ng profile."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Naabot na ang limitasyon sa profile"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Isang profile lang ang puwedeng gawin.}one{Puwede kang magdagdag ng hanggang # profile.}other{Puwede kang magdagdag ng hanggang # na profile.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Naglo-load"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"Naka-off ang <xliff:g id="SENSOR">%1$s</xliff:g>."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Gamitin ang <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Para sa mga app na may pahintulot"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Mga setting ng mikropono"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Mga setting ng privacy"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"Ginagamit ng <xliff:g id="APP">%1$s</xliff:g> ang <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"Ginagamit ng <xliff:g id="APP_LIST">%s</xliff:g> ang mikropono"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"Ginamit kamakailan ng <xliff:g id="APP">%1$s</xliff:g> ang <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"I-on ang mikropono ng sasakyan?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Para magpatuloy, i-on ang mikropono ng infotainment system. Io-on nito ang mikropono para sa lahat ng app na may pahintulot."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Mga setting ng camera"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"Ginagamit ng <xliff:g id="APP">%s</xliff:g> ang camera"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"Ginagamit ng <xliff:g id="APP_LIST">%s</xliff:g> ang camera"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"Ginamit kamakailan ng <xliff:g id="APP">%s</xliff:g> ang camera"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Media"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Control Center"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistant"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Privacy Chip ng Mikropono"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Avatar ng User"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Text ng User Name"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Ibaba ang temperatura"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Itaas ang temperatura"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Setting ng Bluetooth: Nakadiskonekta"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Mga setting ng tunog"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Mga setting ng mga profile at account"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Hindi sinusuportahan ng pattern ang rotary; pumindot"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Na-lock ang touch screen"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Na-lock ang iyong screen"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Naka-lock ang iyong screen"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Na-lock ang iyong screen"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Naka-unlock na ngayon ang iyong screen"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Sigurado ka bang gusto mong mag-log out?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Isasara nito ang lahat ng bukas na application"</string>
     <string name="user_logout" msgid="2934184154258330491">"Mag-log out"</string>
     <string name="car_guest" msgid="768913000117469596">"Bisita"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Lumilipat ng profile…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Nagdaragdag ng bagong profile…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Puwede kang magdagdag ng hanggang <xliff:g id="USER_LIMIT">%d</xliff:g> (na) profile."</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Magdagdag ng bagong profile?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Para magpatuloy, dapat mag-sign out si <xliff:g id="USER_NAME">%1$s</xliff:g> sa screen na <xliff:g id="SEAT_LOCATION">%2$s</xliff:g>"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Pumili ng profile para magsimula"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Naka-sign in"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Mag-sign in sa screen na <xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Hindi makapagdagdag ng bagong profile. Subukan ulit sa ibang pagkakataon."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Hindi masimulan ang profile ng Bisita. Subukan ulit sa ibang pagkakataon."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Nagsa-sign out…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"Sina-sign out si <xliff:g id="USER_NAME">%s</xliff:g>. Subukan ulit sa ibang pagkakataon."</string>
     <string name="seat_driver" msgid="4502591979520445677">"driver"</string>
     <string name="seat_front" msgid="836133281052793377">"harap"</string>
     <string name="seat_rear" msgid="403133444964528577">"likod"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Ilagay ang iyong PIN"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Ilagay ang iyong pattern"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Ilagay ang iyong password"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Backspace key"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter key"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Bumalik"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Full Screen"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 12d21641..0e4b5045 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Oturumu sonlandır"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Yeni Profil"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Yeni profil eklensin mi?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Eklediğiniz yeni profil, hesap sahibi tarafından özelleştirilebilir."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Her profil uygulama güncellemesi yükleyebilir ve bunlar tüm profiller tarafından kullanılabilir"</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Profil sınırına ulaşıldı"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Yalnızca tek bir profil oluşturulabilir.}other{En çok # profil ekleyebilirsiniz.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Yükleniyor"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> kapalı."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"<xliff:g id="SENSOR">%1$s</xliff:g> kullanılır"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"İzne sahip uygulamalar için"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Mikrofon ayarları"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Gizlilik ayarları"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g>, <xliff:g id="SENSOR">%2$s</xliff:g> özelliğini kullanıyor"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g>, mikrofonu kullanıyor"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g>, kısa bir süre önce <xliff:g id="SENSOR">%2$s</xliff:g> özelliğini kullandı"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"Tamam"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Araç mikrofonu açılsın mı?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Devam etmek için bilgi-eğlence sistemi mikrofonunu açın. Bu şekilde, izni olan tüm uygulamalar için mikrofon açılır."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Kamera ayarları"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> uygulaması kamerayı kullanıyor"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> uygulamaları kamera kullanıyor"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> uygulaması kısa süre önce kamerayı kullandı"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Haritalar"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Medya"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Kontrol Merkezi"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Asistan"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Mikrofon Gizlilik Çipi"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Kullanıcı Avatarı"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Kullanıcı Adı Metni"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Isıyı düşür"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Isıyı artır"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Bluetooth Ayarı: Bağlı Değil"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Ses ayarları"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Profil ve hesap ayarları"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Desende çevirme desteklenmiyor. Dokunmayı kullanın"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Dokunmatik ekran kilitli"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Ekranınız kilitlendi"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"EKranınız kilitlendi"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Ekranınız kilitlendi"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Ekranınız kilitleniyor"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Çıkış yapmak istediğinizden emin misiniz?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Bu işlem, açık olan tüm uygulamaları kapatacak"</string>
     <string name="user_logout" msgid="2934184154258330491">"Çıkış yap"</string>
     <string name="car_guest" msgid="768913000117469596">"Misafir"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Profil değiştiriliyor…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Yeni profil ekleniyor…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"En çok <xliff:g id="USER_LIMIT">%d</xliff:g> profil ekleyebilirsiniz."</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Yeni profil eklensin mi?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Devam etmek için <xliff:g id="USER_NAME">%1$s</xliff:g>, <xliff:g id="SEAT_LOCATION">%2$s</xliff:g> ekranında oturumunu kapatmalıdır"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Başlamak için profil seçin"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Oturum açıldı"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"<xliff:g id="SEAT_LOCATION">%s</xliff:g> ekranında oturum açık"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Yeni profil eklenemiyor. Daha sonra tekrar deneyin."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Misafir profili başlatılamıyor. Daha sonra tekrar deneyin."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Çıkış yapılıyor…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> oturumu kapatılıyor. Daha sonra tekrar deneyin."</string>
     <string name="seat_driver" msgid="4502591979520445677">"sürücü"</string>
     <string name="seat_front" msgid="836133281052793377">"ön"</string>
     <string name="seat_rear" msgid="403133444964528577">"arka"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"PIN\'inizi girin"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Deseninizi girin"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Şifrenizi girin"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Geri tuşu"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter tuşu"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Geri"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Tam Ekran"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index c8fc4f48..a999822d 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Завершити сеанс"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Новий профіль"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Додати новий профіль?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Коли ви додасте новий профіль, власник облікового запису зможе налаштувати його."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Власник будь-якого профілю може встановити оновлення додатка, яке буде доступним для всіх профілів."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Не можна додати більше профілів"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Можна створити лише один профіль.}one{Можна додати не більше ніж # профіль.}few{Можна додати не більше ніж # профілі.}many{Можна додати не більше ніж # профілів.}other{Можна додати не більше ніж # профілю.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Завантаження"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g>: вимкнено."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Використовувати функцію \"<xliff:g id="SENSOR">%1$s</xliff:g>\""</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Для додатків, яким надано дозвіл"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Налаштування мікрофона"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Налаштування конфіденційності"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"Додаток <xliff:g id="APP">%1$s</xliff:g> використовує функцію \"<xliff:g id="SENSOR">%2$s</xliff:g>\""</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"Додатки <xliff:g id="APP_LIST">%s</xliff:g> використовують мікрофон"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"Додаток <xliff:g id="APP">%1$s</xliff:g> нещодавно використовував функцію \"<xliff:g id="SENSOR">%2$s</xliff:g>\""</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Увімкнути мікрофон транспортного засобу?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Щоб продовжити, увімкніть мікрофон інформаційно-розважальної системи. Мікрофон буде також увімкнено в усіх додатках, яким надано дозвіл."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Налаштування камери"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"Додаток <xliff:g id="APP">%s</xliff:g> використовує камеру"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"Додатки <xliff:g id="APP_LIST">%s</xliff:g> використовують камеру"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"Нещодавно додаток <xliff:g id="APP">%s</xliff:g> використовував камеру"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Карти"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Медіа"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Центр керування"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Асистент"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Чип конфіденційності мікрофона"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Аватар користувача"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Текст з іменем користувача"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Знизити температуру"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Підвищити температуру"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Налаштування Bluetooth: відключено"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Налаштування звуку"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Налаштування профілів і облікових записів"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Ключ вводиться лише на сенсорній панелі"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Сенсорний екран заблоковано"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Екран заблоковано"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Екран заблоковано"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Екран заблоковано"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Екран тепер розблоковано"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Вийти з облікового запису?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Усі відкриті додатки буде закрито"</string>
     <string name="user_logout" msgid="2934184154258330491">"Вийти"</string>
     <string name="car_guest" msgid="768913000117469596">"Гість"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Перемикання профілю…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Додавання нового профілю…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Кількість доданих профілів не може перевищувати <xliff:g id="USER_LIMIT">%d</xliff:g>"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Додати новий профіль?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Щоб продовжити, <xliff:g id="USER_NAME">%1$s</xliff:g> має вийти з облікового запису на екрані <xliff:g id="SEAT_LOCATION">%2$s</xliff:g>"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Щоб почати, виберіть профіль"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Ви ввійшли в обліковий запис"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Виконано вхід на екрані <xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Не вдається додати новий профіль. Спробуйте пізніше."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Не вдається запустити профіль гостя. Спробуйте пізніше."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Вихід…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"Користувач <xliff:g id="USER_NAME">%s</xliff:g> виходить з облікового запису. Спробуйте пізніше."</string>
     <string name="seat_driver" msgid="4502591979520445677">"водій"</string>
     <string name="seat_front" msgid="836133281052793377">"спереду"</string>
     <string name="seat_rear" msgid="403133444964528577">"ззаду"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Введіть PIN-код"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Введіть ключ"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Введіть пароль"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Клавіша Backspace"</string>
+    <string name="enter_key" msgid="747962923921283095">"Клавіша Enter"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Назад"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"На весь екран"</string>
 </resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index a006b8d9..5a7876d9 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"سیشن ختم کریں"</string>
     <string name="car_new_user" msgid="6766334721724989964">"نئی پروفائل"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"نئی پروفائل شامل کریں؟"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"نئی پروفائل شامل کرنے کے بعد، اکاؤنٹ کا حامل اسے حسب ضرورت بنا سکتا ہے۔"</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"کوئی بھی پروفائل ایپ اپ ڈیٹ انسٹال کر سکتی ہے جو اس کے بعد تمام پروفائلز کے لیے دستیاب ہوگی۔"</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"پروفائل کی حد مکمل ہوگئی"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{صرف ایک پروفائل تخلیق کی جا سکتی ہے۔}other{آپ # تک پروفائلز شامل کر سکتے ہیں۔}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"لوڈ ہو رہی ہے"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> آف ہے۔"</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"<xliff:g id="SENSOR">%1$s</xliff:g> استعمال کریں"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"ان ایپس کے لیے جن کو اجازت ہے"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"مائیکروفون کی ترتیبات"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"رازداری کی ترتیبات"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> <xliff:g id="SENSOR">%2$s</xliff:g> کا استعمال کر رہی ہے"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> مائک کا استعمال کر رہی ہیں"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> نے حال ہی میں <xliff:g id="SENSOR">%2$s</xliff:g> کا استعمال کیا"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"ٹھیک ہے"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"گاڑی کا مائیکروفون آن کریں؟"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"جاری رکھنے کیلئے معلوماتی انٹرٹینمنٹ سسٹم کا مائیکروفون آن کریں۔ یہ ان تمام ایپس کے لیے مائیکروفون آن کر دے گا جن کو اجازت ہے۔"</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"کیمرہ کی ترتیبات"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> کیمرے کا استعمال کر رہی ہے"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> کیمرے کا استعمال کر رہی ہیں"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> نے کیمرے کا حال ہی میں استعمال کیا"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"میڈیا"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"کنٹرول سینٹر"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"اسسٹنٹ"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"مائیکروفون کیلئے رازداری چِپ"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"صارف کا اوتار"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"صارف نام کا ٹیکسٹ"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"درجۂ حرارت کم کریں"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"درجۂ حرارت بڑھائیں"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"بلوٹوتھ کی ترتیب: غیر منسلک ہو گیا"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"آواز کی ترتیبات"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"پروفائلز اور اکاؤنٹس کی ترتیبات"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"پیٹرن روٹری کو سپورٹ نہیں کرتا ہے؛ براہ کرم ٹچ کریں استعمال کریں"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"ٹچ اسکرین مقفل ہو گیا"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"آپ کی اسکرین مقفل ہو گئی ہے"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"آپ کی اسکرین مقفل ہے"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"آپ کی اسکرین مقفل ہو گئی ہے"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"آپ کی اسکرین اب غیر مقفل ہے"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"کیا آپ واقعی لاگ آؤٹ کرنا چاہتے ہیں؟"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"اس سے تمام کھلی ایپلیکیشنز بند ہو جائیں گی"</string>
     <string name="user_logout" msgid="2934184154258330491">"لاگ آؤٹ کریں"</string>
     <string name="car_guest" msgid="768913000117469596">"مہمان"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"پروفائل سوئچ ہو رہی ہے…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"نئی پروفائل شامل ہو رہی ہے…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"آپ <xliff:g id="USER_LIMIT">%d</xliff:g> تک پروفائلز شامل کر سکتے ہیں"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"نئی پروفائل شامل کریں؟"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"جاری رکھنے کے لیے، <xliff:g id="USER_NAME">%1$s</xliff:g> کو <xliff:g id="SEAT_LOCATION">%2$s</xliff:g> اسکرین سے سائن آؤٹ ہونا چاہیے"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"شروع کرنے کے لیے پروفائل منتخب کریں"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"سائن ان ہو گیا"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"<xliff:g id="SEAT_LOCATION">%s</xliff:g> اسکرین پر سائن ان کیا گیا"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"نئی پروفائل شامل نہیں کر سکتے۔ بعد میں دوبارہ کوشش کریں۔"</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"مہمان پروفائل شروع نہیں کر سکتے۔ بعد میں دوبارہ کوشش کریں۔"</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"سائن آؤٹ ہو رہا ہے…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> سائن آؤٹ ہو رہا ہے۔ بعد میں دوبارہ کوشش کریں۔"</string>
     <string name="seat_driver" msgid="4502591979520445677">"ڈرائیور"</string>
     <string name="seat_front" msgid="836133281052793377">"فرنٹ"</string>
     <string name="seat_rear" msgid="403133444964528577">"پیچھے"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"اپنا PIN درج کریں"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"اپنا پیٹرن درج کریں"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"اپنا پاس ورڈ درج کریں"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Backspace کلید"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter کلید"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"پیچھے جائیں"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"فُل اسکرین"</string>
 </resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index f96ea463..e11fb53c 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Seansni yakunlash"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Yangi profil"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Yangi profil kiritilsinmi?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Yangi profil qoʻshilgandan keyin hisob egasi uni oʻzgartira oladi."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Har qanday profil ilova yangilanishini oʻrnata oladi, keyin u barcha profillar uchun mavjud boʻladi."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Boshqa profil kiritish imkonsiz"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Faqat bitta profil yaratish mumkin.}other{Maksimal # ta profil kiritish mumkin.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Yuklanmoqda"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> yoniq emas."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"<xliff:g id="SENSOR">%1$s</xliff:g> ishlatish"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Ruxsati bor ilovalar uchun"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Mikrofon sozlamalari"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Maxfiylik sozlamalari"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> hozir <xliff:g id="SENSOR">%2$s</xliff:g> ishlatmoqda"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> mikrofon ishlatishmoqda"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"<xliff:g id="APP">%1$s</xliff:g> yaqinda <xliff:g id="SENSOR">%2$s</xliff:g> ishlatgan"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Avtomobil mikrofoni yoqilsinmi?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Davom etish uchun axborot-hordiq tizimi mikrofonini yoqing. Bunda ruxsati bor barcha ilovalar mikrofondan foydalanishi mumkin boʻladi."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Kamera sozlamalari"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> kamera ishlatmoqda"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> kamera ishlatmoqda"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> yaqinda kamera ishlatgan"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Xaritalar"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Media"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Boshqaruv markazi"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Assistent"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Mikrofon maxfiylik chipi"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Foydalanuvchi avatari"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Foydalanuvchi nomi matni"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Haroratni tushirish"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Haroratni koʻtarish"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Bluetooth sozlamasi: uzildi"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Tovush sozlamalari"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Profillar va hisoblar sozlamalari"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Grafik kalit burilmaydi, telefonni buring"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Sensorli ekran qulflandi"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Ekraningiz qulflandi"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Ekraningiz qulflandi"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Ekraningiz qulflandi"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Ekraningiz qulfi ochildi"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Profildan chiqasizmi?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Bunda barcha ochiq ilovalar yopiladi"</string>
     <string name="user_logout" msgid="2934184154258330491">"Chiqish"</string>
     <string name="car_guest" msgid="768913000117469596">"Mehmon"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Profil almashmoqda…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Yangi profil qoʻshilmoqda…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Maksimal <xliff:g id="USER_LIMIT">%d</xliff:g> ta profil kiritish mumkin"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Yangi profil kiritilsinmi?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Davom etish uchun <xliff:g id="USER_NAME">%1$s</xliff:g> <xliff:g id="SEAT_LOCATION">%2$s</xliff:g> ekranidan chiqishi kerak"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Boshlash uchun profilni tanlang"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Hisobga kirilgan"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"<xliff:g id="SEAT_LOCATION">%s</xliff:g> ekraniga kirildi"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Yangi profil qoʻshilmadi. Keyinroq qayta urining."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Mehmon profili boshlanmadi. Keyinroq qayta urining."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Hisobdan chiqilmoqda…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> hisobidan chiqadi. Keyinroq qayta urining."</string>
     <string name="seat_driver" msgid="4502591979520445677">"haydovchi"</string>
     <string name="seat_front" msgid="836133281052793377">"old"</string>
     <string name="seat_rear" msgid="403133444964528577">"orqa"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"PIN kodni kiriting"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Grafik kalitni chizing"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Parolni kiriting"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Backspace tugmasi"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter tugmasi"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Orqaga"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Butun ekran"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 6d604081..90dff9f9 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Kết thúc phiên"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Hồ sơ mới"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Thêm hồ sơ mới?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Sau khi bạn thêm hồ sơ mới, chủ tài khoản có thể tuỳ chỉnh hồ sơ đó."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Mọi hồ sơ đều có thể cài đặt bản cập nhật ứng dụng và sau đó tất cả hồ sơ đều nhận được."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Đã đạt số lượng hồ sơ tối đa"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Chỉ có thể tạo một hồ sơ.}other{Bạn có thể thêm tối đa # hồ sơ.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Đang tải"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g> đang tắt."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Sử dụng <xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Cho những ứng dụng có quyền"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Cài đặt micrô"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Cài đặt quyền riêng tư"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"<xliff:g id="APP">%1$s</xliff:g> đang sử dụng <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g> đang sử dụng micrô"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"Ứng dụng <xliff:g id="APP">%1$s</xliff:g> mới sử dụng <xliff:g id="SENSOR">%2$s</xliff:g>"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"OK"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Bật micrô trên xe?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Để tiếp tục, hãy bật micrô của hệ thống thông tin giải trí. Thao tác này sẽ bật micrô cho mọi ứng dụng có quyền."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Cài đặt máy ảnh"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"<xliff:g id="APP">%s</xliff:g> đang sử dụng máy ảnh"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g> đang sử dụng máy ảnh"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"<xliff:g id="APP">%s</xliff:g> mới sử dụng máy ảnh"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Nội dung nghe nhìn"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Trung tâm kiểm soát"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Trợ lý"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"Khối quyền riêng tư micrô"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Hình đại diện của người dùng"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Văn bản tên người dùng"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Giảm nhiệt độ"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Tăng nhiệt độ"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Cài đặt Bluetooth: Đã ngắt kết nối"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Cài đặt âm thanh"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Cài đặt tài khoản và hồ sơ"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Không hỗ trợ xoay trong hình mở khoá; hãy chạm"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Đã khoá màn hình cảm ứng"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Màn hình của bạn đã được khoá"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Màn hình của bạn đã được khoá"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Màn hình của bạn đã được khoá"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Màn hình của bạn đã được mở khoá"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Bạn có chắc chắn muốn đăng xuất không?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Thao tác này sẽ đóng tất cả ứng dụng đang mở"</string>
     <string name="user_logout" msgid="2934184154258330491">"Đăng xuất"</string>
     <string name="car_guest" msgid="768913000117469596">"Khách"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Đang chuyển hồ sơ…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Đang thêm hồ sơ mới…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Bạn có thể thêm tối đa <xliff:g id="USER_LIMIT">%d</xliff:g> hồ sơ"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Thêm hồ sơ mới?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Để tiếp tục, <xliff:g id="USER_NAME">%1$s</xliff:g> phải đăng xuất khỏi màn hình <xliff:g id="SEAT_LOCATION">%2$s</xliff:g>"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Chọn hồ sơ để bắt đầu"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Đã đăng nhập"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Đã đăng nhập trên màn hình <xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Không thêm được hồ sơ mới. Hãy thử lại sau."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Không bắt đầu được Hồ sơ khách. Hãy thử lại sau."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Đang đăng xuất..."</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g> đang đăng xuất. Hãy thử lại sau."</string>
     <string name="seat_driver" msgid="4502591979520445677">"tài xế"</string>
     <string name="seat_front" msgid="836133281052793377">"trước"</string>
     <string name="seat_rear" msgid="403133444964528577">"sau"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Nhập mã PIN"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Nhập hình mở khoá"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Nhập mật khẩu"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Phím Backspace"</string>
+    <string name="enter_key" msgid="747962923921283095">"Phím Enter"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Quay lại"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Toàn màn hình"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index d4360dfd..1644e581 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"结束会话"</string>
     <string name="car_new_user" msgid="6766334721724989964">"新的个人资料"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"要添加新的个人资料吗？"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"在您添加新的个人资料后，账号持有人便可对其进行自定义。"</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"任何个人资料都可以安装应用更新，已安装的更新随后可供所有个人资料使用。"</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"已达到个人资料数量上限"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{只能创建 1 份个人资料。}other{您最多可以添加 # 份个人资料。}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"正在加载"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g>已关闭。"</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"使用<xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"对于已拥有权限的应用"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"麦克风设置"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"隐私设置"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"“<xliff:g id="APP">%1$s</xliff:g>”正在使用<xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g>正在使用麦克风"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"“<xliff:g id="APP">%1$s</xliff:g>”最近使用过<xliff:g id="SENSOR">%2$s</xliff:g>"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"确定"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"要开启车辆麦克风吗？"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"如要继续，请开启信息娱乐系统的麦克风，让所有已获取权限的应用都能使用。"</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"相机设置"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"“<xliff:g id="APP">%s</xliff:g>”正在使用相机"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"以下应用正在使用相机：<xliff:g id="APP_LIST">%s</xliff:g>"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"“<xliff:g id="APP">%s</xliff:g>”最近使用过相机"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"地图"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"媒体"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"控制中心"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Google 助理"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"麦克风隐私设置条状标签"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"用户头像"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"用户姓名文本"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"调低温度"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"调高温度"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"蓝牙设置：已断开连接"</string>
@@ -88,39 +89,28 @@
     <string name="qc_footer_network_internet_settings" msgid="2480582764252681575">"网络和互联网设置"</string>
     <string name="qc_footer_display_settings" msgid="2950539240110437704">"显示设置"</string>
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"声音设置"</string>
-    <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"个人资料和帐号设置"</string>
+    <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"个人资料和账号设置"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"图案不支持旋转输入；请使用触控输入"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"触摸屏已被锁定"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"您的屏幕已被锁定"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"您的屏幕已锁定"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"已锁定您的屏幕"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"您的屏幕现已解锁"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"您确定要退出吗？"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"此操作将会关闭所有已打开的应用"</string>
     <string name="user_logout" msgid="2934184154258330491">"退出"</string>
     <string name="car_guest" msgid="768913000117469596">"访客"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"正在切换个人资料…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"正在添加个人资料…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"您最多可以添加 <xliff:g id="USER_LIMIT">%d</xliff:g> 份个人资料"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"要添加新的个人资料吗？"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"若要继续，<xliff:g id="USER_NAME">%1$s</xliff:g>应从<xliff:g id="SEAT_LOCATION">%2$s</xliff:g>界面中退出账号"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"选择相应个人资料即可开始使用"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"已登录"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"已登录<xliff:g id="SEAT_LOCATION">%s</xliff:g>界面"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"无法添加新的个人资料。请稍后重试。"</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"无法添加访客资料。请稍后重试。"</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"正在退出账号…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"<xliff:g id="USER_NAME">%s</xliff:g>正在退出账号。请稍后重试。"</string>
     <string name="seat_driver" msgid="4502591979520445677">"驾驶员"</string>
     <string name="seat_front" msgid="836133281052793377">"前排"</string>
     <string name="seat_rear" msgid="403133444964528577">"后排"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"输入您的 PIN 码"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"绘制您的图案"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"输入您的密码"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"退格键"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter 键"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"返回"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"全屏"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 4dfc7e3d..1fba557d 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -30,13 +30,13 @@
     <string name="user_add_user_message_setup" msgid="1639791240776969175">"新增設定檔後，帳戶持有人便可進行自訂。"</string>
     <string name="user_add_user_message_update" msgid="4507063398890966360">"任何設定檔均可安裝應用程式更新，隨後便可供所有設定檔使用。"</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"已達設定檔數量上限"</string>
-    <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{只可建立一個設定檔。}other{您可建立最多 # 個設定檔。}}"</string>
+    <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{只可建立一個設定檔。}other{你可建立最多 # 個設定檔。}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"正在載入"</string>
     <string name="car_loading_profile_developer_message" msgid="737810794567935702">"正在載入使用者 (由 <xliff:g id="FROM_USER">%1$d</xliff:g> 至 <xliff:g id="TO_USER">%2$d</xliff:g>)"</string>
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"閂咗<xliff:g id="SENSOR">%1$s</xliff:g>。"</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"使用<xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"擁有權限的應用程式"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"麥克風設定"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"私隱權設定"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"「<xliff:g id="APP">%1$s</xliff:g>」正在使用<xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"「<xliff:g id="APP_LIST">%s</xliff:g>」正在使用麥克風"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"「<xliff:g id="APP">%1$s</xliff:g>」最近曾使用<xliff:g id="SENSOR">%2$s</xliff:g>"</string>
@@ -46,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"確定"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"要開啟車輛麥克風嗎？"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"如要繼續，請開啟資訊娛樂系統麥克風。所有擁有權限的應用程式都會開啟麥克風。"</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"相機設定"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"「<xliff:g id="APP">%s</xliff:g>」正在使用相機"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g>正在使用相機"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"「<xliff:g id="APP">%s</xliff:g>」最近曾使用相機"</string>
@@ -64,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"地圖"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"媒體"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"控制中心"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Google 助理"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"麥克風私隱方塊"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"使用者顯示圖片"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"使用者名稱文字"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"調低溫度"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"調高溫度"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"藍牙設定：已中斷連接"</string>
@@ -74,7 +77,7 @@
     <string name="status_icon_signal_hotspot" msgid="1023039120452006880">"訊號設定：已開啟熱點"</string>
     <string name="status_icon_display_status" msgid="2970020923181359144">"顯示設定"</string>
     <string name="status_icon_drive_mode" msgid="3938622431486261076">"駕駛模式"</string>
-    <string name="activity_blocked_text" msgid="5353157279548801554">"您無法在駕駛時使用此功能"</string>
+    <string name="activity_blocked_text" msgid="5353157279548801554">"你無法在駕駛時使用此功能"</string>
     <string name="exit_button_close_application" msgid="112227710467017144">"關閉應用程式"</string>
     <string name="exit_button_go_back" msgid="7988866855775300902">"返回"</string>
     <string name="drive_mode_modes_comfort" msgid="628724737960743004">"舒適"</string>
@@ -88,16 +91,17 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"音效設定"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"設定檔和帳戶設定"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"圖案不支援旋轉輸入；請使用輕觸輸入"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"觸控式屏幕已鎖定"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"您的螢幕已鎖定"</string>
-    <string name="user_logout_title" msgid="5534754139319586681">"您確定要登出嗎？"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"螢幕現已鎖定"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"您的螢幕已鎖定"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"螢幕現已解鎖"</string>
+    <string name="user_logout_title" msgid="5534754139319586681">"你確定要登出嗎？"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"此操作會關閉所有已開啟的應用程式"</string>
     <string name="user_logout" msgid="2934184154258330491">"登出"</string>
     <string name="car_guest" msgid="768913000117469596">"訪客"</string>
     <string name="user_switching_message" msgid="5346172662613832946">"正在切換設定檔…"</string>
     <string name="user_adding_message" msgid="4700853604381151415">"正在新增設定檔…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"您可建立最多 <xliff:g id="USER_LIMIT">%d</xliff:g> 個設定檔"</string>
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"你可建立最多 <xliff:g id="USER_LIMIT">%d</xliff:g> 個設定檔"</string>
     <string name="confirm_add_user_title" msgid="75853419607883551">"要新增設定檔嗎？"</string>
     <string name="already_logged_in_message" msgid="3657131706472825219">"如要繼續，<xliff:g id="USER_NAME">%1$s</xliff:g> 必須登出<xliff:g id="SEAT_LOCATION">%2$s</xliff:g>螢幕"</string>
     <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"選取要啟動的設定檔"</string>
@@ -119,4 +123,9 @@
     <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"請輸入 PIN"</string>
     <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"請畫出圖案"</string>
     <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"請輸入密碼"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Backspace 鍵"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter 鍵"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"返回"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"全螢幕"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index d4cfdcf0..65c5469d 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"結束工作階段"</string>
     <string name="car_new_user" msgid="6766334721724989964">"新設定檔"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"要新增設定檔嗎？"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"新增設定檔後，帳戶持有人可以自訂其內容。"</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"任何設定檔都可以安裝應用程式更新。安裝完成後這類更新會套用到所有設定檔。"</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"設定檔數量已達上限"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{只能建立 1 個設定檔。}other{最多可以新增 # 個設定檔。}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"載入中"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"<xliff:g id="SENSOR">%1$s</xliff:g>已關閉。"</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"使用<xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"擁有權限的應用程式"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"麥克風設定"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"隱私權設定"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"「<xliff:g id="APP">%1$s</xliff:g>」正在使用<xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"<xliff:g id="APP_LIST">%s</xliff:g>正在使用麥克風"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"「<xliff:g id="APP">%1$s</xliff:g>」最近曾使用<xliff:g id="SENSOR">%2$s</xliff:g>"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"確定"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"要開啟車輛的麥克風嗎？"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"如要繼續，請開啟資訊娛樂系統的麥克風，讓每個擁有權限的應用程式都能使用。"</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"攝影機設定"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"「<xliff:g id="APP">%s</xliff:g>」正在使用攝影機"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"<xliff:g id="APP_LIST">%s</xliff:g>正在使用攝影機"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"「<xliff:g id="APP">%s</xliff:g>」最近曾使用攝影機"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"地圖"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"媒體"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"控制中心"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"Google 助理"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"麥克風隱私權方塊"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"使用者顯示圖片"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"使用者名稱文字"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"調低溫度"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"調高溫度"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"藍牙設定：連線中斷"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"音效設定"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"設定檔和帳戶設定"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"無法旋轉輸入解鎖圖案，請用觸控的方式解鎖"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"觸控螢幕已鎖定"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"螢幕已鎖定"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"螢幕已鎖定"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"螢幕已鎖定"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"螢幕已解鎖"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"確定要登出嗎？"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"這麼做會關閉所有開啟的應用程式"</string>
     <string name="user_logout" msgid="2934184154258330491">"登出"</string>
     <string name="car_guest" msgid="768913000117469596">"訪客"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"正在切換設定檔…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"正在新增設定檔…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"最多只能新增 <xliff:g id="USER_LIMIT">%d</xliff:g> 個設定檔"</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"要新增設定檔嗎？"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"如要繼續，<xliff:g id="USER_NAME">%1$s</xliff:g>必須先在<xliff:g id="SEAT_LOCATION">%2$s</xliff:g>畫面登出"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"選取設定檔即可開始"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"已登入"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"已在<xliff:g id="SEAT_LOCATION">%s</xliff:g>畫面登入"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"無法新增設定檔，請稍後再試。"</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"無法建立訪客設定檔，請稍後再試。"</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"登出中…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"正在將<xliff:g id="USER_NAME">%s</xliff:g>登出，請稍後再試。"</string>
     <string name="seat_driver" msgid="4502591979520445677">"駕駛座"</string>
     <string name="seat_front" msgid="836133281052793377">"前方座位"</string>
     <string name="seat_rear" msgid="403133444964528577">"後方座位"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"輸入 PIN 碼"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"畫出解鎖圖案"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"輸入密碼"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Backspace 鍵"</string>
+    <string name="enter_key" msgid="747962923921283095">"Enter 鍵"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"返回"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"全螢幕"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index b8d78043..1f5ed594 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -27,10 +27,8 @@
     <string name="end_session" msgid="2765206020435441421">"Phothula isikhathi"</string>
     <string name="car_new_user" msgid="6766334721724989964">"Iphrofayela entsha"</string>
     <string name="user_add_profile_title" msgid="828371911076521952">"Engeza iphrofayela entsha?"</string>
-    <!-- no translation found for user_add_user_message_setup (1639791240776969175) -->
-    <skip />
-    <!-- no translation found for user_add_user_message_update (4507063398890966360) -->
-    <skip />
+    <string name="user_add_user_message_setup" msgid="1639791240776969175">"Ngemva kokwengeza iphrofayela entsha, umnikazi we-akhawunti angayenza ngendlela oyifisayo."</string>
+    <string name="user_add_user_message_update" msgid="4507063398890966360">"Noma iyiphi iphrofayela ingafaka isibuyekezo se-app, esizobe sesitholakala kuwo wonke amaphrofayela."</string>
     <string name="profile_limit_reached_title" msgid="7891779218496729653">"Umkhawulo wephrofayela ufinyelelwe"</string>
     <string name="profile_limit_reached_message" msgid="1534369584753840606">"{count,plural, =1{Yiphrofayela eyodwa kuphela engenziwa.}one{Ungangeza kufika kumaphrofayela angu-#.}other{Ungangeza kufika kumaphrofayela angu-#.}}"</string>
     <string name="car_loading_profile" msgid="458961191993686065">"Iyalayisha"</string>
@@ -38,7 +36,7 @@
     <string name="privacy_chip_off_content" msgid="8406415098507955316">"I-<xliff:g id="SENSOR">%1$s</xliff:g> ivaliwe."</string>
     <string name="privacy_chip_use_sensor" msgid="7688230720803089653">"Sebenzisa i-<xliff:g id="SENSOR">%1$s</xliff:g>"</string>
     <string name="privacy_chip_use_sensor_subtext" msgid="5655148288310815742">"Okwama-app anemvume"</string>
-    <string name="mic_privacy_chip_microphone_settings" msgid="4520886720588226450">"Amasethingi wemakrofoni"</string>
+    <string name="privacy_chip_settings" msgid="8028897999244574288">"Amasethingi obumfihlo"</string>
     <string name="privacy_chip_app_using_sensor_suffix" msgid="7921315376271490004">"I-<xliff:g id="APP">%1$s</xliff:g> isebenzisa i-<xliff:g id="SENSOR">%2$s</xliff:g>"</string>
     <string name="mic_privacy_chip_apps_using_mic_suffix" msgid="6656026041668305817">"Ama-<xliff:g id="APP_LIST">%s</xliff:g> asebenzisa imakrofoni"</string>
     <string name="privacy_chip_app_recently_used_sensor_suffix" msgid="4632772067170022529">"I-<xliff:g id="APP">%1$s</xliff:g> isebenzise i-<xliff:g id="SENSOR">%2$s</xliff:g> kamuva nje"</string>
@@ -48,7 +46,6 @@
     <string name="mic_privacy_chip_dialog_ok" msgid="2298690833121720237">"KULUNGILE"</string>
     <string name="sensor_privacy_start_use_mic_dialog_title" msgid="8774244900043105266">"Vula imakrofoni yemoto?"</string>
     <string name="sensor_privacy_start_use_mic_dialog_content" msgid="8382980879434990801">"Ukuze uqhubeke, vula imakrofoni yesistimu ye-infotainment Lokhu kuzovula imakrofoni yawo wonke ama-app anemvume."</string>
-    <string name="camera_privacy_chip_camera_settings" msgid="96342672670928980">"Amasethingi ekhamera"</string>
     <string name="camera_privacy_chip_app_using_camera_suffix" msgid="2591363552459967509">"I-<xliff:g id="APP">%s</xliff:g> isebenzisa ikhamera"</string>
     <string name="camera_privacy_chip_apps_using_camera_suffix" msgid="8033118959615498419">"Ama-<xliff:g id="APP_LIST">%s</xliff:g> asebenzisa ikhamera"</string>
     <string name="camera_privacy_chip_app_recently_used_camera_suffix" msgid="4534950658276502559">"I-<xliff:g id="APP">%s</xliff:g> isebenzise ikhamera kamuva nje"</string>
@@ -66,6 +63,10 @@
     <string name="system_bar_maps_label" msgid="7883864993280235380">"I-Maps"</string>
     <string name="system_bar_media_label" msgid="6156112139796274847">"Imidiya"</string>
     <string name="system_bar_control_center_label" msgid="5269256399167811590">"Isikhungo Sokulawula"</string>
+    <string name="system_bar_assistant_label" msgid="7312821609046711200">"I-Assistant"</string>
+    <string name="system_bar_mic_privacy_chip" msgid="2494035034004728597">"I-Chip Yobumfihlo be-Mic"</string>
+    <string name="system_bar_user_avatar" msgid="4122817348016746322">"Isithombe Somsebenzisi"</string>
+    <string name="system_bar_user_name_text" msgid="5859605302481171746">"Umbhalo Wegama Lomsebenzisi"</string>
     <string name="hvac_decrease_button_label" msgid="5628481079099995286">"Izinga lokushisa eliphansi kakhulu"</string>
     <string name="hvac_increase_button_label" msgid="2855688290787396792">"Izinga lokushisa elikhuphukayo"</string>
     <string name="status_icon_bluetooth_disconnected" msgid="6773447522499007010">"Isethingi le-Bluetooth: linqanyuliwe"</string>
@@ -90,37 +91,26 @@
     <string name="qc_footer_network_sound_settings" msgid="5117011034908775097">"Amasethingi omsindo"</string>
     <string name="qc_footer_profiles_accounts_settings" msgid="4456419248123950232">"Amasethingi wamaphrofayela ne-akhawunti"</string>
     <string name="lockpattern_does_not_support_rotary" msgid="4605787900312103476">"Iphethini ayisekeli i-rotary; sicela usebenzise ukuthinta"</string>
-    <string name="display_input_lock_text" msgid="8524876126635885614">"Ukuthinta isikrini kukhiyiwe"</string>
-    <string name="display_input_lock_initial_text" msgid="7497552507312397576">"Isikrini sakho sikhiyiwe"</string>
+    <string name="display_input_lock_text" msgid="1671197665816822205">"Isikrini sakho sikhiyiwe"</string>
+    <string name="display_input_lock_started_text" msgid="2434054522800802134">"Isikrini sakho sikhiyiwe"</string>
+    <string name="display_input_lock_stopped_text" msgid="5944577827512246808">"Isikrini sakho manje sesivuliwe"</string>
     <string name="user_logout_title" msgid="5534754139319586681">"Ingabe uqinisekile ukuthi ufuna ukuphuma?"</string>
     <string name="user_logout_message" msgid="7804089876692575056">"Lokhu kuzovala wonke ama-app avuliwe"</string>
     <string name="user_logout" msgid="2934184154258330491">"Phuma ngemvume"</string>
     <string name="car_guest" msgid="768913000117469596">"Isihambeli"</string>
-    <!-- no translation found for user_switching_message (5346172662613832946) -->
-    <skip />
-    <!-- no translation found for user_adding_message (4700853604381151415) -->
-    <skip />
+    <string name="user_switching_message" msgid="5346172662613832946">"Ishintsha iphrofayela…"</string>
+    <string name="user_adding_message" msgid="4700853604381151415">"Yengeza iphrofayela entsha…"</string>
     <string name="max_user_limit_reached_title" msgid="7319012467112549458"></string>
-    <!-- no translation found for max_user_limit_reached_message (1445188223628919167) -->
-    <skip />
-    <!-- no translation found for confirm_add_user_title (75853419607883551) -->
-    <skip />
-    <!-- no translation found for already_logged_in_message (3657131706472825219) -->
-    <skip />
-    <!-- no translation found for header_bar_text_in_logged_out_state (3903097856063608991) -->
-    <skip />
-    <!-- no translation found for logged_in_text (742324514947999718) -->
-    <skip />
-    <!-- no translation found for prefix_logged_in_info_for_other_seat (7438545665671460955) -->
-    <skip />
-    <!-- no translation found for create_user_failed_message (4539847475822170735) -->
-    <skip />
-    <!-- no translation found for guest_creation_failed_message (8198126434029601949) -->
-    <skip />
-    <!-- no translation found for stopping_user_text (4946464635279894684) -->
-    <skip />
-    <!-- no translation found for wait_for_until_stopped_message (4964287657737020726) -->
-    <skip />
+    <string name="max_user_limit_reached_message" msgid="1445188223628919167">"Ungengeza ukufika kumaphrofayela angu-<xliff:g id="USER_LIMIT">%d</xliff:g>."</string>
+    <string name="confirm_add_user_title" msgid="75853419607883551">"Engeza iphrofayela entsha?"</string>
+    <string name="already_logged_in_message" msgid="3657131706472825219">"Ukuqhubeka, u-<xliff:g id="USER_NAME">%1$s</xliff:g> kumele aphume kusikrini se-<xliff:g id="SEAT_LOCATION">%2$s</xliff:g>"</string>
+    <string name="header_bar_text_in_logged_out_state" msgid="3903097856063608991">"Khetha iphrofayela ukuze uqale"</string>
+    <string name="logged_in_text" msgid="742324514947999718">"Ungene ngemvume"</string>
+    <string name="prefix_logged_in_info_for_other_seat" msgid="7438545665671460955">"Ungene ngemvume esikrinini se-<xliff:g id="SEAT_LOCATION">%s</xliff:g>"</string>
+    <string name="create_user_failed_message" msgid="4539847475822170735">"Ayikwazi ukwengeza iphrofayela entsha. Zama futhi ngemuva kwesikhathi."</string>
+    <string name="guest_creation_failed_message" msgid="8198126434029601949">"Ayikwazi ukuqalisa iphrofayela yesivakashi. Zama futhi ngemuva kwesikhathi."</string>
+    <string name="stopping_user_text" msgid="4946464635279894684">"Iphuma ngemvume…"</string>
+    <string name="wait_for_until_stopped_message" msgid="4964287657737020726">"U-<xliff:g id="USER_NAME">%s</xliff:g> ukhishiwe. Zama futhi ngemuva kwesikhathi."</string>
     <string name="seat_driver" msgid="4502591979520445677">"umshayeli"</string>
     <string name="seat_front" msgid="836133281052793377">"phambili"</string>
     <string name="seat_rear" msgid="403133444964528577">"ingemuva"</string>
@@ -130,10 +120,12 @@
     <string name="keyguard_enter_your_pin" msgid="141736439348916894"></string>
     <string name="keyguard_enter_your_pattern" msgid="4004401928097798697"></string>
     <string name="keyguard_enter_your_password" msgid="1345546935461513721"></string>
-    <!-- no translation found for car_keyguard_enter_your_pin (6306637610891409860) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_pattern (7314854851472119334) -->
-    <skip />
-    <!-- no translation found for car_keyguard_enter_your_password (2084173625085820354) -->
-    <skip />
+    <string name="car_keyguard_enter_your_pin" msgid="6306637610891409860">"Faka Iphinikhodi yakho"</string>
+    <string name="car_keyguard_enter_your_pattern" msgid="7314854851472119334">"Faka iphethini yakho"</string>
+    <string name="car_keyguard_enter_your_password" msgid="2084173625085820354">"Faka iphasiwedi yakho"</string>
+    <string name="backspace_key" msgid="5570862528655375412">"Ukhiye we-backspace"</string>
+    <string name="enter_key" msgid="747962923921283095">"Ukhiye we-enter"</string>
+    <string name="user_tos_activity_intent" msgid="6076292178025090081">"inhloso:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end"</string>
+    <string name="back_btn" msgid="7774349944465667391">"Emuva"</string>
+    <string name="fullscreen" msgid="7648956467442135844">"Isikrini Esigcwele"</string>
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 59ffd6f3..dac6c34f 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -22,4 +22,10 @@
         <item>@drawable/ic_seat_heat_level_2</item>
         <item>@drawable/ic_seat_heat_level_3</item>
     </array>
-</resources>
-\ No newline at end of file
+
+    <!-- Different colors to indicate different temperature levels. The upper bound for each color
+    is defined in integers.xml (see hvac_temperature_control_levels). -->
+    <array name="hvac_temperature_level_backgrounds">
+        <item>@color/car_primary</item>
+    </array>
+</resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index e2a3819f..9790c113 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -97,12 +97,9 @@
         <attr name="hvacTempFormat" format="string"/>
         <attr name="hvacToggleOnButtonDrawable" format="reference"/>
         <attr name="hvacToggleOffButtonDrawable" format="reference"/>
-        <!-- Whether the given HvacView must be turned off if the HVAC power is off.
-               Defaults to true. -->
-        <attr name="hvacTurnOffIfPowerOff" format="boolean" />
         <!-- Whether the given HvacView must be turned off if the HVAC Auto mode is on.
                Defaults to false. -->
-        <attr name="hvacTurnOffIfAutoOn" format="boolean" />
+        <attr name="hvacDisableViewIfAutoOn" format="boolean" />
     </declare-styleable>
 
     <declare-styleable name="HvacIntegerToggleButton">
@@ -169,4 +166,18 @@
         <attr name="showAsDropDown" format="boolean"/>
         <attr name="panelGravity" format="integer"/>
     </declare-styleable>
+
+    <declare-styleable name="PinPadView">
+        <attr name="layout" format="reference"/>
+    </declare-styleable>
+
+    <!-- Attributes used for showing displaycompat toolbar on system bars. -->
+    <declare-styleable name="CarDisplayCompatSystemBarView">
+        <attr name="default_layout" format="reference"/>
+        <attr name="displaycompat_layout" format="reference"/>
+        <attr name="displaycompat_side" format="integer">
+            <enum name="left" value="1"/>
+            <enum name="right" value="2"/>
+        </attr>
+    </declare-styleable>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 9afc14bf..d99640ef 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -16,42 +16,36 @@
   -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- colors for user switcher -->
-    <color name="car_user_switcher_background_color">@*android:color/car_background</color>
-    <color name="car_user_switcher_name_text_color">@*android:color/car_body1_light</color>
-    <color name="car_user_switcher_add_user_background_color">#202124</color>
-    <color name="car_user_switcher_add_user_add_sign_color">#DADCE0</color>
-    <color name="car_managed_device_icon_color">@android:color/white</color>
-    <color name="car_nav_icon_fill_color">#8F8F8F</color>
-    <color name="car_nav_icon_fill_color_selected">#ffffff</color>
-    <!-- colors for seekbar -->
-    <color name="car_seekbar_track_background">#131315</color>
-    <color name="car_seekbar_track_secondary_progress">@*android:color/car_accent</color>
+    <color name="car_user_switcher_background_color">@color/car_background</color>
+    <color name="car_user_switcher_name_text_color">@color/car_on_surface</color>
+    <color name="car_user_switcher_add_user_background_color">@color/car_surface_variant</color>
+    <color name="car_user_switcher_add_user_add_sign_color">@color/car_on_surface_variant</color>
+    <color name="car_managed_device_icon_color">@color/car_on_background</color>
     <!-- colors for volume dialog tint -->
-    <color name="car_volume_dialog_tint">@*android:color/car_tint</color>
+    <color name="car_volume_dialog_tint">@color/car_on_surface</color>
 
-    <color name="docked_divider_background">@*android:color/car_grey_50</color>
-    <color name="system_bar_background_opaque">#ff172026</color>
+    <color name="docked_divider_background">@color/car_on_background</color>
+    <color name="system_bar_background_opaque">@color/car_background</color>
 
     <!-- colors for status bar -->
-    <color name="system_bar_background_pill_color">#282A2D</color>
-    <color name="privacy_chip_indicator_color">#66BB6A</color>
-    <color name="privacy_chip_dark_icon_color">#000000</color>
+    <color name="system_bar_background_pill_color">@color/car_surface_3</color>
+    <color name="privacy_chip_indicator_color">@color/car_green_tint</color>
+    <color name="privacy_chip_dark_icon_color">@color/car_on_surface</color>
     <color name="privacy_chip_light_icon_color">@color/car_nav_icon_fill_color_selected</color>
-    <color name="privacy_chip_indicator_outside_stroke_color">#000000</color>
-    <color name="system_bar_icon_color">#FFFFFF</color>
-    <color name="system_bar_icon_selected_color">#000000</color>
-    <color name="system_bar_text_color">#FFFFFF</color>
-    <color name="system_bar_text_selected_color">#000000</color>
-    <color name="system_bar_text_unavailable_color">#B0B0B0</color>
-    <drawable name="system_bar_background">#000000</drawable>
+    <color name="privacy_chip_indicator_outside_stroke_color">@android:color/black</color>
+    <color name="system_bar_icon_color">@android:color/white</color>
+    <color name="system_bar_icon_selected_color">@color/car_on_primary</color>
+    <color name="system_bar_text_color">@color/car_on_background</color>
+    <color name="system_bar_text_selected_color">@color/car_on_primary</color>
+    <drawable name="system_bar_background">@android:color/black</drawable>
+
+    <!-- colors for nav bar -->
+    <color name="car_nav_icon_fill_color">@color/car_on_surface</color>
+    <color name="car_nav_icon_background_color">@color/car_surface</color>
+    <color name="car_nav_icon_background_color_selected">@color/car_primary</color>
 
     <!-- colors for quick controls entry points icon   -->
-    <color name="car_quick_controls_icon_drawable_color">#FFFFFF</color>
-
-    <!-- colors for hvac temperature view -->
-    <color name="hvac_temperature_adjust_button_color">#3C4043</color>
-    <color name="hvac_temperature_decrease_arrow_color">#8AB4F8</color>
-    <color name="hvac_temperature_increase_arrow_color">#F28B82</color>
+    <color name="car_quick_controls_icon_drawable_color">@color/car_on_surface</color>
 
     <!-- The background color of the notification shade -->
     <color name="notification_shade_background_color">#D6000000</color>
@@ -63,56 +57,45 @@
     <color name="notification_divider_color">@*android:color/notification_action_list</color>
 
     <!-- The color for the unseen indicator. -->
-    <color name="car_nav_unseen_indicator_color">#e25142</color>
+    <color name="car_nav_unseen_indicator_color">@color/car_icon_indicator_color</color>
 
     <!-- The color of the ripples on the untinted notifications -->
-    <color name="notification_ripple_untinted_color">?android:attr/colorControlHighlight</color>
+    <color name="notification_ripple_untinted_color">@color/car_control_highlight</color>
 
     <!-- The color of the notification handle bar -->
-    <color name="notification_handle_bar_color">#B8FFFFFF</color>
+    <color name="notification_handle_bar_color">@color/car_surface_variant</color>
 
     <color name="keyguard_keypad_image_color">@android:color/white</color>
 
-    <color name="list_divider_color">@*android:color/car_list_divider_light</color>
-    <color name="car_volume_item_divider_color">@*android:color/car_list_divider</color>
-    <color name="car_volume_item_background_color">@*android:color/car_card_dark</color>
+    <color name="list_divider_color">@color/car_outline</color>
+    <color name="car_volume_item_divider_color">@color/car_outline</color>
+    <color name="car_volume_item_background_color">@color/car_surface</color>
 
-    <color name="car_user_switching_dialog_background_color">@android:color/black</color>
-    <color name="car_user_switching_dialog_loading_text_color">@*android:color/car_body1</color>
+    <color name="car_user_switching_dialog_background_color">@color/car_surface</color>
+    <color name="car_user_switching_dialog_loading_text_color">@color/car_on_surface</color>
 
     <!-- colors for the HVAC application. -->
 
-    <color name="hvac_panel_handle_bar_color">#B8FFFFFF</color>
-
-    <!-- Different colors to indicate different temperature levels. The upper bound for each color
-    is defined in integers.xml (see hvac_temperature_control_levels). -->
-    <string-array name="hvac_temperature_level_backgrounds">
-        <item>#00AFFF</item>
-        <item>#7AA9F6</item>
-        <item>#F4F4F4</item>
-        <item>#FFD63F</item>
-        <item>#FF5151</item>
-    </string-array>
-
-    <color name="hvac_module_background_color">#99222B31</color>
-
-    <color name="hvac_icon_color">#F5F5F5</color>
-    <color name="hvac_master_switch_color">#000000</color>
-    <color name="hvac_background_color">#FF172026</color>
-    <color name="hvac_temperature_floating_text_color">#9FA2A5</color>
-    <color name="hvac_temperature_off_text_bg_color">#9FA2A5</color>
-    <color name="hvac_fanspeed_bg_color">#141C21</color>
-    <color name="hvac_fanspeed_segment_color">#7FCAC3</color>
-    <color name="hvac_seat_heat_level_drawable_fill_color">#222B31</color>
-    <color name="hvac_temperature_control_icon_fill_color">#000000</color>
-    <color name="hvac_fanspeed_off_enabled_bg">#F5F6F5</color>
-    <color name="hvac_fanspeed_off_enabled_text_color">#13181C</color>
-    <color name="hvac_fanspeed_off_disabled_text_color">#89F5F5F5</color>
-    <color name="hvac_fan_drawable_fill_color">#F5F5F5</color>
-    <color name="hvac_fanspeed_off_active_bg">#F5F6F5</color>
-    <color name="hvac_fanspeed_off_active_text_color">#13181C</color>
-    <color name="hvac_fanspeed_off_inactive_text_color">#89F5F5F5</color>
-    <color name="hvac_scrim_color">#3F000000</color>
+    <color name="hvac_panel_handle_bar_color">@color/car_surface_variant</color>
+
+    <color name="hvac_module_background_color">@color/car_secondary_container</color>
+
+    <color name="hvac_icon_color">@color/car_on_secondary_container</color>
+    <color name="hvac_master_switch_color">@color/hvac_icon_color</color>
+    <color name="hvac_icon_off_foreground_color">@color/car_on_secondary_container</color>
+    <color name="hvac_icon_on_foreground_color">@color/car_on_primary</color>
+    <color name="hvac_icon_on_background_color">@color/car_primary</color>
+    <color name="hvac_background_color">@color/car_background</color>
+    <color name="hvac_temperature_default_bg_color">@color/car_error</color>
+    <color name="hvac_temperature_off_text_bg_color">@color/car_primary</color>
+    <color name="hvac_fanspeed_bg_color">@color/car_surface</color>
+    <color name="hvac_fanspeed_segment_color">@color/car_primary</color>
+    <color name="hvac_seat_heat_level_drawable_off_fill_color">@color/car_surface_2</color>
+    <color name="hvac_seat_heat_level_drawable_on_fill_color">@color/car_primary</color>
+    <color name="hvac_temperature_control_icon_fill_color">@color/car_on_primary</color>
+    <color name="hvac_fanspeed_off_active_bg">@color/car_primary</color>
+    <color name="hvac_fanspeed_off_active_text_color">@color/car_on_primary</color> <!-- TODO: CHANGE -->
+    <color name="hvac_fanspeed_off_inactive_text_color">@color/car_secondary</color> <!-- TODO: CHANGE -->
 
     <!-- Semi-transparent background color of blocking activity. -->
     <color name="activity_blocking_activity_background">#c7000000</color>
@@ -125,33 +108,35 @@
     <color name="ic_ux_restricted_color">@android:color/white</color>
 
     <!-- Color for status icon panel background. -->
-    <color name="status_icon_panel_bg_color">#282A2D</color>
+    <color name="status_icon_panel_bg_color">@color/car_background</color>
 
     <!-- Color for highlighting the status icon button that is currently selected. -->
-    <color name="status_icon_selected_button_color">#66B5FF</color>
+    <color name="status_icon_selected_button_color">@color/car_primary</color>
     <!-- Color for status icon that is currently highlighted. -->
-    <color name="status_icon_highlighted_color">#000000</color>
+    <color name="status_icon_highlighted_color">@color/car_on_primary</color>
     <!-- Color for status icon that is not highlighted. -->
-    <color name="status_icon_not_highlighted_color">#FFFFFF</color>
+    <color name="status_icon_not_highlighted_color">@color/car_on_surface</color>
 
     <!-- Color for clock text -->
-    <color name="system_bar_clock_text_color">@*android:color/car_headline3</color>
+    <color name="system_bar_clock_text_color">@color/car_on_surface</color>
 
     <!-- Colors for display input lock icon and text -->
     <color name="display_input_lock_icon_color">@android:color/white</color>
     <color name="display_input_lock_background_color">@*android:color/car_grey_868</color>
 
     <!-- Color for user picker -->
-    <color name="user_picker_background_color">#000000</color>
-    <color name="user_picker_bottom_bar_color">@color/user_picker_background_color</color>
-    <color name="user_picker_snack_bar_transparent_color">#FFFFFF</color>
-    <color name="user_picker_snack_bar_background_color">#282a2d</color>
-    <color name="user_picker_user_name_color">#fff8f9fa</color>
-    <color name="user_picker_current_login_state_color">@*android:color/car_accent</color>
-    <color name="user_picker_other_login_state_color">#fff8f9fa</color>
-    <color name="user_picker_background_pill_color">#282A2D</color>
+    <color name="user_picker_bottom_bar_color">@android:color/black</color>
+    <color name="user_picker_snack_bar_transparent_color">@android:color/white</color>
+    <color name="user_picker_snack_bar_background_color">@color/car_surface_3</color>
+    <color name="user_picker_user_name_color">@color/car_on_background</color>
+    <color name="user_picker_current_login_state_color">@color/car_primary</color>
+    <color name="user_picker_other_login_state_color">@color/car_on_background</color>
+    <color name="user_picker_background_pill_color">@color/car_surface_3</color>
     <drawable name="user_picker_splash_icon">@android:color/transparent</drawable>
 
     <!-- Color for button background in the quick controls panel. -->
-    <color name="car_quick_controls_button_background_pill_color">#3C4043</color>
+    <color name="car_quick_controls_pill_button_background_color">@color/car_surface_5</color>
+
+    <!-- Color for PIN Pad icon.-->
+    <color name="pin_pad_icon_color">@color/car_ui_text_color_primary</color>
 </resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index f1776861..b2481bdd 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -241,4 +241,14 @@
     <string name="system_bar_app_drawer_intent" translatable="false">intent:#Intent;action=com.android.car.carlauncher.ACTION_APP_GRID;package=com.android.car.carlauncher;launchFlags=0x24000000;end</string>
     <!-- Determines whether Recents entry point should be shown / should trigger to open Recents -->
     <bool name="config_enableRecentsEntryPoint">true</bool>
+
+    <!-- set to false to use the default TaskDisplayArea -->
+    <!-- TODO(b/300930725): launcher doesn't show until it's restarted -->
+    <bool name="config_useRemoteLaunchTaskView">false</bool>
+
+    <!-- Determines which system bar to use for display compat toolbar. -->
+    <!-- 0 disabled -->
+    <!-- 1 left -->
+    <!-- 2 right -->
+    <integer name="config_showDisplayCompatToolbarOnSystemBar">0</integer>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 11649d44..22fd2b4b 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -55,7 +55,8 @@
     <!-- Padding of user icon and text -->
     <dimen name="system_bar_user_icon_padding">8dp</dimen>
     <!-- User icon size -->
-    <dimen name="system_bar_user_icon_drawing_size">36dp</dimen>
+    <dimen name="system_bar_user_icon_width">23dp</dimen>
+    <dimen name="system_bar_user_icon_height">22dp</dimen>
     <!-- Padding on either side of the group of all system bar buttons -->
     <dimen name="system_bar_button_group_padding">64dp</dimen>
     <dimen name="system_bar_icon_drawing_size">44dp</dimen>
@@ -65,7 +66,9 @@
     <!-- Padding between the system bar button and the icon within it -->
     <dimen name="system_bar_button_padding">16dp</dimen>
     <!-- Radius for system bar pill buttons -->
-    <dimen name="system_bar_pill_radius">30dp</dimen>
+    <dimen name="system_bar_pill_radius">100dp</dimen>
+    <!-- Radius for system bar pill buttons when selected -->
+    <dimen name="system_bar_pill_selected_radius">16dp</dimen>
 
     <!-- The amount by which to scale up the status bar icons. -->
     <item name="status_bar_icon_scale_factor" format="float" type="dimen">1.75</item>
@@ -73,10 +76,13 @@
     <dimen name="car_primary_icon_size">@*android:dimen/car_primary_icon_size</dimen>
 
     <dimen name="hvac_container_padding">16dp</dimen>
+    <dimen name="hvac_panel_background_radius">48dp</dimen>
     <dimen name="hvac_temperature_bar_margin">32dp</dimen>
-    <dimen name="hvac_temperature_text_size">56sp</dimen>
-    <dimen name="hvac_temperature_text_padding">8dp</dimen>
-    <dimen name="hvac_temperature_button_size">76dp</dimen>
+    <dimen name="hvac_temperature_text_size">44sp</dimen>
+    <dimen name="hvac_temperature_text_padding">10dp</dimen>
+    <dimen name="hvac_temperature_button_size">52dp</dimen>
+    <dimen name="hvac_temperature_icon_size">36dp</dimen>
+    <dimen name="hvac_temperature_button_padding">12dp</dimen>
     <!--These values represent MIN and MAX for hvac-->
     <item name="hvac_min_value_celsius" format="float" type="dimen">16</item>
     <item name="hvac_max_value_celsius" format="float" type="dimen">28</item>
@@ -111,17 +117,19 @@
     <!-- Height of icons in Privacy chip dialog. Both App Op icon and application icon -->
     <dimen name="privacy_chip_dialog_icon_height">48dp</dimen>
     <!-- Icon size for Privacy chip -->
-    <dimen name="privacy_chip_icon_size">32dp</dimen>
+    <dimen name="privacy_chip_icon_size">30dp</dimen>
     <!-- Background width for Privacy chip -->
-    <dimen name="privacy_chip_width">76dp</dimen>
+    <dimen name="privacy_chip_width">56dp</dimen>
     <!-- Margin between icons of Privacy chip -->
     <dimen name="privacy_chip_icon_margin">2dp</dimen>
     <!-- Diameter of indicator circle in privacy chip animation -->
-    <dimen name="privacy_chip_indicator_circle_diameter">21.5dp</dimen>
+    <dimen name="privacy_chip_indicator_circle_diameter">16dp</dimen>
     <!-- Width of privacy chip qc panel -->
     <dimen name="car_sensor_qc_panel_width">800dp</dimen>
     <!-- Privacy chip horizontal padding -->
     <dimen name="privacy_chip_horizontal_padding">@dimen/car_padding_3</dimen>
+    <!-- Privacy chip vertical padding -->
+    <dimen name="privacy_chip_vertical_padding">10dp</dimen>
     <!-- Outside stroke width for Privacy chip -->
     <dimen name="privacy_chip_indicator_outside_stroke_width">4dp</dimen>
 
@@ -222,6 +230,7 @@
     <dimen name="car_system_bar_button_width">64dp</dimen>
     <dimen name="car_system_bar_button_icon_height">44dp</dimen>
     <dimen name="car_system_bar_width">760dp</dimen>
+    <dimen name="car_system_bar_user_name_button_height">56dp</dimen>
     <dimen name="car_system_bar_user_name_max_width">176dp</dimen>
     <dimen name="car_left_system_bar_width">96dp</dimen>
     <dimen name="car_right_system_bar_width">96dp</dimen>
@@ -231,6 +240,7 @@
     <!-- In order to change the height of the top nav bar, overlay status_bar_height in
          frameworks/base/core/res/res instead. -->
     <dimen name="car_top_system_bar_height">@*android:dimen/status_bar_height</dimen>
+    <dimen name="car_nav_buttons_margin">@*android:dimen/car_padding_3</dimen>
 
     <dimen name="car_user_switcher_container_height">420dp</dimen>
     <!-- This must be the negative of car_user_switcher_container_height for the animation. -->
@@ -244,33 +254,35 @@
 
     <!-- dimensions for Quick Controls entry points   -->
 
-    <dimen name="car_quick_controls_entry_points_button_width">82dp</dimen>
-    <dimen name="car_quick_controls_entry_points_button_margin_top">8dp</dimen>
-    <dimen name="car_quick_controls_entry_points_button_margin_bottom">8dp</dimen>
+    <dimen name="car_quick_controls_entry_points_button_width">56dp</dimen>
+    <dimen name="car_quick_controls_entry_points_button_margin_top">10dp</dimen>
+    <dimen name="car_quick_controls_entry_points_button_margin_bottom">10dp</dimen>
     <dimen name="car_quick_controls_entry_points_button_margin_start">12dp</dimen>
     <dimen name="car_quick_controls_entry_points_button_margin_end">12dp</dimen>
-    <dimen name="car_quick_controls_entry_points_icon_width">36dp</dimen>
+    <dimen name="car_quick_controls_entry_points_icon_width">30dp</dimen>
     <dimen name="car_quick_controls_entry_points_icon_space">12dp</dimen>
 
     <dimen name="car_quick_controls_icon_drawable_width">24dp</dimen>
     <dimen name="car_quick_controls_icon_drawable_height">24dp</dimen>
 
-    <dimen name="car_read_only_status_icon_width">36dp</dimen>
-    <dimen name="car_read_only_status_icon_height">36dp</dimen>
+    <dimen name="car_read_only_status_icon_width">24dp</dimen>
+    <dimen name="car_read_only_status_icon_height">24dp</dimen>
 
     <dimen name="car_status_icon_panel_default_width">800dp</dimen>
-    <dimen name="car_status_icon_panel_border_radius">12dp</dimen>
-    <dimen name="car_status_icon_panel_padding_top">12dp</dimen>
-    <dimen name="car_status_icon_panel_padding_bottom">12dp</dimen>
+    <dimen name="car_status_icon_panel_border_radius">32dp</dimen>
+    <dimen name="car_status_icon_panel_padding_top">22dp</dimen>
+    <dimen name="car_status_icon_panel_padding_bottom">32dp</dimen>
     <dimen name="car_status_icon_panel_margin_top">0dp</dimen>
     <dimen name="car_status_icon_panel_dim" format="float">0.5</dimen>
 
-    <dimen name="car_profile_quick_controls_panel_width">480dp</dimen>
+    <dimen name="car_profile_quick_controls_panel_width">550dp</dimen>
 
-    <dimen name="car_quick_controls_footer_button_vertical_margin">10dp</dimen>
-    <dimen name="car_quick_controls_footer_button_horizontal_padding">24dp</dimen>
-    <dimen name="car_quick_controls_footer_button_start_margin">8dp</dimen>
-    <dimen name="car_quick_controls_footer_button_min_height">56dp</dimen>
+    <dimen name="car_quick_controls_footer_button_margin_top">22dp</dimen>
+    <dimen name="car_quick_controls_footer_button_margin_bottom">0dp</dimen>
+    <dimen name="car_quick_controls_footer_button_horizontal_margin">33dp</dimen>
+    <dimen name="car_quick_controls_footer_button_min_height">88dp</dimen>
+
+    <dimen name="car_nav_bar_button_selected_corner_radius">24dp</dimen>
 
     <!-- dimensions for HVAC   -->
 
@@ -341,7 +353,7 @@
     <dimen name="hvac_close_button_bottom_margin">0dp</dimen>
 
     <dimen name="hvac_turned_on_alpha">1</dimen>
-    <dimen name="hvac_turned_off_alpha">0.5</dimen>
+    <dimen name="hvac_turned_off_alpha">0.4</dimen>
 
     <dimen name="hvac_icon_drawable_width">108dp</dimen>
     <dimen name="hvac_icon_drawable_height">108dp</dimen>
@@ -432,4 +444,14 @@
     <dimen name="car_quick_controls_panel_footer_button_view_padding">10dp</dimen>
 
     <dimen name="confirm_logout_dialog_dim" format="float">0.8</dimen>
+
+    <!-- Dimensions for Pin pad -->
+    <dimen name="confirm_lock_message_vertical_spacing">@*android:dimen/car_padding_2</dimen>
+    <dimen name="pin_password_entry_padding_horizontal">@*android:dimen/car_padding_2</dimen>
+    <dimen name="pin_pad_key_width">120dp</dimen>
+    <dimen name="pin_pad_key_height">80dp</dimen>
+    <dimen name="pin_pad_key_margin">12dp</dimen>
+    <dimen name="pin_pad_icon_size">@*android:dimen/car_primary_icon_size</dimen>
+
+    <dimen name="dock_container_margin">@*android:dimen/car_padding_4</dimen>
 </resources>
diff --git a/res/values/floats.xml b/res/values/floats.xml
index 80c96c66..1b929e97 100644
--- a/res/values/floats.xml
+++ b/res/values/floats.xml
@@ -24,4 +24,10 @@
 
     <!-- Disabled alpha for userpicker -->
     <item name="user_picker_disabled_alpha" format="float" type="fraction">0.72</item>
+
+    <!--
+        The amount of dimming to apply to the hvac overlay window when fully opened.
+        Range is from 1.0 for completely opaque to 0.0 for no dim.
+    -->
+    <item name="hvac_overlay_window_dim_amount" format="float" type="fraction">0.72</item>
 </resources>
diff --git a/res/values/ids.xml b/res/values/ids.xml
index 640e1311..92f05594 100644
--- a/res/values/ids.xml
+++ b/res/values/ids.xml
@@ -20,7 +20,7 @@
     <item type="id" name="lock_screen_nav_buttons"/>
     <item type="id" name="hvac_panel_close_button"/>
 
-    <!-- Values assigneed to quick control views    -->
+    <!-- Values assigned to quick control views    -->
     <item type="id" name="qc_display_status_icon"/>
     <item type="id" name="qc_bluetooth_status_icon"/>
     <item type="id" name="qc_signal_status_icon"/>
diff --git a/res/values/integers.xml b/res/values/integers.xml
index 44d598d6..4649efc6 100644
--- a/res/values/integers.xml
+++ b/res/values/integers.xml
@@ -48,16 +48,16 @@
     <integer name="hvac_seat_heat_level_count">4</integer>
     <!-- Immersive privacy indicator animation duration. -->
     <integer name="privacy_indicator_animation_duration">500</integer>
+    <!-- The minimum fan speed value.-->
+    <integer name="hvac_min_fan_speed">1</integer>
+    <!-- The maximum fan speed value. -->
+    <integer name="hvac_max_fan_speed">6</integer>
 
     <!-- The upper bounds for background colors used in Adjustable Background Temperature Control
     View. Note that these integers should be in Celsius and will be divided by 10 so that the first
     decimal can be expressed. The corresponding background color for each level is defined in
-    colors.xml (see hvac_temperature_level_backgrounds). -->
+    arrays.xml (see hvac_temperature_level_backgrounds). -->
     <integer-array name="hvac_temperature_control_levels">
-        <item>180</item>
-        <item>200</item>
-        <item>220</item>
-        <item>250</item>
-        <item>999</item>
+        <item>9999</item>
     </integer-array>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 658321bc..73a71763 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -243,4 +243,33 @@
     <!-- Instructions telling the user to enter their text password to unlock the keyguard [CHAR LIMIT=30] -->
     <string name="car_keyguard_enter_your_password">Enter your password</string>
 
+    <!-- Accessibility description for the backspace key in the PIN pad [CHAR LIMIT=NONE] -->
+    <string name="backspace_key">Backspace key</string>
+    <!-- Accessibility description for the enter key in the PIN pad [CHAR LIMIT=NONE] -->
+    <string name="enter_key">Enter key</string>
+
+    <!-- These are the digits on the PIN pad -->
+    <string name="one" translatable="false">1</string>
+    <string name="two" translatable="false">2</string>
+    <string name="three" translatable="false">3</string>
+    <string name="four" translatable="false">4</string>
+    <string name="five" translatable="false">5</string>
+    <string name="six" translatable="false">6</string>
+    <string name="seven" translatable="false">7</string>
+    <string name="eight" translatable="false">8</string>
+    <string name="nine" translatable="false">9</string>
+    <string name="zero" translatable="false">0</string>
+
+    <!-- Intent action meant to invoke user TOS flow.
+        The intent URI has to be formatted according to Intent.URI_INTENT_SCHEME
+        URI, for example should contain the intent action and any extras if necessary:
+        "intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=true;end"
+   -->
+    <string name="user_tos_activity_intent">intent:#Intent;action=com.android.car.SHOW_USER_TOS_ACTIVITY;B.show_value_prop=false;end</string>
+
+    <!-- DisplayCompat back button [CHAR LIMIT=30] -->
+    <string name="back_btn">Back</string>
+    <!-- DisplayCompat fullscreen button [CHAR LIMIT=30] -->
+    <string name="fullscreen">Full Screen</string>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 7059f60b..91774661 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -28,8 +28,9 @@
 
     <style name="TextAppearance.SystemBar.Clock"
            parent="@*android:style/TextAppearance.StatusBar.Icon">
-        <item name="android:textSize">@dimen/car_body1_size</item>
+        <item name="android:textSize">@dimen/car_body4_size</item>
         <item name="android:textColor">@color/system_bar_clock_text_color</item>
+        <item name="android:textFontWeight">500</item>
     </style>
 
     <style name="TextAppearance.SystemBar.ClockWithSelection"
@@ -62,8 +63,39 @@
         <item name="android:layout_marginEnd">@dimen/system_bar_button_margin</item>
         <item name="android:padding">@dimen/system_bar_button_padding</item>
         <item name="android:gravity">center</item>
-        <item name="android:background">@drawable/system_bar_button_background</item>
-        <item name="unselectedAlpha">0.56</item>
+        <item name="android:background">@drawable/nav_bar_button_background</item>
+        <item name="unselectedAlpha">1.0</item>
+    </style>
+
+    <!-- todo(b/304320644): update SystemBarButton -->
+    <style name="SystemBarButtonWithDock" parent="SystemBarButton">
+        <item name="android:layout_marginEnd">0dp</item>
+        <item name="android:layout_centerVertical">true</item>
+    </style>
+
+    <style name="TemperatureControlView">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_centerVertical">true</item>
+    </style>
+
+    <style name="TopBarButtonMargin">
+        <item name="android:layout_marginTop">@dimen/car_quick_controls_entry_points_button_margin_top</item>
+        <item name="android:layout_marginBottom">@dimen/car_quick_controls_entry_points_button_margin_bottom</item>
+        <item name="android:layout_marginStart">@dimen/car_quick_controls_entry_points_button_margin_start</item>
+        <item name="android:layout_marginEnd">@dimen/car_quick_controls_entry_points_button_margin_end</item>
+    </style>
+
+    <!-- todo(b/304320644): remove QuickControlEntryPointButton and use TopBarButton instead -->
+    <style name="TopBarButton" parent="TopBarButtonMargin">
+        <item name="android:background">@drawable/status_icon_background</item>
+    </style>
+
+    <style name="PrivacyChipPadding">
+        <item name="android:paddingTop">@dimen/car_quick_controls_entry_points_button_margin_top</item>
+        <item name="android:paddingBottom">@dimen/car_quick_controls_entry_points_button_margin_bottom</item>
+        <item name="android:paddingStart">@dimen/car_quick_controls_entry_points_button_margin_start</item>
+        <item name="android:paddingEnd">@dimen/car_quick_controls_entry_points_button_margin_end</item>
     </style>
 
     <style name="QuickControlEntryPointButton">
@@ -86,7 +118,7 @@
 
     <style name="HvacTemperatureFont">
         <item name="android:textSize">@dimen/temperature_bar_text_size</item>
-        <item name="android:textColor">#000000</item>
+        <item name="android:textColor">@color/car_on_primary</item>
     </style>
 
     <style name="HvacTemperature" parent="HvacTemperatureFont">
@@ -163,22 +195,22 @@
     </style>
 
     <style name="QCFooterButtonStyle"
-           parent="android:Widget.DeviceDefault.Button.Borderless.Colored">
+           parent="android:Widget.DeviceDefault.Button">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:minHeight">@dimen/car_quick_controls_footer_button_min_height</item>
-        <item name="android:gravity">start|center_vertical</item>
-        <item name="android:layout_marginVertical">
-            @dimen/car_quick_controls_footer_button_vertical_margin
+        <item name="android:gravity">center</item>
+        <item name="android:layout_marginBottom">
+            @dimen/car_quick_controls_footer_button_margin_bottom
         </item>
-        <item name="android:paddingHorizontal">
-            @dimen/car_quick_controls_footer_button_horizontal_padding
+        <item name="android:layout_marginHorizontal">
+            @dimen/car_quick_controls_footer_button_horizontal_margin
         </item>
     </style>
 
     <style name="QCFooterButtonViewStyle">
         <item name="android:minHeight">@dimen/car_quick_controls_footer_button_min_height</item>
-        <item name="android:background">@drawable/car_quick_controls_button_background_pill</item>
+        <item name="android:background">@drawable/car_quick_controls_pill_button_background</item>
         <item name="android:layout_marginStart">@dimen/car_padding_2</item>
         <item name="android:layout_marginEnd">@dimen/car_padding_2</item>
         <item name="android:padding">
@@ -207,4 +239,16 @@
         <item name="android:layout_margin">@dimen/car_padding_2</item>
         <item name="android:maxLines">2</item>
     </style>
+
+
+    <!-- Biometrics -->
+    <style name="PinPadKey">
+        <item name="android:gravity">center</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:textSize">@*android:dimen/car_body1_size</item>
+        <item name="android:textColor">@*android:color/car_body3</item>
+        <item name="android:tint">@*android:color/car_body3</item>
+        <item name="android:clickable">true</item>
+        <item name="android:background">?android:attr/selectableItemBackground</item>
+    </style>
 </resources>
diff --git a/samples/README.md b/samples/README.md
index 39102c96..58c9a79e 100644
--- a/samples/README.md
+++ b/samples/README.md
@@ -6,7 +6,15 @@ Each sample demonstrates the effects of overriding some configs in AAOS SystemUI
 
 ```bash
 # Enable RRO for the user 0
-adb shell cmd overlay enable --user 0 com.android.systemui.rro
+adb shell cmd overlay enable --user 0 com.android.systemui.rro.bottom
+adb shell cmd overlay enable --user 0 com.android.systemui.rro.bottom.rounded
+adb shell cmd overlay enable --user 0 com.android.systemui.rro.right
+adb shell cmd overlay enable --user 0 com.android.systemui.rro.left
+
+# To make system bar persistent, apply com.android.systemui.rro.persistent to both user 10 and user 0
+adbemu shell cmd overlay enable --user 0 com.android.systemui.rro.persistent
+adbemu shell cmd overlay enable --user 10 com.android.systemui.rro.persistent
+
 # Build all sample RRO's
 mmma {path to the samples directory}
 # Install one of the sample RRO's
diff --git a/samples/sample1/rro/Android.bp b/samples/SystemBarBottom/Android.bp
index afdb19e2..29b94b75 100644
--- a/samples/sample1/rro/Android.bp
+++ b/samples/SystemBarBottom/Android.bp
@@ -19,7 +19,7 @@ package {
 }
 
 android_app {
-    name: "CarSystemUISampleOneRRO",
+    name: "CarSystemUIBottomRRO",
     resource_dirs: ["res"],
     certificate: "platform",
     platform_apis: true,
diff --git a/samples/sample2/rro/AndroidManifest.xml b/samples/SystemBarBottom/AndroidManifest.xml
index 5c25056f..421f3066 100644
--- a/samples/sample2/rro/AndroidManifest.xml
+++ b/samples/SystemBarBottom/AndroidManifest.xml
@@ -15,7 +15,7 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.systemui.rro">
+          package="com.android.systemui.rro.bottom">
     <overlay
         android:targetPackage="com.android.systemui"
         android:isStatic="false"
diff --git a/samples/sample1/rro/res/drawable/car_ic_apps.xml b/samples/SystemBarBottom/res/drawable/car_ic_apps.xml
index a8d8a2f2..a8d8a2f2 100644
--- a/samples/sample1/rro/res/drawable/car_ic_apps.xml
+++ b/samples/SystemBarBottom/res/drawable/car_ic_apps.xml
diff --git a/samples/sample1/rro/res/drawable/car_ic_apps_selected.xml b/samples/SystemBarBottom/res/drawable/car_ic_apps_selected.xml
index 2a4e91aa..2a4e91aa 100644
--- a/samples/sample1/rro/res/drawable/car_ic_apps_selected.xml
+++ b/samples/SystemBarBottom/res/drawable/car_ic_apps_selected.xml
diff --git a/samples/sample1/rro/res/drawable/car_ic_music.xml b/samples/SystemBarBottom/res/drawable/car_ic_music.xml
index 6339ebb3..6339ebb3 100644
--- a/samples/sample1/rro/res/drawable/car_ic_music.xml
+++ b/samples/SystemBarBottom/res/drawable/car_ic_music.xml
diff --git a/samples/sample1/rro/res/drawable/car_ic_music_selected.xml b/samples/SystemBarBottom/res/drawable/car_ic_music_selected.xml
index a56bcb38..a56bcb38 100644
--- a/samples/sample1/rro/res/drawable/car_ic_music_selected.xml
+++ b/samples/SystemBarBottom/res/drawable/car_ic_music_selected.xml
diff --git a/samples/sample1/rro/res/drawable/car_ic_navigation.xml b/samples/SystemBarBottom/res/drawable/car_ic_navigation.xml
index e1fabe07..e1fabe07 100644
--- a/samples/sample1/rro/res/drawable/car_ic_navigation.xml
+++ b/samples/SystemBarBottom/res/drawable/car_ic_navigation.xml
diff --git a/samples/sample1/rro/res/drawable/car_ic_navigation_selected.xml b/samples/SystemBarBottom/res/drawable/car_ic_navigation_selected.xml
index d11cf28f..d11cf28f 100644
--- a/samples/sample1/rro/res/drawable/car_ic_navigation_selected.xml
+++ b/samples/SystemBarBottom/res/drawable/car_ic_navigation_selected.xml
diff --git a/samples/sample1/rro/res/drawable/car_ic_overview.xml b/samples/SystemBarBottom/res/drawable/car_ic_overview.xml
index f185eb9a..d2190d7c 100644
--- a/samples/sample1/rro/res/drawable/car_ic_overview.xml
+++ b/samples/SystemBarBottom/res/drawable/car_ic_overview.xml
@@ -15,12 +15,13 @@
   ~ limitations under the License
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:viewportWidth="44"
-    android:viewportHeight="44"
-    android:width="44dp"
-    android:height="44dp">
+    android:width="56dp"
+    android:height="56dp"
+    android:viewportWidth="56"
+    android:viewportHeight="56">
     <path
-        android:pathData="M36.92857 22.39286A14.53571 14.53571 0 0 1 7.857143 22.39286A14.53571 14.53571 0 0 1 36.92857 22.39286Z"
-        android:strokeColor="@color/car_nav_icon_fill_color"
-        android:strokeWidth="4" />
+        android:pathData="M9.333,21L28,7L46.667,21V49H9.333V21ZM35,44.333H42V23.333L28,12.833L14,23.333V44.333H21V30.333H35V44.333Z"
+        android:fillColor="@color/car_nav_icon_fill_color"
+        android:fillType="evenOdd"
+       />
 </vector>
 \ No newline at end of file
diff --git a/samples/sample1/rro/res/drawable/car_ic_overview_selected.xml b/samples/SystemBarBottom/res/drawable/car_ic_overview_selected.xml
index 19b55836..bcfbc149 100644
--- a/samples/sample1/rro/res/drawable/car_ic_overview_selected.xml
+++ b/samples/SystemBarBottom/res/drawable/car_ic_overview_selected.xml
@@ -15,12 +15,13 @@
   ~ limitations under the License
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:viewportWidth="44"
-        android:viewportHeight="44"
-        android:width="44dp"
-        android:height="44dp">
+    android:width="56dp"
+    android:height="56dp"
+    android:viewportWidth="56"
+    android:viewportHeight="56">
     <path
-        android:pathData="M36.92857 22.39286A14.53571 14.53571 0 0 1 7.857143 22.39286A14.53571 14.53571 0 0 1 36.92857 22.39286Z"
-        android:strokeColor="@color/car_nav_icon_fill_color_selected"
-        android:strokeWidth="4" />
+        android:pathData="M9.333,21L28,7L46.667,21V49H9.333V21ZM35,44.333H42V23.333L28,12.833L14,23.333V44.333H21V30.333H35V44.333Z"
+        android:fillColor="@color/car_nav_icon_fill_color_selected"
+        android:fillType="evenOdd"
+       />
 </vector>
 \ No newline at end of file
diff --git a/samples/sample1/rro/res/drawable/car_ic_phone.xml b/samples/SystemBarBottom/res/drawable/car_ic_phone.xml
index 50e36b5a..50e36b5a 100644
--- a/samples/sample1/rro/res/drawable/car_ic_phone.xml
+++ b/samples/SystemBarBottom/res/drawable/car_ic_phone.xml
diff --git a/samples/sample1/rro/res/drawable/car_ic_phone_selected.xml b/samples/SystemBarBottom/res/drawable/car_ic_phone_selected.xml
index 11b1687c..11b1687c 100644
--- a/samples/sample1/rro/res/drawable/car_ic_phone_selected.xml
+++ b/samples/SystemBarBottom/res/drawable/car_ic_phone_selected.xml
diff --git a/samples/SystemBarBottom/res/layout/car_bottom_system_bar.xml b/samples/SystemBarBottom/res/layout/car_bottom_system_bar.xml
new file mode 100644
index 00000000..f1253eb0
--- /dev/null
+++ b/samples/SystemBarBottom/res/layout/car_bottom_system_bar.xml
@@ -0,0 +1,125 @@
+<?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.
+  -->
+<com.android.systemui.car.systembar.CarSystemBarView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:systemui="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:weightSum="3"
+    android:layoutDirection="ltr"
+    android:orientation="horizontal">
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="left"
+        android:paddingEnd="20dp"
+        android:layout_weight="1"
+        android:layoutDirection="ltr">
+        <com.android.systemui.car.systembar.CarSystemBarButton
+            android:id="@+id/home"
+            android:contentDescription="@string/system_bar_home_label"
+            style="@style/SystemBarButton"
+            systemui:componentNames="com.android.car.carlauncher/.CarLauncher"
+            systemui:icon="@drawable/car_ic_overview"
+            systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;launchFlags=0x14000000;end"
+            systemui:selectedIcon="@drawable/car_ic_overview_selected"
+            systemui:highlightWhenSelected="true"/>
+
+        <com.android.systemui.car.systembar.CarSystemBarButton
+            android:id="@+id/grid_nav"
+            android:contentDescription="@string/system_bar_applications_label"
+            style="@style/SystemBarButton"
+            systemui:componentNames="@string/config_appGridComponentName"
+            systemui:icon="@drawable/car_ic_apps"
+            systemui:intent="intent:#Intent;action=com.android.car.carlauncher.ACTION_APP_GRID;package=com.android.car.carlauncher;launchFlags=0x24000000;end"
+            systemui:selectedIcon="@drawable/car_ic_apps_selected"
+            systemui:highlightWhenSelected="true"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/nav_buttons"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingStart="20dp"
+        android:layoutDirection="ltr"
+        android:layout_weight="1">
+
+        <com.android.systemui.car.systembar.CarSystemBarButton
+            android:id="@+id/maps_nav"
+            android:contentDescription="@string/system_bar_maps_label"
+            style="@style/SystemBarButton"
+            systemui:categories="android.intent.category.APP_MAPS"
+            systemui:icon="@drawable/car_ic_navigation"
+            systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MAPS;launchFlags=0x14000000;end"
+            systemui:selectedIcon="@drawable/car_ic_navigation_selected"
+            systemui:highlightWhenSelected="true"/>
+
+        <com.android.systemui.car.systembar.CarSystemBarButton
+            android:id="@+id/music_nav"
+            android:contentDescription="@string/system_bar_media_label"
+            style="@style/SystemBarButton"
+            systemui:categories="android.intent.category.APP_MUSIC"
+            systemui:icon="@drawable/car_ic_music"
+            systemui:intent="intent:#Intent;action=android.car.intent.action.MEDIA_TEMPLATE;launchFlags=0x10000000;end"
+            systemui:packages="com.android.car.media"
+            systemui:selectedIcon="@drawable/car_ic_music_selected"
+            systemui:highlightWhenSelected="true"/>
+
+        <com.android.systemui.car.systembar.CarSystemBarButton
+            android:id="@+id/phone_nav"
+            android:contentDescription="@string/system_bar_phone_label"
+            style="@style/SystemBarButton"
+            systemui:icon="@drawable/car_ic_phone"
+            systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.LAUNCHER;package=com.android.car.dialer;launchFlags=0x10000000;end"
+            systemui:packages="com.android.car.dialer"
+            systemui:selectedIcon="@drawable/car_ic_phone_selected"
+            systemui:highlightWhenSelected="true"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/status_icons"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="right"
+        android:paddingEnd="20dp"
+        android:layoutDirection="ltr"
+        android:layout_weight="1">
+      <LinearLayout
+            android:id="@+id/qc_entry_points_container"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_centerVertical="true"
+            android:layout_alignParentStart="true"
+        />
+        <FrameLayout
+            android:id="@+id/clock_container"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+
+            android:layout_centerInParent="true">
+            <com.android.systemui.statusbar.policy.Clock
+                android:id="@+id/clock"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:elevation="5dp"
+                android:singleLine="true"
+            />
+        </FrameLayout>
+    </LinearLayout>
+</com.android.systemui.car.systembar.CarSystemBarView>
diff --git a/samples/sample1/rro/res/layout/system_icons.xml b/samples/SystemBarBottom/res/layout/system_icons.xml
index d2357929..d2357929 100644
--- a/samples/sample1/rro/res/layout/system_icons.xml
+++ b/samples/SystemBarBottom/res/layout/system_icons.xml
diff --git a/samples/sample1/rro/res/values/attrs.xml b/samples/SystemBarBottom/res/values/attrs.xml
index e02f9e6e..e02f9e6e 100644
--- a/samples/sample1/rro/res/values/attrs.xml
+++ b/samples/SystemBarBottom/res/values/attrs.xml
diff --git a/samples/sample1/rro/res/values/colors.xml b/samples/SystemBarBottom/res/values/colors.xml
index c32d6386..c32d6386 100644
--- a/samples/sample1/rro/res/values/colors.xml
+++ b/samples/SystemBarBottom/res/values/colors.xml
diff --git a/samples/sample1/rro/res/values/config.xml b/samples/SystemBarBottom/res/values/config.xml
index bfb8ad13..c30d1e0c 100644
--- a/samples/sample1/rro/res/values/config.xml
+++ b/samples/SystemBarBottom/res/values/config.xml
@@ -19,7 +19,7 @@
     <!-- Configure which system bars should be displayed. -->
     <bool name="config_enableTopSystemBar">false</bool>
     <bool name="config_enableLeftSystemBar">false</bool>
-    <bool name="config_enableRightSystemBar">true</bool>
+    <bool name="config_enableRightSystemBar">false</bool>
     <bool name="config_enableBottomSystemBar">true</bool>
 
     <!-- Configure the type of each system bar. Each system bar must have a unique type. -->
@@ -42,7 +42,7 @@
     <!-- NOTE: If the z-order of a bar is 10 or above, it will also appear on top of HUN's.    -->
     <integer name="config_topSystemBarZOrder">0</integer>
     <integer name="config_leftSystemBarZOrder">0</integer>
-    <integer name="config_rightSystemBarZOrder">11</integer>
+    <integer name="config_rightSystemBarZOrder">0</integer>
     <integer name="config_bottomSystemBarZOrder">10</integer>
 
     <!-- Whether heads-up notifications should be shown on the bottom. If false, heads-up
@@ -59,4 +59,9 @@
     <!-- Specifies the component name of the app grid activity -->
     <string name="config_appGridComponentName" translatable="false">
         com.android.car.carlauncher/.AppGridActivity</string>
+
+     <string-array name="config_quickControlsEntryPointIconControllers" translatable="false">
+        <item>com.android.systemui.car.statusicon.ui.SignalStatusIconController</item>
+        <item>com.android.systemui.car.statusicon.ui.DisplayStatusIconController</item>
+     </string-array>
 </resources>
 \ No newline at end of file
diff --git a/samples/sample1/rro/res/values/dimens.xml b/samples/SystemBarBottom/res/values/dimens.xml
index 1e872a16..1e872a16 100644
--- a/samples/sample1/rro/res/values/dimens.xml
+++ b/samples/SystemBarBottom/res/values/dimens.xml
diff --git a/samples/sample1/rro/res/values/strings.xml b/samples/SystemBarBottom/res/values/strings.xml
index 99ec9284..99ec9284 100644
--- a/samples/sample1/rro/res/values/strings.xml
+++ b/samples/SystemBarBottom/res/values/strings.xml
diff --git a/samples/sample1/rro/res/values/styles.xml b/samples/SystemBarBottom/res/values/styles.xml
index 343cd5ba..343cd5ba 100644
--- a/samples/sample1/rro/res/values/styles.xml
+++ b/samples/SystemBarBottom/res/values/styles.xml
diff --git a/samples/sample1/rro/res/xml/car_sysui_overlays.xml b/samples/SystemBarBottom/res/xml/car_sysui_overlays.xml
index f79708a3..fa40ba4e 100644
--- a/samples/sample1/rro/res/xml/car_sysui_overlays.xml
+++ b/samples/SystemBarBottom/res/xml/car_sysui_overlays.xml
@@ -18,9 +18,10 @@
 <overlay>
     <item target="layout/car_bottom_system_bar" value="@layout/car_bottom_system_bar"/>
     <item target="layout/system_icons" value="@layout/system_icons"/>
-    <item target="layout/car_right_system_bar" value="@layout/car_right_system_bar"/>
     <item target="string/config_appGridComponentName" value="@string/config_appGridComponentName"/>
 
+    <item target="array/config_quickControlsEntryPointIconControllers" value="@array/config_quickControlsEntryPointIconControllers"/>
+
     <item target="attr/icon" value="@attr/icon"/>
     <item target="attr/selectedIcon" value="@attr/selectedIcon"/>
     <item target="attr/intent" value="@attr/intent"/>
@@ -74,4 +75,5 @@
     <item target="integer/config_bottomSystemBarZOrder" value="@integer/config_bottomSystemBarZOrder"/>
 
     <item target="string/config_notificationPanelViewMediator" value="@string/config_notificationPanelViewMediator"/>
+    <item target="id/qc_entry_points_container" value="@id/qc_entry_points_container"/>
 </overlay>
 \ No newline at end of file
diff --git a/samples/SystemBarBottomRounded/Android.bp b/samples/SystemBarBottomRounded/Android.bp
new file mode 100644
index 00000000..656ff209
--- /dev/null
+++ b/samples/SystemBarBottomRounded/Android.bp
@@ -0,0 +1,31 @@
+//
+// 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_app {
+    name: "CarSystemUIBottomRoundedRRO",
+    resource_dirs: ["res"],
+    certificate: "platform",
+    platform_apis: true,
+    manifest: "AndroidManifest.xml",
+    aaptflags: [
+        "--no-resource-deduping",
+        "--no-resource-removal",
+     ]
+}
diff --git a/samples/SystemBarBottomRounded/AndroidManifest.xml b/samples/SystemBarBottomRounded/AndroidManifest.xml
new file mode 100644
index 00000000..1adcb8b0
--- /dev/null
+++ b/samples/SystemBarBottomRounded/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<!--
+  ~ 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.systemui.rro.bottom.rounded">
+    <overlay
+        android:targetPackage="com.android.systemui"
+        android:isStatic="false"
+        android:resourcesMap="@xml/car_sysui_overlays"
+    />
+</manifest>
+\ No newline at end of file
diff --git a/samples/sample2/rro/res/drawable/car_ic_apps.xml b/samples/SystemBarBottomRounded/res/drawable/car_ic_apps.xml
index a8d8a2f2..a8d8a2f2 100644
--- a/samples/sample2/rro/res/drawable/car_ic_apps.xml
+++ b/samples/SystemBarBottomRounded/res/drawable/car_ic_apps.xml
diff --git a/samples/SystemBarBottomRounded/res/drawable/car_ic_apps_selected.xml b/samples/SystemBarBottomRounded/res/drawable/car_ic_apps_selected.xml
new file mode 100644
index 00000000..2a4e91aa
--- /dev/null
+++ b/samples/SystemBarBottomRounded/res/drawable/car_ic_apps_selected.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:viewportWidth="44"
+        android:viewportHeight="44"
+        android:width="44dp"
+        android:height="44dp">
+    <path
+        android:pathData="M7.33333333 14.6666667L14.6666667 14.6666667L14.6666667 7.33333333L7.33333333 7.33333333L7.33333333 14.6666667ZM18.3333333 36.6666667L25.6666667 36.6666667L25.6666667 29.3333333L18.3333333 29.3333333L18.3333333 36.6666667ZM7.33333333 36.6666667L14.6666667 36.6666667L14.6666667 29.3333333L7.33333333 29.3333333L7.33333333 36.6666667ZM7.33333333 25.6666667L14.6666667 25.6666667L14.6666667 18.3333333L7.33333333 18.3333333L7.33333333 25.6666667ZM18.3333333 25.6666667L25.6666667 25.6666667L25.6666667 18.3333333L18.3333333 18.3333333L18.3333333 25.6666667ZM29.3333333 7.33333333L29.3333333 14.6666667L36.6666667 14.6666667L36.6666667 7.33333333L29.3333333 7.33333333ZM18.3333333 14.6666667L25.6666667 14.6666667L25.6666667 7.33333333L18.3333333 7.33333333L18.3333333 14.6666667ZM29.3333333 25.6666667L36.6666667 25.6666667L36.6666667 18.3333333L29.3333333 18.3333333L29.3333333 25.6666667ZM29.3333333 36.6666667L36.6666667 36.6666667L36.6666667 29.3333333L29.3333333 29.3333333L29.3333333 36.6666667Z"
+        android:fillColor="@color/car_nav_icon_fill_color_selected" />
+</vector>
+\ No newline at end of file
diff --git a/samples/sample2/rro/res/drawable/car_ic_music.xml b/samples/SystemBarBottomRounded/res/drawable/car_ic_music.xml
index 6339ebb3..6339ebb3 100644
--- a/samples/sample2/rro/res/drawable/car_ic_music.xml
+++ b/samples/SystemBarBottomRounded/res/drawable/car_ic_music.xml
diff --git a/samples/SystemBarBottomRounded/res/drawable/car_ic_music_selected.xml b/samples/SystemBarBottomRounded/res/drawable/car_ic_music_selected.xml
new file mode 100644
index 00000000..a56bcb38
--- /dev/null
+++ b/samples/SystemBarBottomRounded/res/drawable/car_ic_music_selected.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:viewportWidth="44"
+        android:viewportHeight="44"
+        android:width="44dp"
+        android:height="44dp">
+    <path
+        android:pathData="M22 5.5L22 24.8416667C20.9183333 24.2183333 19.6716667 23.8333333 18.3333333 23.8333333C14.2816667 23.8333333 11 27.115 11 31.1666667C11 35.2183333 14.2816667 38.5 18.3333333 38.5C22.385 38.5 25.6666667 35.2183333 25.6666667 31.1666667L25.6666667 12.8333333L33 12.8333333L33 5.5L22 5.5Z"
+        android:fillColor="@color/car_nav_icon_fill_color_selected" />
+</vector>
+\ No newline at end of file
diff --git a/samples/sample2/rro/res/drawable/car_ic_navigation.xml b/samples/SystemBarBottomRounded/res/drawable/car_ic_navigation.xml
index e1fabe07..e1fabe07 100644
--- a/samples/sample2/rro/res/drawable/car_ic_navigation.xml
+++ b/samples/SystemBarBottomRounded/res/drawable/car_ic_navigation.xml
diff --git a/samples/SystemBarBottomRounded/res/drawable/car_ic_navigation_selected.xml b/samples/SystemBarBottomRounded/res/drawable/car_ic_navigation_selected.xml
new file mode 100644
index 00000000..d11cf28f
--- /dev/null
+++ b/samples/SystemBarBottomRounded/res/drawable/car_ic_navigation_selected.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:viewportWidth="44"
+        android:viewportHeight="44"
+        android:width="44dp"
+        android:height="44dp">
+    <path
+        android:pathData="M39.8016667 20.6983333L23.3016667 4.19833333C22.5866667 3.48333333 21.4316667 3.48333333 20.7166667 4.19833333L4.21666667 20.6983333C3.50166667 21.4133333 3.50166667 22.5683333 4.21666667 23.2833333L20.7166667 39.7833333C21.4316667 40.4983333 22.5866667 40.4983333 23.3016667 39.7833333L39.8016667 23.2833333C40.5166667 22.5866667 40.5166667 21.4316667 39.8016667 20.6983333ZM25.6666667 26.5833333L25.6666667 22L18.3333333 22L18.3333333 27.5L14.6666667 27.5L14.6666667 20.1666667C14.6666667 19.1583333 15.4916667 18.3333333 16.5 18.3333333L25.6666667 18.3333333L25.6666667 13.75L32.0833333 20.1666667L25.6666667 26.5833333Z"
+        android:fillColor="@color/car_nav_icon_fill_color_selected" />
+</vector>
+\ No newline at end of file
diff --git a/samples/sample2/rro/res/drawable/car_ic_overview.xml b/samples/SystemBarBottomRounded/res/drawable/car_ic_overview.xml
index f185eb9a..d2190d7c 100644
--- a/samples/sample2/rro/res/drawable/car_ic_overview.xml
+++ b/samples/SystemBarBottomRounded/res/drawable/car_ic_overview.xml
@@ -15,12 +15,13 @@
   ~ limitations under the License
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:viewportWidth="44"
-    android:viewportHeight="44"
-    android:width="44dp"
-    android:height="44dp">
+    android:width="56dp"
+    android:height="56dp"
+    android:viewportWidth="56"
+    android:viewportHeight="56">
     <path
-        android:pathData="M36.92857 22.39286A14.53571 14.53571 0 0 1 7.857143 22.39286A14.53571 14.53571 0 0 1 36.92857 22.39286Z"
-        android:strokeColor="@color/car_nav_icon_fill_color"
-        android:strokeWidth="4" />
+        android:pathData="M9.333,21L28,7L46.667,21V49H9.333V21ZM35,44.333H42V23.333L28,12.833L14,23.333V44.333H21V30.333H35V44.333Z"
+        android:fillColor="@color/car_nav_icon_fill_color"
+        android:fillType="evenOdd"
+       />
 </vector>
 \ No newline at end of file
diff --git a/samples/SystemBarBottomRounded/res/drawable/car_ic_overview_selected.xml b/samples/SystemBarBottomRounded/res/drawable/car_ic_overview_selected.xml
new file mode 100644
index 00000000..bcfbc149
--- /dev/null
+++ b/samples/SystemBarBottomRounded/res/drawable/car_ic_overview_selected.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="56dp"
+    android:height="56dp"
+    android:viewportWidth="56"
+    android:viewportHeight="56">
+    <path
+        android:pathData="M9.333,21L28,7L46.667,21V49H9.333V21ZM35,44.333H42V23.333L28,12.833L14,23.333V44.333H21V30.333H35V44.333Z"
+        android:fillColor="@color/car_nav_icon_fill_color_selected"
+        android:fillType="evenOdd"
+       />
+</vector>
+\ No newline at end of file
diff --git a/samples/sample2/rro/res/drawable/car_ic_phone.xml b/samples/SystemBarBottomRounded/res/drawable/car_ic_phone.xml
index 50e36b5a..50e36b5a 100644
--- a/samples/sample2/rro/res/drawable/car_ic_phone.xml
+++ b/samples/SystemBarBottomRounded/res/drawable/car_ic_phone.xml
diff --git a/samples/SystemBarBottomRounded/res/drawable/car_ic_phone_selected.xml b/samples/SystemBarBottomRounded/res/drawable/car_ic_phone_selected.xml
new file mode 100644
index 00000000..11b1687c
--- /dev/null
+++ b/samples/SystemBarBottomRounded/res/drawable/car_ic_phone_selected.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:viewportWidth="44"
+        android:viewportHeight="44"
+        android:width="44dp"
+        android:height="44dp">
+    <path
+        android:pathData="M12.1366667 19.7816667C14.7766667 24.97 19.03 29.205 24.2183333 31.8633333L28.2516667 27.83C28.7466667 27.335 29.48 27.17 30.1216667 27.39C32.175 28.0683333 34.3933333 28.435 36.6666667 28.435C37.675 28.435 38.5 29.26 38.5 30.2683333L38.5 36.6666667C38.5 37.675 37.675 38.5 36.6666667 38.5C19.4516667 38.5 5.5 24.5483333 5.5 7.33333333C5.5 6.325 6.325 5.5 7.33333333 5.5L13.75 5.5C14.7583333 5.5 15.5833333 6.325 15.5833333 7.33333333C15.5833333 9.625 15.95 11.825 16.6283333 13.8783333C16.83 14.52 16.6833333 15.235 16.17 15.7483333L12.1366667 19.7816667Z"
+        android:fillColor="@color/car_nav_icon_fill_color_selected" />
+</vector>
+\ No newline at end of file
diff --git a/samples/sample1/rro/res/drawable/system_bar_background_3.xml b/samples/SystemBarBottomRounded/res/drawable/system_bar_background.xml
index afa5b321..d7519668 100644
--- a/samples/sample1/rro/res/drawable/system_bar_background_3.xml
+++ b/samples/SystemBarBottomRounded/res/drawable/system_bar_background.xml
@@ -18,8 +18,8 @@
     <corners
         android:topLeftRadius="0dp"
         android:topRightRadius="0dp"
-        android:bottomLeftRadius="10dp"
-        android:bottomRightRadius="0dp"
+        android:bottomLeftRadius="200dp"
+        android:bottomRightRadius="200dp"
     />
     <solid
         android:color="#404040"
diff --git a/samples/SystemBarBottomRounded/res/layout/car_bottom_system_bar.xml b/samples/SystemBarBottomRounded/res/layout/car_bottom_system_bar.xml
new file mode 100644
index 00000000..8b107fb3
--- /dev/null
+++ b/samples/SystemBarBottomRounded/res/layout/car_bottom_system_bar.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<com.android.systemui.car.systembar.CarSystemBarView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:systemui="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:weightSum="3"
+    android:orientation="horizontal"
+    android:layoutDirection="ltr"
+    android:background="@drawable/system_bar_background">
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="left"
+        android:paddingStart="100dp"
+        android:layout_weight="1"
+        android:layoutDirection="ltr">
+        <com.android.systemui.car.systembar.CarSystemBarButton
+            android:id="@+id/home"
+            android:contentDescription="@string/system_bar_home_label"
+            style="@style/SystemBarButton"
+            systemui:componentNames="com.android.car.carlauncher/.CarLauncher"
+            systemui:icon="@drawable/car_ic_overview"
+            systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;launchFlags=0x14000000;end"
+            systemui:selectedIcon="@drawable/car_ic_overview_selected"
+            systemui:highlightWhenSelected="true"/>
+
+        <com.android.systemui.car.systembar.CarSystemBarButton
+            android:id="@+id/grid_nav"
+            android:contentDescription="@string/system_bar_applications_label"
+            style="@style/SystemBarButton"
+            systemui:componentNames="@string/config_appGridComponentName"
+            systemui:icon="@drawable/car_ic_apps"
+            systemui:intent="intent:#Intent;action=com.android.car.carlauncher.ACTION_APP_GRID;package=com.android.car.carlauncher;launchFlags=0x24000000;end"
+            systemui:selectedIcon="@drawable/car_ic_apps_selected"
+            systemui:highlightWhenSelected="true"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/nav_buttons"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingStart="20dp"
+        android:layoutDirection="ltr"
+        android:layout_weight="1">
+
+        <com.android.systemui.car.systembar.CarSystemBarButton
+            android:id="@+id/maps_nav"
+            android:contentDescription="@string/system_bar_maps_label"
+            style="@style/SystemBarButton"
+            systemui:categories="android.intent.category.APP_MAPS"
+            systemui:icon="@drawable/car_ic_navigation"
+            systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MAPS;launchFlags=0x14000000;end"
+            systemui:selectedIcon="@drawable/car_ic_navigation_selected"
+            systemui:highlightWhenSelected="true"/>
+
+        <com.android.systemui.car.systembar.CarSystemBarButton
+            android:id="@+id/music_nav"
+            android:contentDescription="@string/system_bar_media_label"
+            style="@style/SystemBarButton"
+            systemui:categories="android.intent.category.APP_MUSIC"
+            systemui:icon="@drawable/car_ic_music"
+            systemui:intent="intent:#Intent;action=android.car.intent.action.MEDIA_TEMPLATE;launchFlags=0x10000000;end"
+            systemui:packages="com.android.car.media"
+            systemui:selectedIcon="@drawable/car_ic_music_selected"
+            systemui:highlightWhenSelected="true"/>
+
+        <com.android.systemui.car.systembar.CarSystemBarButton
+            android:id="@+id/phone_nav"
+            android:contentDescription="@string/system_bar_phone_label"
+            style="@style/SystemBarButton"
+            systemui:icon="@drawable/car_ic_phone"
+            systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.LAUNCHER;package=com.android.car.dialer;launchFlags=0x10000000;end"
+            systemui:packages="com.android.car.dialer"
+            systemui:selectedIcon="@drawable/car_ic_phone_selected"
+            systemui:highlightWhenSelected="true"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/status_icons"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="right"
+        android:paddingEnd="100dp"
+        android:layoutDirection="ltr"
+        android:layout_weight="1">
+      <LinearLayout
+            android:id="@+id/qc_entry_points_container"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_centerVertical="true"
+            android:layout_alignParentStart="true"
+        />
+        <FrameLayout
+            android:id="@+id/clock_container"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+
+            android:layout_centerInParent="true">
+            <com.android.systemui.statusbar.policy.Clock
+                android:id="@+id/clock"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:elevation="5dp"
+                android:singleLine="true"
+            />
+        </FrameLayout>
+    </LinearLayout>
+</com.android.systemui.car.systembar.CarSystemBarView>
diff --git a/samples/SystemBarBottomRounded/res/layout/system_icons.xml b/samples/SystemBarBottomRounded/res/layout/system_icons.xml
new file mode 100644
index 00000000..d2357929
--- /dev/null
+++ b/samples/SystemBarBottomRounded/res/layout/system_icons.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/system_icons"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_vertical">
+
+    <com.android.systemui.statusbar.phone.StatusIconContainer
+        android:id="@+id/statusIcons"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:paddingEnd="4dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+    />
+</LinearLayout>
+\ No newline at end of file
diff --git a/samples/sample3/rro/res/values/attrs.xml b/samples/SystemBarBottomRounded/res/values/attrs.xml
index bc7ded20..e02f9e6e 100644
--- a/samples/sample3/rro/res/values/attrs.xml
+++ b/samples/SystemBarBottomRounded/res/values/attrs.xml
@@ -18,6 +18,7 @@
 <resources>
     <attr name="broadcast" format="boolean"/>
     <attr name="icon" format="reference"/>
+    <attr name="selectedIcon" format="reference"/>
     <attr name="intent" format="string"/>
     <attr name="longIntent" format="string"/>
     <attr name="componentNames" format="string" />
diff --git a/samples/sample2/rro/res/values/colors.xml b/samples/SystemBarBottomRounded/res/values/colors.xml
index c32d6386..c32d6386 100644
--- a/samples/sample2/rro/res/values/colors.xml
+++ b/samples/SystemBarBottomRounded/res/values/colors.xml
diff --git a/samples/sample3/rro/res/values/config.xml b/samples/SystemBarBottomRounded/res/values/config.xml
index 2da6e992..c30d1e0c 100644
--- a/samples/sample3/rro/res/values/config.xml
+++ b/samples/SystemBarBottomRounded/res/values/config.xml
@@ -18,7 +18,7 @@
 <resources>
     <!-- Configure which system bars should be displayed. -->
     <bool name="config_enableTopSystemBar">false</bool>
-    <bool name="config_enableLeftSystemBar">true</bool>
+    <bool name="config_enableLeftSystemBar">false</bool>
     <bool name="config_enableRightSystemBar">false</bool>
     <bool name="config_enableBottomSystemBar">true</bool>
 
@@ -27,9 +27,9 @@
     <!--    NAVIGATION_BAR = 1-->
     <!--    STATUS_BAR_EXTRA = 2-->
     <!--    NAVIGATION_BAR_EXTRA = 3-->
-    <integer name="config_topSystemBarType">2</integer>
+    <integer name="config_topSystemBarType">0</integer>
     <integer name="config_leftSystemBarType">0</integer>
-    <integer name="config_rightSystemBarType">3</integer>
+    <integer name="config_rightSystemBarType">0</integer>
     <integer name="config_bottomSystemBarType">1</integer>
 
     <!-- Configure the relative z-order among the system bars. When two system bars overlap (e.g.
@@ -41,9 +41,9 @@
          are allowed to have the same z-order. -->
     <!-- NOTE: If the z-order of a bar is 10 or above, it will also appear on top of HUN's.    -->
     <integer name="config_topSystemBarZOrder">0</integer>
-    <integer name="config_leftSystemBarZOrder">10</integer>
+    <integer name="config_leftSystemBarZOrder">0</integer>
     <integer name="config_rightSystemBarZOrder">0</integer>
-    <integer name="config_bottomSystemBarZOrder">15</integer>
+    <integer name="config_bottomSystemBarZOrder">10</integer>
 
     <!-- Whether heads-up notifications should be shown on the bottom. If false, heads-up
          notifications will be shown pushed to the top of their parent container. If true, they will
@@ -51,11 +51,17 @@
          config_headsUpNotificationAnimationHelper to use a different AnimationHelper, such as
          com.android.car.notification.headsup.animationhelper.
          CarHeadsUpNotificationBottomAnimationHelper. -->
-    <bool name="config_showHeadsUpNotificationOnBottom">false</bool>
+    <bool name="config_showHeadsUpNotificationOnBottom">true</bool>
 
     <string name="config_notificationPanelViewMediator" translatable="false">
         com.android.systemui.car.notification.BottomNotificationPanelViewMediator</string>
 
+    <!-- Specifies the component name of the app grid activity -->
     <string name="config_appGridComponentName" translatable="false">
         com.android.car.carlauncher/.AppGridActivity</string>
+
+     <string-array name="config_quickControlsEntryPointIconControllers" translatable="false">
+        <item>com.android.systemui.car.statusicon.ui.SignalStatusIconController</item>
+        <item>com.android.systemui.car.statusicon.ui.DisplayStatusIconController</item>
+     </string-array>
 </resources>
 \ No newline at end of file
diff --git a/samples/SystemBarBottomRounded/res/values/dimens.xml b/samples/SystemBarBottomRounded/res/values/dimens.xml
new file mode 100644
index 00000000..1e872a16
--- /dev/null
+++ b/samples/SystemBarBottomRounded/res/values/dimens.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources>
+    <dimen name="car_right_system_bar_width">280dp</dimen>
+</resources>
diff --git a/samples/sample3/rro/res/values/strings.xml b/samples/SystemBarBottomRounded/res/values/strings.xml
index 78c1324b..99ec9284 100644
--- a/samples/sample3/rro/res/values/strings.xml
+++ b/samples/SystemBarBottomRounded/res/values/strings.xml
@@ -19,7 +19,8 @@
     <!-- Content description strings for system bar icons. Strings should be added for all drawables
          to enable Talkback for accessibility. -->
     <string name="system_bar_home_label">Home Screen</string>
+    <string name="system_bar_maps_label">Maps</string>
+    <string name="system_bar_media_label">Media</string>
+    <string name="system_bar_phone_label">Phone</string>
     <string name="system_bar_applications_label">Applications</string>
-    <string name="system_bar_climate_control_label">Climate Control</string>
-    <string name="system_bar_notifications_label">Notifications</string>
 </resources>
 \ No newline at end of file
diff --git a/samples/sample2/rro/res/values/styles.xml b/samples/SystemBarBottomRounded/res/values/styles.xml
index 343cd5ba..343cd5ba 100644
--- a/samples/sample2/rro/res/values/styles.xml
+++ b/samples/SystemBarBottomRounded/res/values/styles.xml
diff --git a/samples/SystemBarBottomRounded/res/xml/car_sysui_overlays.xml b/samples/SystemBarBottomRounded/res/xml/car_sysui_overlays.xml
new file mode 100644
index 00000000..fa40ba4e
--- /dev/null
+++ b/samples/SystemBarBottomRounded/res/xml/car_sysui_overlays.xml
@@ -0,0 +1,79 @@
+
+<!--
+  ~ 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.
+  -->
+
+<overlay>
+    <item target="layout/car_bottom_system_bar" value="@layout/car_bottom_system_bar"/>
+    <item target="layout/system_icons" value="@layout/system_icons"/>
+    <item target="string/config_appGridComponentName" value="@string/config_appGridComponentName"/>
+
+    <item target="array/config_quickControlsEntryPointIconControllers" value="@array/config_quickControlsEntryPointIconControllers"/>
+
+    <item target="attr/icon" value="@attr/icon"/>
+    <item target="attr/selectedIcon" value="@attr/selectedIcon"/>
+    <item target="attr/intent" value="@attr/intent"/>
+    <item target="attr/longIntent" value="@attr/longIntent"/>
+    <item target="attr/componentNames" value="@attr/componentNames"/>
+    <item target="attr/highlightWhenSelected" value="@attr/highlightWhenSelected"/>
+    <item target="attr/categories" value="@attr/categories"/>
+    <item target="attr/packages" value="@attr/packages"/>
+    <item target="attr/hvacAreaId" value="@attr/hvacAreaId"/>
+    <item target="attr/hvacPropertyId" value="@attr/hvacPropertyId"/>
+    <item target="attr/hvacTempFormat" value="@attr/hvacTempFormat"/>
+    <item target="attr/hvacPivotOffset" value="@attr/hvacPivotOffset"/>
+    <item target="attr/hvacMinValue" value="@attr/hvacMinValue"/>
+    <item target="attr/hvacMaxValue" value="@attr/hvacMaxValue"/>
+    <item target="attr/hvacMinText" value="@attr/hvacMinText"/>
+    <item target="attr/hvacMaxText" value="@attr/hvacMaxText"/>
+    <!-- start the intent as a broad cast instead of an activity if true-->
+    <item target="attr/broadcast" value="@attr/broadcast"/>
+
+    <item target="drawable/car_ic_overview" value="@drawable/car_ic_overview" />
+    <item target="drawable/car_ic_overview_selected" value="@drawable/car_ic_overview_selected" />
+    <item target="drawable/car_ic_apps" value="@drawable/car_ic_apps" />
+    <item target="drawable/car_ic_apps_selected" value="@drawable/car_ic_apps_selected" />
+    <item target="drawable/car_ic_music" value="@drawable/car_ic_music" />
+    <item target="drawable/car_ic_music_selected" value="@drawable/car_ic_music_selected" />
+    <item target="drawable/car_ic_phone" value="@drawable/car_ic_phone" />
+    <item target="drawable/car_ic_phone_selected" value="@drawable/car_ic_phone_selected" />
+    <item target="drawable/car_ic_navigation" value="@drawable/car_ic_navigation" />
+    <item target="drawable/car_ic_navigation_selected" value="@drawable/car_ic_navigation_selected" />
+
+    <item target="dimen/car_right_system_bar_width" value="@dimen/car_right_system_bar_width" />
+
+    <item target="style/SystemBarButton" value="@style/SystemBarButton"/>
+
+    <item target="color/car_nav_icon_fill_color" value="@color/car_nav_icon_fill_color" />
+
+    <item target="bool/config_enableTopSystemBar" value="@bool/config_enableTopSystemBar"/>
+    <item target="bool/config_enableLeftSystemBar" value="@bool/config_enableLeftSystemBar"/>
+    <item target="bool/config_enableRightSystemBar" value="@bool/config_enableRightSystemBar"/>
+    <item target="bool/config_enableBottomSystemBar" value="@bool/config_enableBottomSystemBar"/>
+    <item target="bool/config_showHeadsUpNotificationOnBottom" value="@bool/config_showHeadsUpNotificationOnBottom"/>
+
+    <item target="integer/config_topSystemBarType" value="@integer/config_topSystemBarType"/>
+    <item target="integer/config_leftSystemBarType" value="@integer/config_leftSystemBarType"/>
+    <item target="integer/config_rightSystemBarType" value="@integer/config_rightSystemBarType"/>
+    <item target="integer/config_bottomSystemBarType" value="@integer/config_bottomSystemBarType"/>
+
+    <item target="integer/config_topSystemBarZOrder" value="@integer/config_topSystemBarZOrder"/>
+    <item target="integer/config_leftSystemBarZOrder" value="@integer/config_leftSystemBarZOrder"/>
+    <item target="integer/config_rightSystemBarZOrder" value="@integer/config_rightSystemBarZOrder"/>
+    <item target="integer/config_bottomSystemBarZOrder" value="@integer/config_bottomSystemBarZOrder"/>
+
+    <item target="string/config_notificationPanelViewMediator" value="@string/config_notificationPanelViewMediator"/>
+    <item target="id/qc_entry_points_container" value="@id/qc_entry_points_container"/>
+</overlay>
+\ No newline at end of file
diff --git a/samples/sample2/rro/Android.bp b/samples/SystemBarLeft/Android.bp
index 8dc009bf..cfce3214 100644
--- a/samples/sample2/rro/Android.bp
+++ b/samples/SystemBarLeft/Android.bp
@@ -19,7 +19,7 @@ package {
 }
 
 android_app {
-    name: "CarSystemUISampleTwoRRO",
+    name: "CarSystemUILeftRRO",
     resource_dirs: ["res"],
     certificate: "platform",
     platform_apis: true,
diff --git a/samples/sample3/rro/AndroidManifest.xml b/samples/SystemBarLeft/AndroidManifest.xml
index 5c25056f..a49de1f0 100644
--- a/samples/sample3/rro/AndroidManifest.xml
+++ b/samples/SystemBarLeft/AndroidManifest.xml
@@ -15,7 +15,7 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.systemui.rro">
+          package="com.android.systemui.rro.left">
     <overlay
         android:targetPackage="com.android.systemui"
         android:isStatic="false"
diff --git a/samples/sample3/rro/res/drawable/car_ic_apps.xml b/samples/SystemBarLeft/res/drawable/car_ic_apps.xml
index a8d8a2f2..a8d8a2f2 100644
--- a/samples/sample3/rro/res/drawable/car_ic_apps.xml
+++ b/samples/SystemBarLeft/res/drawable/car_ic_apps.xml
diff --git a/samples/SystemBarLeft/res/drawable/car_ic_apps_selected.xml b/samples/SystemBarLeft/res/drawable/car_ic_apps_selected.xml
new file mode 100644
index 00000000..2a4e91aa
--- /dev/null
+++ b/samples/SystemBarLeft/res/drawable/car_ic_apps_selected.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:viewportWidth="44"
+        android:viewportHeight="44"
+        android:width="44dp"
+        android:height="44dp">
+    <path
+        android:pathData="M7.33333333 14.6666667L14.6666667 14.6666667L14.6666667 7.33333333L7.33333333 7.33333333L7.33333333 14.6666667ZM18.3333333 36.6666667L25.6666667 36.6666667L25.6666667 29.3333333L18.3333333 29.3333333L18.3333333 36.6666667ZM7.33333333 36.6666667L14.6666667 36.6666667L14.6666667 29.3333333L7.33333333 29.3333333L7.33333333 36.6666667ZM7.33333333 25.6666667L14.6666667 25.6666667L14.6666667 18.3333333L7.33333333 18.3333333L7.33333333 25.6666667ZM18.3333333 25.6666667L25.6666667 25.6666667L25.6666667 18.3333333L18.3333333 18.3333333L18.3333333 25.6666667ZM29.3333333 7.33333333L29.3333333 14.6666667L36.6666667 14.6666667L36.6666667 7.33333333L29.3333333 7.33333333ZM18.3333333 14.6666667L25.6666667 14.6666667L25.6666667 7.33333333L18.3333333 7.33333333L18.3333333 14.6666667ZM29.3333333 25.6666667L36.6666667 25.6666667L36.6666667 18.3333333L29.3333333 18.3333333L29.3333333 25.6666667ZM29.3333333 36.6666667L36.6666667 36.6666667L36.6666667 29.3333333L29.3333333 29.3333333L29.3333333 36.6666667Z"
+        android:fillColor="@color/car_nav_icon_fill_color_selected" />
+</vector>
+\ No newline at end of file
diff --git a/samples/sample3/rro/res/drawable/car_ic_music.xml b/samples/SystemBarLeft/res/drawable/car_ic_music.xml
index 6339ebb3..6339ebb3 100644
--- a/samples/sample3/rro/res/drawable/car_ic_music.xml
+++ b/samples/SystemBarLeft/res/drawable/car_ic_music.xml
diff --git a/samples/SystemBarLeft/res/drawable/car_ic_music_selected.xml b/samples/SystemBarLeft/res/drawable/car_ic_music_selected.xml
new file mode 100644
index 00000000..a56bcb38
--- /dev/null
+++ b/samples/SystemBarLeft/res/drawable/car_ic_music_selected.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:viewportWidth="44"
+        android:viewportHeight="44"
+        android:width="44dp"
+        android:height="44dp">
+    <path
+        android:pathData="M22 5.5L22 24.8416667C20.9183333 24.2183333 19.6716667 23.8333333 18.3333333 23.8333333C14.2816667 23.8333333 11 27.115 11 31.1666667C11 35.2183333 14.2816667 38.5 18.3333333 38.5C22.385 38.5 25.6666667 35.2183333 25.6666667 31.1666667L25.6666667 12.8333333L33 12.8333333L33 5.5L22 5.5Z"
+        android:fillColor="@color/car_nav_icon_fill_color_selected" />
+</vector>
+\ No newline at end of file
diff --git a/samples/sample3/rro/res/drawable/car_ic_navigation.xml b/samples/SystemBarLeft/res/drawable/car_ic_navigation.xml
index e1fabe07..e1fabe07 100644
--- a/samples/sample3/rro/res/drawable/car_ic_navigation.xml
+++ b/samples/SystemBarLeft/res/drawable/car_ic_navigation.xml
diff --git a/samples/SystemBarLeft/res/drawable/car_ic_navigation_selected.xml b/samples/SystemBarLeft/res/drawable/car_ic_navigation_selected.xml
new file mode 100644
index 00000000..d11cf28f
--- /dev/null
+++ b/samples/SystemBarLeft/res/drawable/car_ic_navigation_selected.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:viewportWidth="44"
+        android:viewportHeight="44"
+        android:width="44dp"
+        android:height="44dp">
+    <path
+        android:pathData="M39.8016667 20.6983333L23.3016667 4.19833333C22.5866667 3.48333333 21.4316667 3.48333333 20.7166667 4.19833333L4.21666667 20.6983333C3.50166667 21.4133333 3.50166667 22.5683333 4.21666667 23.2833333L20.7166667 39.7833333C21.4316667 40.4983333 22.5866667 40.4983333 23.3016667 39.7833333L39.8016667 23.2833333C40.5166667 22.5866667 40.5166667 21.4316667 39.8016667 20.6983333ZM25.6666667 26.5833333L25.6666667 22L18.3333333 22L18.3333333 27.5L14.6666667 27.5L14.6666667 20.1666667C14.6666667 19.1583333 15.4916667 18.3333333 16.5 18.3333333L25.6666667 18.3333333L25.6666667 13.75L32.0833333 20.1666667L25.6666667 26.5833333Z"
+        android:fillColor="@color/car_nav_icon_fill_color_selected" />
+</vector>
+\ No newline at end of file
diff --git a/samples/sample3/rro/res/drawable/car_ic_overview.xml b/samples/SystemBarLeft/res/drawable/car_ic_overview.xml
index f185eb9a..d2190d7c 100644
--- a/samples/sample3/rro/res/drawable/car_ic_overview.xml
+++ b/samples/SystemBarLeft/res/drawable/car_ic_overview.xml
@@ -15,12 +15,13 @@
   ~ limitations under the License
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:viewportWidth="44"
-    android:viewportHeight="44"
-    android:width="44dp"
-    android:height="44dp">
+    android:width="56dp"
+    android:height="56dp"
+    android:viewportWidth="56"
+    android:viewportHeight="56">
     <path
-        android:pathData="M36.92857 22.39286A14.53571 14.53571 0 0 1 7.857143 22.39286A14.53571 14.53571 0 0 1 36.92857 22.39286Z"
-        android:strokeColor="@color/car_nav_icon_fill_color"
-        android:strokeWidth="4" />
+        android:pathData="M9.333,21L28,7L46.667,21V49H9.333V21ZM35,44.333H42V23.333L28,12.833L14,23.333V44.333H21V30.333H35V44.333Z"
+        android:fillColor="@color/car_nav_icon_fill_color"
+        android:fillType="evenOdd"
+       />
 </vector>
 \ No newline at end of file
diff --git a/samples/SystemBarLeft/res/drawable/car_ic_overview_selected.xml b/samples/SystemBarLeft/res/drawable/car_ic_overview_selected.xml
new file mode 100644
index 00000000..bcfbc149
--- /dev/null
+++ b/samples/SystemBarLeft/res/drawable/car_ic_overview_selected.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="56dp"
+    android:height="56dp"
+    android:viewportWidth="56"
+    android:viewportHeight="56">
+    <path
+        android:pathData="M9.333,21L28,7L46.667,21V49H9.333V21ZM35,44.333H42V23.333L28,12.833L14,23.333V44.333H21V30.333H35V44.333Z"
+        android:fillColor="@color/car_nav_icon_fill_color_selected"
+        android:fillType="evenOdd"
+       />
+</vector>
+\ No newline at end of file
diff --git a/samples/sample3/rro/res/drawable/car_ic_phone.xml b/samples/SystemBarLeft/res/drawable/car_ic_phone.xml
index 50e36b5a..50e36b5a 100644
--- a/samples/sample3/rro/res/drawable/car_ic_phone.xml
+++ b/samples/SystemBarLeft/res/drawable/car_ic_phone.xml
diff --git a/samples/SystemBarLeft/res/drawable/car_ic_phone_selected.xml b/samples/SystemBarLeft/res/drawable/car_ic_phone_selected.xml
new file mode 100644
index 00000000..11b1687c
--- /dev/null
+++ b/samples/SystemBarLeft/res/drawable/car_ic_phone_selected.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:viewportWidth="44"
+        android:viewportHeight="44"
+        android:width="44dp"
+        android:height="44dp">
+    <path
+        android:pathData="M12.1366667 19.7816667C14.7766667 24.97 19.03 29.205 24.2183333 31.8633333L28.2516667 27.83C28.7466667 27.335 29.48 27.17 30.1216667 27.39C32.175 28.0683333 34.3933333 28.435 36.6666667 28.435C37.675 28.435 38.5 29.26 38.5 30.2683333L38.5 36.6666667C38.5 37.675 37.675 38.5 36.6666667 38.5C19.4516667 38.5 5.5 24.5483333 5.5 7.33333333C5.5 6.325 6.325 5.5 7.33333333 5.5L13.75 5.5C14.7583333 5.5 15.5833333 6.325 15.5833333 7.33333333C15.5833333 9.625 15.95 11.825 16.6283333 13.8783333C16.83 14.52 16.6833333 15.235 16.17 15.7483333L12.1366667 19.7816667Z"
+        android:fillColor="@color/car_nav_icon_fill_color_selected" />
+</vector>
+\ No newline at end of file
diff --git a/samples/sample1/rro/res/layout/car_bottom_system_bar.xml b/samples/SystemBarLeft/res/layout/car_left_system_bar.xml
index c5b0e6ac..4f80201e 100644
--- a/samples/sample1/rro/res/layout/car_bottom_system_bar.xml
+++ b/samples/SystemBarLeft/res/layout/car_left_system_bar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2020 The Android Open Source Project
+  ~ Copyright (C) 2023 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -17,31 +17,47 @@
 <com.android.systemui.car.systembar.CarSystemBarView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:systemui="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/transparent"
-    android:orientation="horizontal">
-    <!--The 20dp padding is the difference between the background selected icon size and the ripple
-        that was chosen, thus it's a hack to make it look pretty and not an official margin value-->
+    android:layout_width="match_parent"
+    android:weightSum="3"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="top"
+        android:paddingTop="20dp"
+        android:layout_weight="1"
+        android:orientation="vertical">
+        <FrameLayout
+            android:id="@+id/clock_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <com.android.systemui.statusbar.policy.Clock
+                android:id="@+id/clock"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:elevation="5dp"
+                android:singleLine="true"
+            />
+        </FrameLayout>
+      <LinearLayout
+            android:id="@+id/qc_entry_points_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+        />
+    </LinearLayout>
+
     <LinearLayout
         android:id="@+id/nav_buttons"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/system_bar_background"
         android:gravity="center"
         android:layoutDirection="ltr"
-        android:paddingEnd="20dp"
-        android:paddingStart="20dp">
-
-        <com.android.systemui.car.systembar.CarSystemBarButton
-            android:id="@+id/home"
-            android:contentDescription="@string/system_bar_home_label"
-            style="@style/SystemBarButton"
-            systemui:componentNames="com.android.car.carlauncher/.CarLauncher"
-            systemui:icon="@drawable/car_ic_overview"
-            systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;launchFlags=0x14000000;end"
-            systemui:selectedIcon="@drawable/car_ic_overview_selected"
-            systemui:highlightWhenSelected="true"/>
+        android:layout_weight="1"
+        android:orientation="vertical">
 
         <com.android.systemui.car.systembar.CarSystemBarButton
             android:id="@+id/maps_nav"
@@ -73,6 +89,22 @@
             systemui:packages="com.android.car.dialer"
             systemui:selectedIcon="@drawable/car_ic_phone_selected"
             systemui:highlightWhenSelected="true"/>
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="bottom"
+        android:layout_weight="1"
+        android:orientation="vertical">
+        <com.android.systemui.car.systembar.CarSystemBarButton
+            android:id="@+id/home"
+            android:contentDescription="@string/system_bar_home_label"
+            style="@style/SystemBarButton"
+            systemui:componentNames="com.android.car.carlauncher/.CarLauncher"
+            systemui:icon="@drawable/car_ic_overview"
+            systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;launchFlags=0x14000000;end"
+            systemui:selectedIcon="@drawable/car_ic_overview_selected"
+            systemui:highlightWhenSelected="true"/>
 
         <com.android.systemui.car.systembar.CarSystemBarButton
             android:id="@+id/grid_nav"
@@ -83,6 +115,5 @@
             systemui:intent="intent:#Intent;action=com.android.car.carlauncher.ACTION_APP_GRID;package=com.android.car.carlauncher;launchFlags=0x24000000;end"
             systemui:selectedIcon="@drawable/car_ic_apps_selected"
             systemui:highlightWhenSelected="true"/>
-
     </LinearLayout>
 </com.android.systemui.car.systembar.CarSystemBarView>
diff --git a/samples/SystemBarLeft/res/layout/system_icons.xml b/samples/SystemBarLeft/res/layout/system_icons.xml
new file mode 100644
index 00000000..7571fecd
--- /dev/null
+++ b/samples/SystemBarLeft/res/layout/system_icons.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/system_icons"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center">
+
+    <com.android.systemui.statusbar.phone.StatusIconContainer
+        android:id="@+id/statusIcons"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:orientation="vertical"
+    />
+</LinearLayout>
+\ No newline at end of file
diff --git a/samples/sample2/rro/res/values/attrs.xml b/samples/SystemBarLeft/res/values/attrs.xml
index 7ba33346..7ba33346 100644
--- a/samples/sample2/rro/res/values/attrs.xml
+++ b/samples/SystemBarLeft/res/values/attrs.xml
diff --git a/samples/sample3/rro/res/values/colors.xml b/samples/SystemBarLeft/res/values/colors.xml
index f98cb96e..c32d6386 100644
--- a/samples/sample3/rro/res/values/colors.xml
+++ b/samples/SystemBarLeft/res/values/colors.xml
@@ -16,4 +16,5 @@
   -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <color name="car_nav_icon_fill_color">#8F8F8F</color>
+    <color name="car_nav_icon_fill_color_selected">#FFFFFF</color>
 </resources>
diff --git a/samples/sample2/rro/res/values/config.xml b/samples/SystemBarLeft/res/values/config.xml
index 83f9ed0b..9b979c82 100644
--- a/samples/sample2/rro/res/values/config.xml
+++ b/samples/SystemBarLeft/res/values/config.xml
@@ -42,8 +42,8 @@
     <!-- NOTE: If the z-order of a bar is 10 or above, it will also appear on top of HUN's.    -->
     <integer name="config_topSystemBarZOrder">0</integer>
     <integer name="config_leftSystemBarZOrder">10</integer>
-    <integer name="config_rightSystemBarZOrder">10</integer>
-    <integer name="config_bottomSystemBarZOrder">10</integer>
+    <integer name="config_rightSystemBarZOrder">0</integer>
+    <integer name="config_bottomSystemBarZOrder">0</integer>
 
     <!-- Whether heads-up notifications should be shown on the bottom. If false, heads-up
          notifications will be shown pushed to the top of their parent container. If true, they will
@@ -58,4 +58,9 @@
 
     <string name="config_appGridComponentName" translatable="false">
         com.android.car.carlauncher/.AppGridActivity</string>
+
+     <string-array name="config_quickControlsEntryPointIconControllers" translatable="false">
+        <item>com.android.systemui.car.statusicon.ui.SignalStatusIconController</item>
+        <item>com.android.systemui.car.statusicon.ui.DisplayStatusIconController</item>
+     </string-array>
 </resources>
 \ No newline at end of file
diff --git a/samples/sample2/rro/res/values/strings.xml b/samples/SystemBarLeft/res/values/strings.xml
index 9adaacfe..9adaacfe 100644
--- a/samples/sample2/rro/res/values/strings.xml
+++ b/samples/SystemBarLeft/res/values/strings.xml
diff --git a/samples/SystemBarLeft/res/values/styles.xml b/samples/SystemBarLeft/res/values/styles.xml
new file mode 100644
index 00000000..343cd5ba
--- /dev/null
+++ b/samples/SystemBarLeft/res/values/styles.xml
@@ -0,0 +1,35 @@
+<?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.
+  -->
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <style name="TextAppearance.StatusBar.Clock"
+           parent="@*android:style/TextAppearance.StatusBar.Icon">
+        <item name="android:textSize">40sp</item>
+        <item name="android:fontFamily">sans-serif-regular</item>
+        <item name="android:textColor">#FFFFFF</item>
+    </style>
+
+    <style name="SystemBarButton">
+        <item name="android:layout_height">96dp</item>
+        <item name="android:layout_width">96dp</item>
+        <item name="android:background">?android:attr/selectableItemBackground</item>
+    </style>
+
+    <style name="TextAppearance.CarStatus" parent="@android:style/TextAppearance.DeviceDefault">
+        <item name="android:textSize">30sp</item>
+        <item name="android:textColor">#FFFFFF</item>
+    </style>
+</resources>
+\ No newline at end of file
diff --git a/samples/sample2/rro/res/xml/car_sysui_overlays.xml b/samples/SystemBarLeft/res/xml/car_sysui_overlays.xml
index f00b2f0d..950ebd6d 100644
--- a/samples/sample2/rro/res/xml/car_sysui_overlays.xml
+++ b/samples/SystemBarLeft/res/xml/car_sysui_overlays.xml
@@ -17,8 +17,13 @@
 
 <overlay>
     <item target="layout/car_left_system_bar" value="@layout/car_left_system_bar"/>
+    <item target="layout/system_icons" value="@layout/system_icons"/>
+
     <item target="string/config_appGridComponentName" value="@string/config_appGridComponentName"/>
 
+    <item target="array/config_quickControlsEntryPointIconControllers" value="@array/config_quickControlsEntryPointIconControllers"/>
+    <item target="id/qc_entry_points_container" value="@id/qc_entry_points_container"/>
+
     <item target="attr/icon" value="@attr/icon"/>
     <item target="attr/selectedIcon" value="@attr/selectedIcon"/>
     <item target="attr/intent" value="@attr/intent"/>
@@ -31,10 +36,15 @@
     <item target="attr/broadcast" value="@attr/broadcast"/>
 
     <item target="drawable/car_ic_overview" value="@drawable/car_ic_overview" />
+    <item target="drawable/car_ic_overview_selected" value="@drawable/car_ic_overview_selected" />
     <item target="drawable/car_ic_apps" value="@drawable/car_ic_apps" />
+    <item target="drawable/car_ic_apps_selected" value="@drawable/car_ic_apps_selected" />
     <item target="drawable/car_ic_music" value="@drawable/car_ic_music" />
+    <item target="drawable/car_ic_music_selected" value="@drawable/car_ic_music_selected" />
     <item target="drawable/car_ic_phone" value="@drawable/car_ic_phone" />
+    <item target="drawable/car_ic_phone_selected" value="@drawable/car_ic_phone_selected" />
     <item target="drawable/car_ic_navigation" value="@drawable/car_ic_navigation" />
+    <item target="drawable/car_ic_navigation_selected" value="@drawable/car_ic_navigation_selected" />
 
     <item target="style/SystemBarButton" value="@style/SystemBarButton"/>
 
@@ -57,11 +67,4 @@
     <item target="integer/config_bottomSystemBarZOrder" value="@integer/config_bottomSystemBarZOrder"/>
 
     <item target="string/config_notificationPanelViewMediator" value="@string/config_notificationPanelViewMediator"/>
-
-    <item target="id/home" value="@id/home"/>
-    <item target="id/maps_nav" value="@id/maps_nav"/>
-    <item target="id/music_nav" value="@id/music_nav"/>
-    <item target="id/grid_nav" value="@id/grid_nav"/>
-    <item target="id/phone_nav" value="@id/phone_nav"/>
-    <item target="id/notifications" value="@id/notifications"/>
 </overlay>
 \ No newline at end of file
diff --git a/samples/sample3/rro/Android.bp b/samples/SystemBarPersistent/Android.bp
index 8a55c09f..8eef96f8 100644
--- a/samples/sample3/rro/Android.bp
+++ b/samples/SystemBarPersistent/Android.bp
@@ -19,7 +19,7 @@ package {
 }
 
 android_app {
-    name: "CarSystemUISampleThreeRRO",
+    name: "CarSystemUIPersistentRRO",
     resource_dirs: ["res"],
     certificate: "platform",
     platform_apis: true,
@@ -29,3 +29,4 @@ android_app {
         "--no-resource-removal",
      ]
 }
+
diff --git a/samples/SystemBarPersistent/AndroidManifest.xml b/samples/SystemBarPersistent/AndroidManifest.xml
new file mode 100644
index 00000000..24c80070
--- /dev/null
+++ b/samples/SystemBarPersistent/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<!--
+  ~ 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.systemui.rro.persistent">
+    <overlay
+        android:targetPackage="android"
+        android:isStatic="false"
+        android:resourcesMap="@xml/car_sysui_overlays"
+    />
+</manifest>
+\ No newline at end of file
diff --git a/samples/sample3/rro/res/drawable/system_bar_background.xml b/samples/SystemBarPersistent/res/values/config.xml
index 66da21ca..b22e64aa 100644
--- a/samples/sample3/rro/res/drawable/system_bar_background.xml
+++ b/samples/SystemBarPersistent/res/values/config.xml
@@ -14,8 +14,8 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
-    <solid
-        android:color="#404040"
-    />
-</shape>
-\ No newline at end of file
+
+<resources>
+    <!-- Don’t dismiss the bars when app goes immersive -->
+    <bool name="config_remoteInsetsControllerControlsSystemBars">true</bool>
+</resources>
+\ No newline at end of file
diff --git a/samples/SystemBarPersistent/res/xml/car_sysui_overlays.xml b/samples/SystemBarPersistent/res/xml/car_sysui_overlays.xml
new file mode 100644
index 00000000..5a3242c4
--- /dev/null
+++ b/samples/SystemBarPersistent/res/xml/car_sysui_overlays.xml
@@ -0,0 +1,21 @@
+
+<!--
+  ~ 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.
+  -->
+
+<overlay>
+    <!-- Don’t dismiss the bars when app goes immersive -->
+    <item target="bool/config_remoteInsetsControllerControlsSystemBars" value="@bool/config_remoteInsetsControllerControlsSystemBars"/>
+</overlay>
+\ No newline at end of file
diff --git a/samples/SystemBarRight/Android.bp b/samples/SystemBarRight/Android.bp
new file mode 100644
index 00000000..73e65141
--- /dev/null
+++ b/samples/SystemBarRight/Android.bp
@@ -0,0 +1,31 @@
+//
+// 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_app {
+    name: "CarSystemUIRightRRO",
+    resource_dirs: ["res"],
+    certificate: "platform",
+    platform_apis: true,
+    manifest: "AndroidManifest.xml",
+    aaptflags: [
+        "--no-resource-deduping",
+        "--no-resource-removal",
+     ]
+}
diff --git a/samples/sample1/rro/AndroidManifest.xml b/samples/SystemBarRight/AndroidManifest.xml
index 5c25056f..4c2f97e9 100644
--- a/samples/sample1/rro/AndroidManifest.xml
+++ b/samples/SystemBarRight/AndroidManifest.xml
@@ -15,7 +15,7 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.systemui.rro">
+          package="com.android.systemui.rro.right">
     <overlay
         android:targetPackage="com.android.systemui"
         android:isStatic="false"
diff --git a/samples/SystemBarRight/res/drawable/car_ic_apps.xml b/samples/SystemBarRight/res/drawable/car_ic_apps.xml
new file mode 100644
index 00000000..a8d8a2f2
--- /dev/null
+++ b/samples/SystemBarRight/res/drawable/car_ic_apps.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:viewportWidth="44"
+        android:viewportHeight="44"
+        android:width="44dp"
+        android:height="44dp">
+<path
+    android:pathData="M7.33333333 14.6666667L14.6666667 14.6666667L14.6666667 7.33333333L7.33333333 7.33333333L7.33333333 14.6666667ZM18.3333333 36.6666667L25.6666667 36.6666667L25.6666667 29.3333333L18.3333333 29.3333333L18.3333333 36.6666667ZM7.33333333 36.6666667L14.6666667 36.6666667L14.6666667 29.3333333L7.33333333 29.3333333L7.33333333 36.6666667ZM7.33333333 25.6666667L14.6666667 25.6666667L14.6666667 18.3333333L7.33333333 18.3333333L7.33333333 25.6666667ZM18.3333333 25.6666667L25.6666667 25.6666667L25.6666667 18.3333333L18.3333333 18.3333333L18.3333333 25.6666667ZM29.3333333 7.33333333L29.3333333 14.6666667L36.6666667 14.6666667L36.6666667 7.33333333L29.3333333 7.33333333ZM18.3333333 14.6666667L25.6666667 14.6666667L25.6666667 7.33333333L18.3333333 7.33333333L18.3333333 14.6666667ZM29.3333333 25.6666667L36.6666667 25.6666667L36.6666667 18.3333333L29.3333333 18.3333333L29.3333333 25.6666667ZM29.3333333 36.6666667L36.6666667 36.6666667L36.6666667 29.3333333L29.3333333 29.3333333L29.3333333 36.6666667Z"
+    android:fillColor="@color/car_nav_icon_fill_color" />
+</vector>
+\ No newline at end of file
diff --git a/samples/SystemBarRight/res/drawable/car_ic_apps_selected.xml b/samples/SystemBarRight/res/drawable/car_ic_apps_selected.xml
new file mode 100644
index 00000000..2a4e91aa
--- /dev/null
+++ b/samples/SystemBarRight/res/drawable/car_ic_apps_selected.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:viewportWidth="44"
+        android:viewportHeight="44"
+        android:width="44dp"
+        android:height="44dp">
+    <path
+        android:pathData="M7.33333333 14.6666667L14.6666667 14.6666667L14.6666667 7.33333333L7.33333333 7.33333333L7.33333333 14.6666667ZM18.3333333 36.6666667L25.6666667 36.6666667L25.6666667 29.3333333L18.3333333 29.3333333L18.3333333 36.6666667ZM7.33333333 36.6666667L14.6666667 36.6666667L14.6666667 29.3333333L7.33333333 29.3333333L7.33333333 36.6666667ZM7.33333333 25.6666667L14.6666667 25.6666667L14.6666667 18.3333333L7.33333333 18.3333333L7.33333333 25.6666667ZM18.3333333 25.6666667L25.6666667 25.6666667L25.6666667 18.3333333L18.3333333 18.3333333L18.3333333 25.6666667ZM29.3333333 7.33333333L29.3333333 14.6666667L36.6666667 14.6666667L36.6666667 7.33333333L29.3333333 7.33333333ZM18.3333333 14.6666667L25.6666667 14.6666667L25.6666667 7.33333333L18.3333333 7.33333333L18.3333333 14.6666667ZM29.3333333 25.6666667L36.6666667 25.6666667L36.6666667 18.3333333L29.3333333 18.3333333L29.3333333 25.6666667ZM29.3333333 36.6666667L36.6666667 36.6666667L36.6666667 29.3333333L29.3333333 29.3333333L29.3333333 36.6666667Z"
+        android:fillColor="@color/car_nav_icon_fill_color_selected" />
+</vector>
+\ No newline at end of file
diff --git a/samples/SystemBarRight/res/drawable/car_ic_music.xml b/samples/SystemBarRight/res/drawable/car_ic_music.xml
new file mode 100644
index 00000000..6339ebb3
--- /dev/null
+++ b/samples/SystemBarRight/res/drawable/car_ic_music.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:viewportWidth="44"
+    android:viewportHeight="44"
+    android:width="44dp"
+    android:height="44dp">
+    <path
+        android:pathData="M22 5.5L22 24.8416667C20.9183333 24.2183333 19.6716667 23.8333333 18.3333333 23.8333333C14.2816667 23.8333333 11 27.115 11 31.1666667C11 35.2183333 14.2816667 38.5 18.3333333 38.5C22.385 38.5 25.6666667 35.2183333 25.6666667 31.1666667L25.6666667 12.8333333L33 12.8333333L33 5.5L22 5.5Z"
+        android:fillColor="@color/car_nav_icon_fill_color" />
+</vector>
+\ No newline at end of file
diff --git a/samples/SystemBarRight/res/drawable/car_ic_music_selected.xml b/samples/SystemBarRight/res/drawable/car_ic_music_selected.xml
new file mode 100644
index 00000000..a56bcb38
--- /dev/null
+++ b/samples/SystemBarRight/res/drawable/car_ic_music_selected.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:viewportWidth="44"
+        android:viewportHeight="44"
+        android:width="44dp"
+        android:height="44dp">
+    <path
+        android:pathData="M22 5.5L22 24.8416667C20.9183333 24.2183333 19.6716667 23.8333333 18.3333333 23.8333333C14.2816667 23.8333333 11 27.115 11 31.1666667C11 35.2183333 14.2816667 38.5 18.3333333 38.5C22.385 38.5 25.6666667 35.2183333 25.6666667 31.1666667L25.6666667 12.8333333L33 12.8333333L33 5.5L22 5.5Z"
+        android:fillColor="@color/car_nav_icon_fill_color_selected" />
+</vector>
+\ No newline at end of file
diff --git a/samples/SystemBarRight/res/drawable/car_ic_navigation.xml b/samples/SystemBarRight/res/drawable/car_ic_navigation.xml
new file mode 100644
index 00000000..e1fabe07
--- /dev/null
+++ b/samples/SystemBarRight/res/drawable/car_ic_navigation.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:viewportWidth="44"
+    android:viewportHeight="44"
+    android:width="44dp"
+    android:height="44dp">
+    <path
+        android:pathData="M39.8016667 20.6983333L23.3016667 4.19833333C22.5866667 3.48333333 21.4316667 3.48333333 20.7166667 4.19833333L4.21666667 20.6983333C3.50166667 21.4133333 3.50166667 22.5683333 4.21666667 23.2833333L20.7166667 39.7833333C21.4316667 40.4983333 22.5866667 40.4983333 23.3016667 39.7833333L39.8016667 23.2833333C40.5166667 22.5866667 40.5166667 21.4316667 39.8016667 20.6983333ZM25.6666667 26.5833333L25.6666667 22L18.3333333 22L18.3333333 27.5L14.6666667 27.5L14.6666667 20.1666667C14.6666667 19.1583333 15.4916667 18.3333333 16.5 18.3333333L25.6666667 18.3333333L25.6666667 13.75L32.0833333 20.1666667L25.6666667 26.5833333Z"
+        android:fillColor="@color/car_nav_icon_fill_color" />
+</vector>
+\ No newline at end of file
diff --git a/samples/SystemBarRight/res/drawable/car_ic_navigation_selected.xml b/samples/SystemBarRight/res/drawable/car_ic_navigation_selected.xml
new file mode 100644
index 00000000..d11cf28f
--- /dev/null
+++ b/samples/SystemBarRight/res/drawable/car_ic_navigation_selected.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:viewportWidth="44"
+        android:viewportHeight="44"
+        android:width="44dp"
+        android:height="44dp">
+    <path
+        android:pathData="M39.8016667 20.6983333L23.3016667 4.19833333C22.5866667 3.48333333 21.4316667 3.48333333 20.7166667 4.19833333L4.21666667 20.6983333C3.50166667 21.4133333 3.50166667 22.5683333 4.21666667 23.2833333L20.7166667 39.7833333C21.4316667 40.4983333 22.5866667 40.4983333 23.3016667 39.7833333L39.8016667 23.2833333C40.5166667 22.5866667 40.5166667 21.4316667 39.8016667 20.6983333ZM25.6666667 26.5833333L25.6666667 22L18.3333333 22L18.3333333 27.5L14.6666667 27.5L14.6666667 20.1666667C14.6666667 19.1583333 15.4916667 18.3333333 16.5 18.3333333L25.6666667 18.3333333L25.6666667 13.75L32.0833333 20.1666667L25.6666667 26.5833333Z"
+        android:fillColor="@color/car_nav_icon_fill_color_selected" />
+</vector>
+\ No newline at end of file
diff --git a/samples/SystemBarRight/res/drawable/car_ic_overview.xml b/samples/SystemBarRight/res/drawable/car_ic_overview.xml
new file mode 100644
index 00000000..d2190d7c
--- /dev/null
+++ b/samples/SystemBarRight/res/drawable/car_ic_overview.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="56dp"
+    android:height="56dp"
+    android:viewportWidth="56"
+    android:viewportHeight="56">
+    <path
+        android:pathData="M9.333,21L28,7L46.667,21V49H9.333V21ZM35,44.333H42V23.333L28,12.833L14,23.333V44.333H21V30.333H35V44.333Z"
+        android:fillColor="@color/car_nav_icon_fill_color"
+        android:fillType="evenOdd"
+       />
+</vector>
+\ No newline at end of file
diff --git a/samples/SystemBarRight/res/drawable/car_ic_overview_selected.xml b/samples/SystemBarRight/res/drawable/car_ic_overview_selected.xml
new file mode 100644
index 00000000..bcfbc149
--- /dev/null
+++ b/samples/SystemBarRight/res/drawable/car_ic_overview_selected.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="56dp"
+    android:height="56dp"
+    android:viewportWidth="56"
+    android:viewportHeight="56">
+    <path
+        android:pathData="M9.333,21L28,7L46.667,21V49H9.333V21ZM35,44.333H42V23.333L28,12.833L14,23.333V44.333H21V30.333H35V44.333Z"
+        android:fillColor="@color/car_nav_icon_fill_color_selected"
+        android:fillType="evenOdd"
+       />
+</vector>
+\ No newline at end of file
diff --git a/samples/SystemBarRight/res/drawable/car_ic_phone.xml b/samples/SystemBarRight/res/drawable/car_ic_phone.xml
new file mode 100644
index 00000000..50e36b5a
--- /dev/null
+++ b/samples/SystemBarRight/res/drawable/car_ic_phone.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:viewportWidth="44"
+    android:viewportHeight="44"
+    android:width="44dp"
+    android:height="44dp">
+    <path
+        android:pathData="M12.1366667 19.7816667C14.7766667 24.97 19.03 29.205 24.2183333 31.8633333L28.2516667 27.83C28.7466667 27.335 29.48 27.17 30.1216667 27.39C32.175 28.0683333 34.3933333 28.435 36.6666667 28.435C37.675 28.435 38.5 29.26 38.5 30.2683333L38.5 36.6666667C38.5 37.675 37.675 38.5 36.6666667 38.5C19.4516667 38.5 5.5 24.5483333 5.5 7.33333333C5.5 6.325 6.325 5.5 7.33333333 5.5L13.75 5.5C14.7583333 5.5 15.5833333 6.325 15.5833333 7.33333333C15.5833333 9.625 15.95 11.825 16.6283333 13.8783333C16.83 14.52 16.6833333 15.235 16.17 15.7483333L12.1366667 19.7816667Z"
+        android:fillColor="@color/car_nav_icon_fill_color" />
+</vector>
+\ No newline at end of file
diff --git a/samples/SystemBarRight/res/drawable/car_ic_phone_selected.xml b/samples/SystemBarRight/res/drawable/car_ic_phone_selected.xml
new file mode 100644
index 00000000..11b1687c
--- /dev/null
+++ b/samples/SystemBarRight/res/drawable/car_ic_phone_selected.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:viewportWidth="44"
+        android:viewportHeight="44"
+        android:width="44dp"
+        android:height="44dp">
+    <path
+        android:pathData="M12.1366667 19.7816667C14.7766667 24.97 19.03 29.205 24.2183333 31.8633333L28.2516667 27.83C28.7466667 27.335 29.48 27.17 30.1216667 27.39C32.175 28.0683333 34.3933333 28.435 36.6666667 28.435C37.675 28.435 38.5 29.26 38.5 30.2683333L38.5 36.6666667C38.5 37.675 37.675 38.5 36.6666667 38.5C19.4516667 38.5 5.5 24.5483333 5.5 7.33333333C5.5 6.325 6.325 5.5 7.33333333 5.5L13.75 5.5C14.7583333 5.5 15.5833333 6.325 15.5833333 7.33333333C15.5833333 9.625 15.95 11.825 16.6283333 13.8783333C16.83 14.52 16.6833333 15.235 16.17 15.7483333L12.1366667 19.7816667Z"
+        android:fillColor="@color/car_nav_icon_fill_color_selected" />
+</vector>
+\ No newline at end of file
diff --git a/samples/SystemBarRight/res/layout/car_right_system_bar.xml b/samples/SystemBarRight/res/layout/car_right_system_bar.xml
new file mode 100644
index 00000000..d915ce9d
--- /dev/null
+++ b/samples/SystemBarRight/res/layout/car_right_system_bar.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+-->
+<com.android.systemui.car.systembar.CarSystemBarView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:systemui="http://schemas.android.com/apk/res-auto"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:weightSum="3"
+    android:layoutDirection="ltr"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="top"
+        android:paddingTop="20dp"
+        android:layout_weight="1"
+        android:layoutDirection="ltr"
+        android:orientation="vertical">
+        <FrameLayout
+            android:id="@+id/clock_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <com.android.systemui.statusbar.policy.Clock
+                android:id="@+id/clock"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:elevation="5dp"
+                android:singleLine="true" />
+        </FrameLayout>
+      <LinearLayout
+            android:id="@+id/qc_entry_points_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/nav_buttons"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:layoutDirection="ltr"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <com.android.systemui.car.systembar.CarSystemBarButton
+            android:id="@+id/maps_nav"
+            android:contentDescription="@string/system_bar_maps_label"
+            style="@style/SystemBarButton"
+            systemui:categories="android.intent.category.APP_MAPS"
+            systemui:icon="@drawable/car_ic_navigation"
+            systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MAPS;launchFlags=0x14000000;end"
+            systemui:selectedIcon="@drawable/car_ic_navigation_selected"
+            systemui:highlightWhenSelected="true"/>
+
+        <com.android.systemui.car.systembar.CarSystemBarButton
+            android:id="@+id/music_nav"
+            android:contentDescription="@string/system_bar_media_label"
+            style="@style/SystemBarButton"
+            systemui:categories="android.intent.category.APP_MUSIC"
+            systemui:icon="@drawable/car_ic_music"
+            systemui:intent="intent:#Intent;action=android.car.intent.action.MEDIA_TEMPLATE;launchFlags=0x10000000;end"
+            systemui:packages="com.android.car.media"
+            systemui:selectedIcon="@drawable/car_ic_music_selected"
+            systemui:highlightWhenSelected="true"/>
+
+        <com.android.systemui.car.systembar.CarSystemBarButton
+            android:id="@+id/phone_nav"
+            android:contentDescription="@string/system_bar_phone_label"
+            style="@style/SystemBarButton"
+            systemui:icon="@drawable/car_ic_phone"
+            systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.LAUNCHER;package=com.android.car.dialer;launchFlags=0x10000000;end"
+            systemui:packages="com.android.car.dialer"
+            systemui:selectedIcon="@drawable/car_ic_phone_selected"
+            systemui:highlightWhenSelected="true"/>
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="bottom"
+        android:layout_weight="1"
+        android:layoutDirection="ltr"
+        android:orientation="vertical">
+        <com.android.systemui.car.systembar.CarSystemBarButton
+            android:id="@+id/home"
+            android:contentDescription="@string/system_bar_home_label"
+            style="@style/SystemBarButton"
+            systemui:componentNames="com.android.car.carlauncher/.CarLauncher"
+            systemui:icon="@drawable/car_ic_overview"
+            systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;launchFlags=0x14000000;end"
+            systemui:selectedIcon="@drawable/car_ic_overview_selected"
+            systemui:highlightWhenSelected="true"/>
+
+        <com.android.systemui.car.systembar.CarSystemBarButton
+            android:id="@+id/grid_nav"
+            android:contentDescription="@string/system_bar_applications_label"
+            style="@style/SystemBarButton"
+            systemui:componentNames="@string/config_appGridComponentName"
+            systemui:icon="@drawable/car_ic_apps"
+            systemui:intent="intent:#Intent;action=com.android.car.carlauncher.ACTION_APP_GRID;package=com.android.car.carlauncher;launchFlags=0x24000000;end"
+            systemui:selectedIcon="@drawable/car_ic_apps_selected"
+            systemui:highlightWhenSelected="true"/>
+    </LinearLayout>
+</com.android.systemui.car.systembar.CarSystemBarView>
diff --git a/samples/SystemBarRight/res/values/attrs.xml b/samples/SystemBarRight/res/values/attrs.xml
new file mode 100644
index 00000000..f7971552
--- /dev/null
+++ b/samples/SystemBarRight/res/values/attrs.xml
@@ -0,0 +1,44 @@
+<?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.
+  -->
+
+<resources>
+    <attr name="broadcast" format="boolean"/>
+    <attr name="selectedIcon" format="reference"/>
+    <attr name="icon" format="reference"/>
+    <attr name="intent" format="string"/>
+    <attr name="longIntent" format="string"/>
+    <attr name="componentNames" format="string" />
+    <attr name="highlightWhenSelected" format="boolean" />
+    <attr name="categories" format="string"/>
+    <attr name="packages" format="string" />
+
+    <!-- Custom attributes to configure hvac values -->
+    <declare-styleable name="AnimatedTemperatureView">
+        <attr name="hvacAreaId" format="integer"/>
+        <attr name="hvacPropertyId" format="integer"/>
+        <attr name="hvacTempFormat" format="string"/>
+        <!-- how far away the animations should center around -->
+        <attr name="hvacPivotOffset" format="dimension"/>
+        <attr name="hvacMinValue" format="float"/>
+        <attr name="hvacMaxValue" format="float"/>
+        <attr name="hvacMinText" format="string|reference"/>
+        <attr name="hvacMaxText" format="string|reference"/>
+        <attr name="android:gravity"/>
+        <attr name="android:minEms"/>
+        <attr name="android:textAppearance"/>
+    </declare-styleable>
+</resources>
diff --git a/samples/SystemBarRight/res/values/colors.xml b/samples/SystemBarRight/res/values/colors.xml
new file mode 100644
index 00000000..c32d6386
--- /dev/null
+++ b/samples/SystemBarRight/res/values/colors.xml
@@ -0,0 +1,20 @@
+<?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.
+  -->
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <color name="car_nav_icon_fill_color">#8F8F8F</color>
+    <color name="car_nav_icon_fill_color_selected">#FFFFFF</color>
+</resources>
diff --git a/samples/SystemBarRight/res/values/config.xml b/samples/SystemBarRight/res/values/config.xml
new file mode 100644
index 00000000..51747c22
--- /dev/null
+++ b/samples/SystemBarRight/res/values/config.xml
@@ -0,0 +1,66 @@
+<?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.
+  -->
+
+<resources>
+    <!-- Configure which system bars should be displayed. -->
+    <bool name="config_enableTopSystemBar">false</bool>
+    <bool name="config_enableLeftSystemBar">false</bool>
+    <bool name="config_enableRightSystemBar">true</bool>
+    <bool name="config_enableBottomSystemBar">false</bool>
+
+    <!-- Configure the type of each system bar. Each system bar must have a unique type. -->
+    <!--    STATUS_BAR = 0-->
+    <!--    NAVIGATION_BAR = 1-->
+    <!--    STATUS_BAR_EXTRA = 2-->
+    <!--    NAVIGATION_BAR_EXTRA = 3-->
+    <integer name="config_topSystemBarType">2</integer>
+    <integer name="config_leftSystemBarType">0</integer>
+    <integer name="config_rightSystemBarType">1</integer>
+    <integer name="config_bottomSystemBarType">3</integer>
+
+    <!-- Configure the relative z-order among the system bars. When two system bars overlap (e.g.
+         if both top bar and left bar are enabled, it creates an overlapping space in the upper left
+         corner), the system bar with the higher z-order takes the overlapping space and padding is
+         applied to the other bar.-->
+    <!-- NOTE: If two overlapping system bars have the same z-order, SystemBarConfigs will throw a
+         RuntimeException, since their placing order cannot be determined. Bars that do not overlap
+         are allowed to have the same z-order. -->
+    <!-- NOTE: If the z-order of a bar is 10 or above, it will also appear on top of HUN's.    -->
+    <integer name="config_topSystemBarZOrder">0</integer>
+    <integer name="config_leftSystemBarZOrder">0</integer>
+    <integer name="config_rightSystemBarZOrder">10</integer>
+    <integer name="config_bottomSystemBarZOrder">0</integer>
+
+    <!-- Whether heads-up notifications should be shown on the bottom. If false, heads-up
+         notifications will be shown pushed to the top of their parent container. If true, they will
+         be shown pushed to the bottom of their parent container. If true, then should override
+         config_headsUpNotificationAnimationHelper to use a different AnimationHelper, such as
+         com.android.car.notification.headsup.animationhelper.
+         CarHeadsUpNotificationBottomAnimationHelper. -->
+    <bool name="config_showHeadsUpNotificationOnBottom">true</bool>
+
+    <string name="config_notificationPanelViewMediator" translatable="false">
+        com.android.systemui.car.notification.NotificationPanelViewMediator</string>
+
+    <string name="config_appGridComponentName" translatable="false">
+        com.android.car.carlauncher/.AppGridActivity</string>
+
+     <string-array name="config_quickControlsEntryPointIconControllers" translatable="false">
+        <item>com.android.systemui.car.statusicon.ui.SignalStatusIconController</item>
+        <item>com.android.systemui.car.statusicon.ui.DisplayStatusIconController</item>
+     </string-array>
+</resources>
+\ No newline at end of file
diff --git a/samples/sample3/rro/res/values/dimens.xml b/samples/SystemBarRight/res/values/dimens.xml
index 5db4c97a..5db4c97a 100644
--- a/samples/sample3/rro/res/values/dimens.xml
+++ b/samples/SystemBarRight/res/values/dimens.xml
diff --git a/samples/SystemBarRight/res/values/strings.xml b/samples/SystemBarRight/res/values/strings.xml
new file mode 100644
index 00000000..99ec9284
--- /dev/null
+++ b/samples/SystemBarRight/res/values/strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+    <!-- Content description strings for system bar icons. Strings should be added for all drawables
+         to enable Talkback for accessibility. -->
+    <string name="system_bar_home_label">Home Screen</string>
+    <string name="system_bar_maps_label">Maps</string>
+    <string name="system_bar_media_label">Media</string>
+    <string name="system_bar_phone_label">Phone</string>
+    <string name="system_bar_applications_label">Applications</string>
+</resources>
+\ No newline at end of file
diff --git a/samples/sample3/rro/res/values/styles.xml b/samples/SystemBarRight/res/values/styles.xml
index 7ebb14dc..7ebb14dc 100644
--- a/samples/sample3/rro/res/values/styles.xml
+++ b/samples/SystemBarRight/res/values/styles.xml
diff --git a/samples/sample3/rro/res/xml/car_sysui_overlays.xml b/samples/SystemBarRight/res/xml/car_sysui_overlays.xml
index 5c7f71e3..7b6c2172 100644
--- a/samples/sample3/rro/res/xml/car_sysui_overlays.xml
+++ b/samples/SystemBarRight/res/xml/car_sysui_overlays.xml
@@ -1,4 +1,4 @@
-
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2020 The Android Open Source Project
   ~
@@ -14,11 +14,10 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-
 <overlay>
-    <item target="layout/car_bottom_system_bar" value="@layout/car_bottom_system_bar"/>
-    <item target="layout/car_left_system_bar" value="@layout/car_left_system_bar"/>
+    <item target="layout/car_right_system_bar" value="@layout/car_right_system_bar"/>
     <item target="string/config_appGridComponentName" value="@string/config_appGridComponentName"/>
+    <item target="array/config_quickControlsEntryPointIconControllers" value="@array/config_quickControlsEntryPointIconControllers"/>
 
     <item target="bool/config_enableTopSystemBar" value="@bool/config_enableTopSystemBar"/>
     <item target="bool/config_enableLeftSystemBar" value="@bool/config_enableLeftSystemBar"/>
@@ -26,6 +25,7 @@
     <item target="bool/config_enableBottomSystemBar" value="@bool/config_enableBottomSystemBar"/>
     <item target="bool/config_showHeadsUpNotificationOnBottom" value="@bool/config_showHeadsUpNotificationOnBottom"/>
 
+    <item target="attr/selectedIcon" value="@attr/selectedIcon"/>
     <item target="attr/icon" value="@attr/icon"/>
     <item target="attr/intent" value="@attr/intent"/>
     <item target="attr/longIntent" value="@attr/longIntent"/>
@@ -45,15 +45,17 @@
     <item target="attr/broadcast" value="@attr/broadcast"/>
 
     <item target="color/car_nav_icon_fill_color" value="@color/car_nav_icon_fill_color" />
-
+    <item target="color/car_nav_icon_fill_color_selected" value="@color/car_nav_icon_fill_color_selected" />
     <item target="drawable/car_ic_overview" value="@drawable/car_ic_overview" />
-    <item target="drawable/car_ic_home" value="@drawable/car_ic_home" />
-    <item target="drawable/car_ic_hvac" value="@drawable/car_ic_hvac" />
+    <item target="drawable/car_ic_overview_selected" value="@drawable/car_ic_overview_selected" />
     <item target="drawable/car_ic_apps" value="@drawable/car_ic_apps" />
+    <item target="drawable/car_ic_apps_selected" value="@drawable/car_ic_apps_selected" />
     <item target="drawable/car_ic_music" value="@drawable/car_ic_music" />
-    <item target="drawable/car_ic_notification" value="@drawable/car_ic_notification" />
+    <item target="drawable/car_ic_music_selected" value="@drawable/car_ic_music_selected" />
     <item target="drawable/car_ic_phone" value="@drawable/car_ic_phone" />
+    <item target="drawable/car_ic_phone_selected" value="@drawable/car_ic_phone_selected" />
     <item target="drawable/car_ic_navigation" value="@drawable/car_ic_navigation" />
+    <item target="drawable/car_ic_navigation_selected" value="@drawable/car_ic_navigation_selected" />
 
     <item target="dimen/car_left_system_bar_width" value="@dimen/car_left_system_bar_width" />
     <item target="dimen/car_keyline_1" value="@dimen/car_keyline_1" />
@@ -73,4 +75,5 @@
     <item target="string/config_notificationPanelViewMediator" value="@string/config_notificationPanelViewMediator"/>
 
     <item target="style/SystemBarButton" value="@style/SystemBarButton"/>
+    <item target="id/qc_entry_points_container" value="@id/qc_entry_points_container"/>
 </overlay>
 \ No newline at end of file
diff --git a/samples/sample1/rro/res/drawable/system_bar_background_2.xml b/samples/sample1/rro/res/drawable/system_bar_background_2.xml
deleted file mode 100644
index 35821426..00000000
--- a/samples/sample1/rro/res/drawable/system_bar_background_2.xml
+++ /dev/null
@@ -1,33 +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.
-  -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
-    <corners
-        android:topLeftRadius="10dp"
-        android:topRightRadius="0dp"
-        android:bottomLeftRadius="0dp"
-        android:bottomRightRadius="0dp"
-    />
-    <solid
-        android:color="#404040"
-    />
-    <padding
-        android:left="0dp"
-        android:top="0dp"
-        android:right="0dp"
-        android:bottom="0dp"
-    />
-</shape>
-\ No newline at end of file
diff --git a/samples/sample1/rro/res/layout/car_right_system_bar.xml b/samples/sample1/rro/res/layout/car_right_system_bar.xml
deleted file mode 100644
index d4e66785..00000000
--- a/samples/sample1/rro/res/layout/car_right_system_bar.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2018, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<com.android.systemui.car.systembar.CarSystemBarView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:systemui="http://schemas.android.com/apk/res-auto"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent"
-    android:orientation="vertical"
-    android:baselineAligned="false"
-    android:background="@android:color/transparent">
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="110dp"
-        android:background="@drawable/system_bar_background_3">
-        <FrameLayout
-            android:id="@+id/clock_container"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_centerInParent="true"
-            android:paddingStart="@*android:dimen/car_padding_2"
-            android:paddingEnd="@*android:dimen/car_padding_2">
-            <com.android.systemui.statusbar.policy.Clock
-                android:id="@+id/clock"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:elevation="5dp"
-                android:singleLine="true"
-                android:textAppearance="@style/TextAppearance.StatusBar.Clock"
-            />
-        </FrameLayout>
-    </RelativeLayout>
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-    />
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="110dp"
-        android:layout_gravity="bottom"
-        android:orientation="horizontal"
-        android:background="@drawable/system_bar_background_2">
-
-        <FrameLayout
-            android:id="@+id/left_hvac_container"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentStart="true">
-
-            <com.android.systemui.car.systembar.CarSystemBarButton
-                android:id="@+id/hvacleft"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@null"
-                systemui:broadcast="true"
-            />
-        </FrameLayout>
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-        />
-        <FrameLayout
-            android:id="@+id/right_hvac_container"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentEnd="true">
-
-            <com.android.systemui.car.systembar.CarSystemBarButton
-                android:id="@+id/hvacright"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@null"
-                systemui:broadcast="true"
-            />
-        </FrameLayout>
-    </LinearLayout>
-</com.android.systemui.car.systembar.CarSystemBarView>
diff --git a/samples/sample2/rro/res/drawable/car_ic_notification.xml b/samples/sample2/rro/res/drawable/car_ic_notification.xml
deleted file mode 100644
index 3c3fefc9..00000000
--- a/samples/sample2/rro/res/drawable/car_ic_notification.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="44dp"
-        android:height="44dp"
-        android:viewportWidth="44"
-        android:viewportHeight="44">
-    <path
-        android:pathData="M22 39.125C23.925 39.125 25.5 37.55 25.5 35.625L18.5 35.625C18.5 37.55 20.0575 39.125 22 39.125ZM32.5 28.625L32.5 19.875C32.5 14.5025 29.63 10.005 24.625 8.815L24.625 7.625C24.625 6.1725 23.4525 5 22 5C20.5475 5 19.375 6.1725 19.375 7.625L19.375 8.815C14.3525 10.005 11.5 14.485 11.5 19.875L11.5 28.625L8 32.125L8 33.875L36 33.875L36 32.125L32.5 28.625Z"
-        android:fillColor="@color/car_nav_icon_fill_color" />
-</vector>
-\ No newline at end of file
diff --git a/samples/sample2/rro/res/drawable/system_bar_background.xml b/samples/sample2/rro/res/drawable/system_bar_background.xml
deleted file mode 100644
index 6161ad9b..00000000
--- a/samples/sample2/rro/res/drawable/system_bar_background.xml
+++ /dev/null
@@ -1,33 +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.
-  -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
-    <corners
-        android:topLeftRadius="0dp"
-        android:topRightRadius="10dp"
-        android:bottomLeftRadius="0dp"
-        android:bottomRightRadius="0dp"
-    />
-    <solid
-        android:color="#404040"
-    />
-    <padding
-        android:left="0dp"
-        android:top="0dp"
-        android:right="0dp"
-        android:bottom="0dp"
-    />
-</shape>
-\ No newline at end of file
diff --git a/samples/sample2/rro/res/layout/car_left_system_bar.xml b/samples/sample2/rro/res/layout/car_left_system_bar.xml
deleted file mode 100644
index 0ae9ab46..00000000
--- a/samples/sample2/rro/res/layout/car_left_system_bar.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2018, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<com.android.systemui.car.systembar.CarSystemBarView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:systemui="http://schemas.android.com/apk/res-auto"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent"
-    android:orientation="vertical"
-    android:background="@drawable/system_bar_background">
-
-    <com.android.systemui.car.systembar.CarSystemBarButton
-        android:id="@+id/home"
-        android:contentDescription="@string/system_bar_home_label"
-        style="@style/SystemBarButton"
-        systemui:componentNames="com.android.car.carlauncher/.CarLauncher"
-        systemui:icon="@drawable/car_ic_overview"
-        systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;launchFlags=0x14000000;end"
-        systemui:highlightWhenSelected="true"/>
-
-    <com.android.systemui.car.systembar.CarSystemBarButton
-        android:id="@+id/maps_nav"
-        android:contentDescription="@string/system_bar_maps_label"
-        style="@style/SystemBarButton"
-        systemui:categories="android.intent.category.APP_MAPS"
-        systemui:icon="@drawable/car_ic_navigation"
-        systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MAPS;launchFlags=0x14000000;end"
-        systemui:highlightWhenSelected="true"/>
-
-    <com.android.systemui.car.systembar.CarSystemBarButton
-        android:id="@+id/music_nav"
-        android:contentDescription="@string/system_bar_media_label"
-        style="@style/SystemBarButton"
-        systemui:categories="android.intent.category.APP_MUSIC"
-        systemui:icon="@drawable/car_ic_music"
-        systemui:intent="intent:#Intent;action=android.car.intent.action.MEDIA_TEMPLATE;launchFlags=0x10000000;end"
-        systemui:packages="com.android.car.media"
-        systemui:highlightWhenSelected="true"/>
-
-
-    <com.android.systemui.car.systembar.CarSystemBarButton
-        android:id="@+id/grid_nav"
-        android:contentDescription="@string/system_bar_applications_label"
-        style="@style/SystemBarButton"
-        systemui:componentNames="@string/config_appGridComponentName"
-        systemui:icon="@drawable/car_ic_apps"
-        systemui:intent="intent:#Intent;action=com.android.car.carlauncher.ACTION_APP_GRID;package=com.android.car.carlauncher;launchFlags=0x24000000;end"
-        systemui:highlightWhenSelected="true"/>
-
-    <com.android.systemui.car.systembar.CarSystemBarButton
-        android:id="@+id/phone_nav"
-        android:contentDescription="@string/system_bar_phone_label"
-        style="@style/SystemBarButton"
-        systemui:icon="@drawable/car_ic_phone"
-        systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.LAUNCHER;package=com.android.car.dialer;launchFlags=0x10000000;end"
-        systemui:packages="com.android.car.dialer"
-        systemui:highlightWhenSelected="true"/>
-
-    <com.android.systemui.car.systembar.CarSystemBarButton
-        android:id="@+id/notifications"
-        android:contentDescription="@string/system_bar_notifications_label"
-        style="@style/SystemBarButton"
-        systemui:highlightWhenSelected="true"
-        systemui:icon="@drawable/car_ic_notification"
-        systemui:longIntent="intent:#Intent;action=com.android.car.bugreport.action.START_AUDIO_FIRST;component=com.android.car.bugreport/.BugReportActivity;end"/>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:gravity="bottom"
-        android:orientation="vertical">
-
-        <com.android.systemui.statusbar.policy.Clock
-            android:id="@+id/clock"
-            android:textAppearance="@style/TextAppearance.StatusBar.Clock"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:singleLine="true"
-            android:gravity="center_horizontal"
-            android:paddingBottom="20dp"/>
-
-        <Space
-            android:layout_height="10dp"
-            android:layout_width="match_parent"/>
-
-    </LinearLayout>
-
-</com.android.systemui.car.systembar.CarSystemBarView>
diff --git a/samples/sample3/rro/res/drawable/car_ic_hvac.xml b/samples/sample3/rro/res/drawable/car_ic_hvac.xml
deleted file mode 100644
index 55c968ea..00000000
--- a/samples/sample3/rro/res/drawable/car_ic_hvac.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2018 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="@dimen/system_bar_icon_drawing_size"
-        android:height="@dimen/system_bar_icon_drawing_size"
-        android:viewportWidth="24"
-        android:viewportHeight="24">
-    <path
-        android:pathData="M16.34,8.36l-2.29,0.82c-0.18,-0.13 -0.38,-0.25 -0.58,-0.34c0.17,-0.83 0.63,-1.58 1.36,-2.06C16.85,5.44 16.18,2 13.39,2C9,2 7.16,5.01 8.36,7.66l0.82,2.29c-0.13,0.18 -0.25,0.38 -0.34,0.58c-0.83,-0.17 -1.58,-0.63 -2.06,-1.36C5.44,7.15 2,7.82 2,10.61c0,4.4 3.01,6.24 5.66,5.03l2.29,-0.82c0.18,0.13 0.38,0.25 0.58,0.34c-0.17,0.83 -0.63,1.58 -1.36,2.06C7.15,18.56 7.82,22 10.61,22c4.4,0 6.24,-3.01 5.03,-5.66l-0.82,-2.29c0.13,-0.18 0.25,-0.38 0.34,-0.58c0.83,0.17 1.58,0.63 2.06,1.36c1.34,2.01 4.77,1.34 4.77,-1.45C22,9 18.99,7.16 16.34,8.36zM12,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5c0,-0.83 0.67,-1.5 1.5,-1.5c0.83,0 1.5,0.67 1.5,1.5C13.5,12.83 12.83,13.5 12,13.5zM10.24,5.22C10.74,4.44 11.89,4 13.39,4c0.79,0 0.71,0.86 0.34,1.11c-1.22,0.81 -2,2.06 -2.25,3.44c-0.21,0.03 -0.42,0.08 -0.62,0.15l-0.68,-1.88C10,6.42 9.86,5.81 10.24,5.22zM6.83,13.82c-0.4,0.18 -1.01,0.32 -1.61,-0.06C4.44,13.26 4,12.11 4,10.61c0,-0.79 0.86,-0.71 1.11,-0.34c0.81,1.22 2.06,2 3.44,2.25c0.03,0.21 0.08,0.42 0.15,0.62L6.83,13.82zM13.76,18.78c-0.5,0.77 -1.65,1.22 -3.15,1.22c-0.79,0 -0.71,-0.86 -0.34,-1.11c1.22,-0.81 2,-2.06 2.25,-3.44c0.21,-0.03 0.42,-0.08 0.62,-0.15l0.68,1.88C14,17.58 14.14,18.18 13.76,18.78zM18.89,13.73c-0.81,-1.22 -2.06,-2 -3.44,-2.25c-0.03,-0.21 -0.08,-0.42 -0.15,-0.62l1.88,-0.68c0.4,-0.18 1.01,-0.32 1.61,0.06c0.77,0.5 1.22,1.65 1.22,3.15C20,14.19 19.14,14.11 18.89,13.73z"
-        android:fillColor="@color/car_nav_icon_fill_color" />
-</vector>
diff --git a/samples/sample3/rro/res/drawable/car_ic_notification.xml b/samples/sample3/rro/res/drawable/car_ic_notification.xml
deleted file mode 100644
index aabf9161..00000000
--- a/samples/sample3/rro/res/drawable/car_ic_notification.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="@dimen/system_bar_icon_drawing_size"
-        android:height="@dimen/system_bar_icon_drawing_size"
-        android:viewportWidth="44"
-        android:viewportHeight="44">
-    <path
-        android:pathData="M22 39.125C23.925 39.125 25.5 37.55 25.5 35.625L18.5 35.625C18.5 37.55 20.0575 39.125 22 39.125ZM32.5 28.625L32.5 19.875C32.5 14.5025 29.63 10.005 24.625 8.815L24.625 7.625C24.625 6.1725 23.4525 5 22 5C20.5475 5 19.375 6.1725 19.375 7.625L19.375 8.815C14.3525 10.005 11.5 14.485 11.5 19.875L11.5 28.625L8 32.125L8 33.875L36 33.875L36 32.125L32.5 28.625Z"
-        android:fillColor="@color/car_nav_icon_fill_color" />
-</vector>
-\ No newline at end of file
diff --git a/samples/sample3/rro/res/layout/car_bottom_system_bar.xml b/samples/sample3/rro/res/layout/car_bottom_system_bar.xml
deleted file mode 100644
index 0574bf2a..00000000
--- a/samples/sample3/rro/res/layout/car_bottom_system_bar.xml
+++ /dev/null
@@ -1,124 +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.
-  -->
-
-<com.android.systemui.car.systembar.CarSystemBarView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:systemui="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/system_bar_background"
-    android:gravity="center"
-    android:orientation="horizontal">
-
-    <RelativeLayout
-        android:id="@+id/nav_buttons"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layoutDirection="ltr">
-
-        <com.android.systemui.car.hvac.AdjustableTemperatureView
-            android:id="@+id/driver_hvac"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            systemui:hvacAreaId="49"
-            systemui:hvacTempFormat="%.0f\u00B0" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_centerInParent="true"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:layoutDirection="ltr"
-            android:paddingEnd="@dimen/system_bar_button_group_padding"
-            android:paddingStart="@dimen/system_bar_button_group_padding">
-
-            <Space
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"/>
-
-            <com.android.systemui.car.systembar.CarSystemBarButton
-                android:id="@+id/home"
-                android:contentDescription="@string/system_bar_home_label"
-                style="@style/SystemBarButton"
-                systemui:componentNames="com.android.car.carlauncher/.CarLauncher"
-                systemui:highlightWhenSelected="true"
-                systemui:icon="@drawable/car_ic_home"
-                systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;launchFlags=0x14000000;end"/>
-
-            <com.android.systemui.car.systembar.CarSystemBarButton
-                android:id="@+id/phone_nav"
-                style="@style/SystemBarButton"
-                systemui:highlightWhenSelected="true"
-                systemui:icon="@drawable/car_ic_phone"
-                systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.LAUNCHER;package=com.android.car.dialer;launchFlags=0x10000000;end"
-                systemui:packages="com.android.car.dialer"/>
-
-            <com.android.systemui.car.systembar.CarSystemBarButton
-                android:id="@+id/grid_nav"
-                android:contentDescription="@string/system_bar_applications_label"
-                style="@style/SystemBarButton"
-                systemui:componentNames="@string/config_appGridComponentName"
-                systemui:highlightWhenSelected="true"
-                systemui:icon="@drawable/car_ic_apps"
-                systemui:intent="intent:#Intent;action=com.android.car.carlauncher.ACTION_APP_GRID;package=com.android.car.carlauncher;launchFlags=0x24000000;end"/>
-
-            <com.android.systemui.car.systembar.HvacButton
-                android:id="@+id/hvac"
-                android:contentDescription="@string/system_bar_climate_control_label"
-                style="@style/SystemBarButton"
-                systemui:highlightWhenSelected="true"
-                systemui:icon="@drawable/car_ic_hvac"
-                systemui:broadcast="true"/>
-
-            <com.android.systemui.car.systembar.CarSystemBarButton
-                android:id="@+id/notifications"
-                android:contentDescription="@string/system_bar_notifications_label"
-                style="@style/SystemBarButton"
-                systemui:highlightWhenSelected="true"
-                systemui:icon="@drawable/car_ic_notification"
-                systemui:longIntent="intent:#Intent;action=com.android.car.bugreport.action.START_AUDIO_FIRST;component=com.android.car.bugreport/.BugReportActivity;end"/>
-
-            <Space
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"/>
-        </LinearLayout>
-
-        <com.android.systemui.car.hvac.AdjustableTemperatureView
-            android:id="@+id/passenger_hvac"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentEnd="true"
-            android:gravity="center_vertical"
-            systemui:hvacAreaId="68"
-            systemui:hvacTempFormat="%.0f\u00B0"/>
-    </RelativeLayout>
-
-    <LinearLayout
-        android:id="@+id/lock_screen_nav_buttons"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:layoutDirection="ltr"
-        android:paddingEnd="@dimen/car_keyline_1"
-        android:paddingStart="@dimen/car_keyline_1"
-        android:visibility="gone"/>
-</com.android.systemui.car.systembar.CarSystemBarView>
diff --git a/samples/sample3/rro/res/layout/car_left_system_bar.xml b/samples/sample3/rro/res/layout/car_left_system_bar.xml
deleted file mode 100644
index d9080048..00000000
--- a/samples/sample3/rro/res/layout/car_left_system_bar.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2018, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<com.android.systemui.car.systembar.CarSystemBarView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:systemui="http://schemas.android.com/apk/res-auto"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent"
-    android:orientation="vertical"
-    android:background="@android:color/transparent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:gravity="bottom"
-        android:orientation="vertical">
-
-        <com.android.systemui.statusbar.policy.Clock
-            android:id="@+id/clock"
-            android:textAppearance="@style/TextAppearance.StatusBar.Clock"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:singleLine="true"
-            android:gravity="center_horizontal"
-            android:paddingBottom="20dp"
-        />
-
-        <Space
-            android:layout_height="50dp"
-            android:layout_width="match_parent"/>
-
-    </LinearLayout>
-
-</com.android.systemui.car.systembar.CarSystemBarView>
diff --git a/src/com/android/systemui/CarSysUIComponent.java b/src/com/android/systemui/CarSysUIComponent.java
index 2d07ee45..cb78def9 100644
--- a/src/com/android/systemui/CarSysUIComponent.java
+++ b/src/com/android/systemui/CarSysUIComponent.java
@@ -20,14 +20,15 @@ import com.android.systemui.dagger.DependencyProvider;
 import com.android.systemui.dagger.SysUIComponent;
 import com.android.systemui.dagger.SysUISingleton;
 import com.android.systemui.dagger.SystemUIModule;
+import com.android.systemui.scene.ShadelessSceneContainerFrameworkModule;
 import com.android.systemui.wm.MDSystemBarsController;
 import com.android.wm.shell.RootTaskDisplayAreaOrganizer;
 
-import java.util.Optional;
-
 import dagger.BindsInstance;
 import dagger.Subcomponent;
 
+import java.util.Optional;
+
 /**
  * Dagger Subcomponent for Core SysUI.
  */
@@ -38,7 +39,8 @@ import dagger.Subcomponent;
         SystemUIModule.class,
         CarSystemUICoreStartableModule.class,
         CarSystemUIModule.class,
-        CarSystemUIBinder.class})
+        CarSystemUIBinder.class,
+        ShadelessSceneContainerFrameworkModule.class})
 public interface CarSysUIComponent extends SysUIComponent {
 
     /**
diff --git a/src/com/android/systemui/CarSystemUICoreStartableModule.kt b/src/com/android/systemui/CarSystemUICoreStartableModule.kt
index 75eec9e0..4e004943 100644
--- a/src/com/android/systemui/CarSystemUICoreStartableModule.kt
+++ b/src/com/android/systemui/CarSystemUICoreStartableModule.kt
@@ -19,6 +19,7 @@ package com.android.systemui
 import android.content.Context
 import com.android.keyguard.KeyguardBiometricLockoutLogger
 import com.android.systemui.biometrics.AuthController
+import com.android.systemui.car.activity.window.ActivityWindowManager
 import com.android.systemui.car.cluster.ClusterDisplayController
 import com.android.systemui.car.input.DisplayInputSinkController
 import com.android.systemui.car.systembar.CarSystemBar
@@ -192,4 +193,12 @@ abstract class CarSystemUICoreStartableModule {
     @IntoMap
     @ClassKey(Recents::class)
     abstract fun bindRecents(sysui: Recents): CoreStartable
+
+    /** Inject into ActivityWindowManager. */
+    @Binds
+    @IntoMap
+    @ClassKey(ActivityWindowManager::class)
+    abstract fun bindActivityWindowManager(
+        activityWindowManager: ActivityWindowManager
+    ): CoreStartable
 }
diff --git a/src/com/android/systemui/CarSystemUIInitializer.java b/src/com/android/systemui/CarSystemUIInitializer.java
index 581f0d6a..b9ff32c2 100644
--- a/src/com/android/systemui/CarSystemUIInitializer.java
+++ b/src/com/android/systemui/CarSystemUIInitializer.java
@@ -46,8 +46,6 @@ public class CarSystemUIInitializer extends SystemUIInitializer {
         CarWMComponent carWm = (CarWMComponent) wm;
         initWmComponents(carWm);
         boolean isSystemUser = UserHandle.myUserId() == UserHandle.USER_SYSTEM;
-        //Note: The WMComponents are only initialized for user-0/system-user.
-
         return ((CarSysUIComponent.Builder) sysUIBuilder).setRootTaskDisplayAreaOrganizer(
                         isSystemUser ? Optional.of(carWm.getRootTaskDisplayAreaOrganizer())
                                 : Optional.empty())
diff --git a/src/com/android/systemui/CarSystemUIModule.java b/src/com/android/systemui/CarSystemUIModule.java
index 1898d146..68ffd4c9 100644
--- a/src/com/android/systemui/CarSystemUIModule.java
+++ b/src/com/android/systemui/CarSystemUIModule.java
@@ -21,13 +21,13 @@ import static com.android.systemui.Dependency.LEAK_REPORT_EMAIL_NAME;
 
 import android.content.Context;
 import android.hardware.SensorPrivacyManager;
-import android.os.Handler;
 import android.window.DisplayAreaOrganizer;
 
-import com.android.internal.logging.UiEventLogger;
 import com.android.keyguard.KeyguardViewController;
+import com.android.keyguard.dagger.KeyguardDisplayModule;
 import com.android.systemui.car.CarDeviceProvisionedController;
 import com.android.systemui.car.CarDeviceProvisionedControllerImpl;
+import com.android.systemui.car.activity.window.ActivityWindowModule;
 import com.android.systemui.car.decor.CarPrivacyChipDecorProviderFactory;
 import com.android.systemui.car.decor.CarPrivacyChipViewController;
 import com.android.systemui.car.drivemode.DriveModeModule;
@@ -44,9 +44,9 @@ import com.android.systemui.dock.DockManager;
 import com.android.systemui.dock.DockManagerImpl;
 import com.android.systemui.doze.DozeHost;
 import com.android.systemui.globalactions.ShutdownUiModule;
+import com.android.systemui.navigationbar.NoopNavigationBarControllerModule;
 import com.android.systemui.navigationbar.gestural.GestureModule;
 import com.android.systemui.plugins.qs.QSFactory;
-import com.android.systemui.plugins.statusbar.StatusBarStateController;
 import com.android.systemui.power.dagger.PowerModule;
 import com.android.systemui.qs.dagger.QSModule;
 import com.android.systemui.qs.tileimpl.QSFactoryImpl;
@@ -54,23 +54,14 @@ import com.android.systemui.recents.Recents;
 import com.android.systemui.recents.RecentsImplementation;
 import com.android.systemui.screenshot.ReferenceScreenshotModule;
 import com.android.systemui.shade.ShadeEmptyImplModule;
-import com.android.systemui.shade.ShadeExpansionStateManager;
 import com.android.systemui.statusbar.CommandQueue;
 import com.android.systemui.statusbar.NotificationLockscreenUserManager;
 import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl;
 import com.android.systemui.statusbar.NotificationShadeWindowController;
 import com.android.systemui.statusbar.events.PrivacyDotViewController;
-import com.android.systemui.statusbar.events.StatusBarEventsModule;
-import com.android.systemui.statusbar.notification.collection.provider.VisualStabilityProvider;
-import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager;
-import com.android.systemui.statusbar.phone.HeadsUpManagerPhone;
-import com.android.systemui.statusbar.phone.KeyguardBypassController;
-import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper;
 import com.android.systemui.statusbar.policy.AospPolicyModule;
-import com.android.systemui.statusbar.policy.ConfigurationController;
 import com.android.systemui.statusbar.policy.DeviceProvisionedController;
-import com.android.systemui.statusbar.policy.HeadsUpManager;
-import com.android.systemui.statusbar.policy.HeadsUpManagerLogger;
+import com.android.systemui.statusbar.policy.HeadsUpEmptyImplModule;
 import com.android.systemui.statusbar.policy.IndividualSensorPrivacyController;
 import com.android.systemui.statusbar.policy.IndividualSensorPrivacyControllerImpl;
 import com.android.systemui.statusbar.policy.SensorPrivacyController;
@@ -91,14 +82,17 @@ import javax.inject.Named;
                 CarMultiUserUtilsModule.class,
                 CarVolumeModule.class,
                 GestureModule.class,
+                HeadsUpEmptyImplModule.class,
+                NoopNavigationBarControllerModule.class,
                 NoopWallpaperModule.class,
                 PowerModule.class,
                 QSModule.class,
                 ReferenceScreenshotModule.class,
                 ShadeEmptyImplModule.class,
                 ShutdownUiModule.class,
-                StatusBarEventsModule.class,
-                DriveModeModule.class
+                DriveModeModule.class,
+                KeyguardDisplayModule.class,
+                ActivityWindowModule.class,
         }
 )
 abstract class CarSystemUIModule {
@@ -112,35 +106,6 @@ abstract class CarSystemUIModule {
 
     @SysUISingleton
     @Provides
-    static HeadsUpManagerPhone provideHeadsUpManagerPhone(
-            Context context,
-            HeadsUpManagerLogger headsUpManagerLogger,
-            StatusBarStateController statusBarStateController,
-            KeyguardBypassController bypassController,
-            GroupMembershipManager groupManager,
-            VisualStabilityProvider visualStabilityProvider,
-            ConfigurationController configurationController,
-            @Main Handler handler,
-            AccessibilityManagerWrapper accessibilityManagerWrapper,
-            UiEventLogger uiEventLogger,
-            ShadeExpansionStateManager shadeExpansionStateManager) {
-        return new HeadsUpManagerPhone(
-                context,
-                headsUpManagerLogger,
-                statusBarStateController,
-                bypassController,
-                groupManager,
-                visualStabilityProvider,
-                configurationController,
-                handler,
-                accessibilityManagerWrapper,
-                uiEventLogger,
-                shadeExpansionStateManager
-        );
-    }
-
-    @SysUISingleton
-    @Provides
     @Named(LEAK_REPORT_EMAIL_NAME)
     static String provideLeakReportEmail() {
         return "buganizer-system+181579@google.com";
@@ -160,9 +125,6 @@ abstract class CarSystemUIModule {
     }
 
     @Binds
-    abstract HeadsUpManager bindHeadsUpManagerPhone(HeadsUpManagerPhone headsUpManagerPhone);
-
-    @Binds
     abstract NotificationLockscreenUserManager bindNotificationLockscreenUserManager(
             NotificationLockscreenUserManagerImpl notificationLockscreenUserManager);
 
diff --git a/src/com/android/systemui/car/activity/window/ActivityWindowController.java b/src/com/android/systemui/car/activity/window/ActivityWindowController.java
new file mode 100644
index 00000000..f25d9ed0
--- /dev/null
+++ b/src/com/android/systemui/car/activity/window/ActivityWindowController.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.systemui.car.activity.window;
+
+/**
+ * Interface for classes that handle the window for hosting the activities.
+ */
+public interface ActivityWindowController {
+    /**
+     * Call to initialize the controller.
+     */
+    void init();
+}
diff --git a/src/com/android/systemui/car/activity/window/ActivityWindowControllerImpl.java b/src/com/android/systemui/car/activity/window/ActivityWindowControllerImpl.java
new file mode 100644
index 00000000..8a4cd3cd
--- /dev/null
+++ b/src/com/android/systemui/car/activity/window/ActivityWindowControllerImpl.java
@@ -0,0 +1,208 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.systemui.car.activity.window;
+
+import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.app.ActivityManager.RunningTaskInfo;
+import android.car.app.CarActivityManager;
+import android.car.app.CarTaskViewController;
+import android.car.app.CarTaskViewControllerCallback;
+import android.car.app.CarTaskViewControllerHostLifecycle;
+import android.car.app.RemoteCarDefaultRootTaskView;
+import android.car.app.RemoteCarDefaultRootTaskViewCallback;
+import android.car.app.RemoteCarDefaultRootTaskViewConfig;
+import android.content.Context;
+import android.graphics.PixelFormat;
+import android.os.Binder;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowInsets;
+import android.view.WindowManager;
+
+import androidx.annotation.MainThread;
+
+import com.android.systemui.R;
+import com.android.systemui.car.CarServiceProvider;
+import com.android.systemui.car.displaycompat.ToolbarController;
+import com.android.systemui.dagger.qualifiers.UiBackground;
+import com.android.systemui.shared.system.TaskStackChangeListener;
+import com.android.systemui.shared.system.TaskStackChangeListeners;
+
+import javax.inject.Inject;
+
+/**
+ * Handles adding the {@link RemoteCarDefaultRootTaskView}
+ */
+public class ActivityWindowControllerImpl implements ActivityWindowController {
+    public static final String TAG = ActivityWindowController.class.getSimpleName();
+
+    @NonNull
+    private final Context mContext;
+    @NonNull
+    private final WindowManager mWindowManager;
+    @NonNull
+    private final CarServiceProvider mCarServiceProvider;
+    @NonNull
+    private ViewGroup mLayout;
+    @NonNull
+    private WindowManager.LayoutParams mWmLayoutParams;
+
+    @NonNull
+    private CarTaskViewController mCarTaskViewController;
+    @NonNull
+    private CarTaskViewControllerHostLifecycle mCarTaskViewControllerHostLifecycle;
+    @NonNull
+    private CarActivityManager mCarActivityManager;
+
+    @NonNull
+    @UiBackground
+    private final CarServiceProvider.CarServiceOnConnectedListener mCarServiceLifecycleListener =
+            car -> {
+                mCarActivityManager = car.getCarManager(CarActivityManager.class);
+
+                inflate();
+                setupRemoteCarTaskView();
+            };
+
+    @Nullable
+    private ToolbarController mToolbarController;
+
+    @Inject
+    public ActivityWindowControllerImpl(Context context, WindowManager windowManager,
+            CarServiceProvider carServiceProvider,
+            CarTaskViewControllerHostLifecycle carTaskViewControllerHostLifecycle,
+            @Nullable ToolbarController toolbarController) {
+        mContext = context;
+        mWindowManager = windowManager;
+        mCarServiceProvider = carServiceProvider;
+        mCarTaskViewControllerHostLifecycle = carTaskViewControllerHostLifecycle;
+        mToolbarController = toolbarController;
+    }
+
+    /**
+     * called for initialization
+     */
+    @MainThread
+    @Override
+    public void init() {
+        mCarServiceProvider.addListener(mCarServiceLifecycleListener);
+    }
+
+    @MainThread
+    protected void inflate() {
+        mLayout = (ViewGroup) LayoutInflater.from(mContext)
+                .inflate(R.layout.car_activity_window, /* root= */ null);
+
+        mWmLayoutParams = new WindowManager.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY,
+            WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+                    | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
+                    | WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED,
+            PixelFormat.TRANSLUCENT);
+        mWmLayoutParams.setTrustedOverlay();
+        mWmLayoutParams.setFitInsetsTypes(0);
+        mWmLayoutParams.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE;
+        mWmLayoutParams.token = new Binder();
+        mWmLayoutParams.setTitle("ActivityWindow!");
+        mWmLayoutParams.packageName = mContext.getPackageName();
+        mWmLayoutParams.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
+        mWmLayoutParams.privateFlags |= WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS;
+
+        mWindowManager.addView(mLayout, mWmLayoutParams);
+    }
+
+    private void setupRemoteCarTaskView() {
+        mCarActivityManager.getCarTaskViewController(
+                mContext,
+                mCarTaskViewControllerHostLifecycle,
+                mContext.getMainExecutor(),
+                new CarTaskViewControllerCallback() {
+                    @Override
+                    public void onConnected(
+                            CarTaskViewController carTaskViewController) {
+                        mCarTaskViewController = carTaskViewController;
+                        taskViewControllerReady();
+                    }
+
+                    @Override
+                    public void onDisconnected(
+                            CarTaskViewController carTaskViewController) {
+                    }
+                });
+    }
+
+    private void taskViewControllerReady() {
+        mCarTaskViewController.createRemoteCarDefaultRootTaskView(
+                new RemoteCarDefaultRootTaskViewConfig.Builder()
+                        .setDisplayId(mContext.getDisplayId())
+                        .embedHomeTask(true)
+                        .embedRecentsTask(true)
+                        .build(),
+                mContext.getMainExecutor(),
+                new RemoteCarDefaultRootTaskViewCallback() {
+                    @Override
+                    public void onTaskViewCreated(@NonNull RemoteCarDefaultRootTaskView taskView) {
+                        Log.d(TAG, "Root Task View is created");
+                        taskView.setZOrderMediaOverlay(true);
+
+                        mLayout.setOnApplyWindowInsetsListener(
+                                new View.OnApplyWindowInsetsListener() {
+                                @Override
+                                public WindowInsets onApplyWindowInsets(View view,
+                                        WindowInsets insets) {
+                                    mLayout.setPadding(
+                                            insets.getSystemWindowInsetLeft(),
+                                            insets.getSystemWindowInsetTop(),
+                                            insets.getSystemWindowInsetRight(),
+                                            insets.getSystemWindowInsetBottom());
+                                    return insets.replaceSystemWindowInsets(
+                                        /* left */ 0, /* top */ 0, /* right */ 0, /* bottom */ 0);
+                                }
+                            });
+
+                        if (mToolbarController != null) {
+                            mToolbarController.init(mLayout);
+                        }
+
+                        TaskStackChangeListeners.getInstance().registerTaskStackListener(
+                                new TaskStackChangeListener() {
+                                @Override
+                                public void onTaskMovedToFront(RunningTaskInfo taskInfo) {
+                                    if (mToolbarController != null) {
+                                        mToolbarController.update(taskInfo);
+                                    }
+                                }
+                            });
+
+                        ViewGroup layout = (ViewGroup) mLayout.findViewById(R.id.activity_area);
+                        layout.addView(taskView);
+                    }
+
+                    @Override
+                    public void onTaskViewInitialized() {
+                        Log.d(TAG, "Root Task View is ready");
+                    }
+                }
+        );
+    }
+}
diff --git a/src/com/android/systemui/car/activity/window/ActivityWindowManager.java b/src/com/android/systemui/car/activity/window/ActivityWindowManager.java
new file mode 100644
index 00000000..38ad90e4
--- /dev/null
+++ b/src/com/android/systemui/car/activity/window/ActivityWindowManager.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.systemui.car.activity.window;
+
+import android.annotation.Nullable;
+import android.content.Context;
+import android.util.Log;
+
+import com.android.systemui.CoreStartable;
+import com.android.systemui.R;
+import com.android.systemui.dagger.SysUISingleton;
+
+import dagger.Lazy;
+
+import javax.inject.Inject;
+
+/**
+ * {@link CoreStartable} for {@link ActivityWindowController}
+ */
+@SysUISingleton
+public class ActivityWindowManager implements CoreStartable {
+
+    private static final String TAG =  ActivityWindowManager.class.getSimpleName();
+
+    @Nullable
+    private final ActivityWindowController mActivityWindowController;
+
+    @Inject
+    public ActivityWindowManager(Context context,
+            Lazy<ActivityWindowController> activityWindowController) {
+        if (context.getResources().getBoolean(R.bool.config_useRemoteLaunchTaskView)) {
+            Log.i(TAG, "Will use RemoteLaunchTaskView for showing Activities.");
+            mActivityWindowController = activityWindowController.get();
+        } else {
+            Log.i(TAG, "Will use DefaultTaskDisplayArea for showing Activities.");
+            mActivityWindowController = null;
+        }
+    }
+
+    @Override
+    public void start() {
+        Log.i(TAG, "ActivityWindowController not set.");
+        if (mActivityWindowController != null) {
+            mActivityWindowController.init();
+        }
+    }
+}
diff --git a/src/com/android/systemui/car/activity/window/ActivityWindowModule.java b/src/com/android/systemui/car/activity/window/ActivityWindowModule.java
new file mode 100644
index 00000000..06d8ed52
--- /dev/null
+++ b/src/com/android/systemui/car/activity/window/ActivityWindowModule.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.systemui.car.activity.window;
+
+import android.annotation.Nullable;
+import android.car.app.CarTaskViewControllerHostLifecycle;
+import android.content.Context;
+
+import com.android.systemui.R;
+import com.android.systemui.car.displaycompat.ToolbarController;
+import com.android.systemui.car.displaycompat.ToolbarControllerImpl;
+
+import dagger.Binds;
+import dagger.Module;
+import dagger.Provides;
+
+/**
+ * Dagger injection module for {@link ActivityWindowManager}
+ */
+@Module
+public abstract class ActivityWindowModule {
+    /**
+     * Injects ActivityWindowController.
+     */
+    @Binds
+    public abstract ActivityWindowController bindActivityWindowController(
+            ActivityWindowControllerImpl activityWindowController);
+
+    @Provides
+    static CarTaskViewControllerHostLifecycle provideCarTaskViewControllerHostLifecycle() {
+        return new CarTaskViewControllerHostLifecycle();
+    }
+
+    /**
+     * Injects ToolbarController
+     */
+    @Nullable
+    @Provides
+    static ToolbarController providesToolbarController(Context context,
+            ToolbarControllerImpl impl) {
+        if (context.getResources()
+                .getInteger(R.integer.config_showDisplayCompatToolbarOnSystemBar) == 0) {
+            return null;
+        } else {
+            return impl;
+        }
+    }
+}
diff --git a/src/com/android/systemui/car/biometrics/PinPadView.java b/src/com/android/systemui/car/biometrics/PinPadView.java
new file mode 100644
index 00000000..e1f0d35f
--- /dev/null
+++ b/src/com/android/systemui/car/biometrics/PinPadView.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.car.biometrics;
+
+import android.content.Context;
+import android.content.res.ColorStateList;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.GridLayout;
+import android.widget.ImageButton;
+import android.widget.TextView;
+
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+
+import com.android.systemui.R;
+import com.android.systemui.biometrics.ui.IPinPad;
+import com.android.systemui.biometrics.ui.PinPadClickListener;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A custom view for the PIN pad.
+ */
+public class PinPadView extends GridLayout implements IPinPad {
+    // Number of keys in the pin pad, 0-9 plus backspace and enter keys.
+    @VisibleForTesting
+    static final int NUM_KEYS = 12;
+
+    @VisibleForTesting
+    static final int[] PIN_PAD_DIGIT_KEYS = {R.id.key0, R.id.key1, R.id.key2, R.id.key3,
+            R.id.key4, R.id.key5, R.id.key6, R.id.key7, R.id.key8, R.id.key9};
+
+    /**
+     * The delay in milliseconds between character deletion when the user continuously holds the
+     * backspace key.
+     */
+    private static final int LONG_CLICK_DELAY_MILLS = 100;
+
+    private final List<View> mPinKeys = new ArrayList<>(NUM_KEYS);
+    private final Runnable mOnBackspaceLongClick = new Runnable() {
+        public void run() {
+            if (mOnClickListener != null) {
+                mOnClickListener.onBackspaceClick();
+                getHandler().postDelayed(this, LONG_CLICK_DELAY_MILLS);
+            }
+        }
+    };
+
+    private PinPadClickListener mOnClickListener;
+    private ImageButton mEnterKey;
+
+    public PinPadView(Context context) {
+        super(context);
+        init(null, 0, 0);
+    }
+
+    public PinPadView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(attrs, 0, 0);
+    }
+
+    public PinPadView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(attrs, defStyleAttr, 0);
+    }
+
+    public PinPadView(Context context, @Nullable AttributeSet attrs, int defStyleAttr,
+            int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        init(attrs, defStyleAttr, defStyleRes);
+    }
+
+    @Override
+    public void setEnabled(boolean enabled) {
+        super.setEnabled(enabled);
+        for (View key : mPinKeys) {
+            key.setEnabled(enabled);
+        }
+    }
+
+    /**
+     * Set the resource Id of the enter key icon.
+     *
+     * @param drawableId The resource Id of the drawable.
+     */
+    public void setEnterKeyIcon(@DrawableRes int drawableId) {
+        mEnterKey.setImageResource(drawableId);
+    }
+
+    /**
+     * Override the default tint of the enter key icon.
+     *
+     * @param tint A ColorStateList.
+     */
+    public void setEnterKeyImageTint(ColorStateList tint) {
+        mEnterKey.setImageTintList(tint);
+    }
+
+    /**
+     * Sets if the enter key for submitting a PIN is enabled or disabled.
+     */
+    public void setEnterKeyEnabled(boolean enabled) {
+        mEnterKey.setEnabled(enabled);
+    }
+
+    private void init(AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        LayoutInflater inflater = LayoutInflater.from(getContext());
+        TypedArray typedArray = getContext().obtainStyledAttributes(
+                attrs, R.styleable.PinPadView, defStyleAttr, defStyleRes);
+        inflater.inflate(
+                typedArray.getResourceId(R.styleable.PinPadView_layout, R.layout.pin_pad_view),
+                this, true);
+        typedArray.recycle();
+
+        for (int keyId : PIN_PAD_DIGIT_KEYS) {
+            TextView key = findViewById(keyId);
+            String digit = key.getTag().toString();
+            key.setOnClickListener(v -> mOnClickListener.onDigitKeyClick(digit));
+            mPinKeys.add(key);
+        }
+
+        ImageButton backspace = findViewById(R.id.key_backspace);
+        backspace.setOnTouchListener((v, event) -> {
+            switch (event.getAction()) {
+                case MotionEvent.ACTION_DOWN:
+                    getHandler().post(mOnBackspaceLongClick);
+                    // Must return false so that ripple can show
+                    return false;
+                case MotionEvent.ACTION_UP:
+                    getHandler().removeCallbacks(mOnBackspaceLongClick);
+                    // Must return false so that ripple can show
+                    return false;
+                default:
+                    return false;
+            }
+        });
+        backspace.setOnKeyListener((v, code, event) -> {
+            if (code != KeyEvent.KEYCODE_DPAD_CENTER) {
+                return false;
+            }
+            switch (event.getAction()) {
+                case KeyEvent.ACTION_DOWN:
+                    getHandler().post(mOnBackspaceLongClick);
+                    // Must return false so that ripple can show
+                    return false;
+                case KeyEvent.ACTION_UP:
+                    getHandler().removeCallbacks(mOnBackspaceLongClick);
+                    // Must return false so that ripple can show
+                    return false;
+                default:
+                    return false;
+            }
+        });
+        mPinKeys.add(backspace);
+
+        mEnterKey = findViewById(R.id.key_enter);
+        mEnterKey.setOnClickListener(v -> mOnClickListener.onEnterKeyClick());
+
+        mPinKeys.add(mEnterKey);
+    }
+
+    @Override
+    public void setPinPadClickListener(
+            @NonNull PinPadClickListener pinPadClickListener) {
+        mOnClickListener = pinPadClickListener;
+    }
+}
diff --git a/src/com/android/systemui/car/decor/CarPrivacyChipViewController.java b/src/com/android/systemui/car/decor/CarPrivacyChipViewController.java
index 60ebfd01..cbb09d65 100644
--- a/src/com/android/systemui/car/decor/CarPrivacyChipViewController.java
+++ b/src/com/android/systemui/car/decor/CarPrivacyChipViewController.java
@@ -29,10 +29,10 @@ import com.android.internal.view.AppearanceRegion;
 import com.android.systemui.R;
 import com.android.systemui.car.systembar.SystemBarConfigs;
 import com.android.systemui.dagger.SysUISingleton;
+import com.android.systemui.dagger.qualifiers.Application;
 import com.android.systemui.dagger.qualifiers.Main;
 import com.android.systemui.plugins.statusbar.StatusBarStateController;
 import com.android.systemui.privacy.PrivacyType;
-import com.android.systemui.shade.ShadeExpansionStateManager;
 import com.android.systemui.statusbar.CommandQueue;
 import com.android.systemui.statusbar.events.PrivacyDotViewController;
 import com.android.systemui.statusbar.events.SystemStatusAnimationScheduler;
@@ -47,6 +47,8 @@ import java.util.concurrent.Executor;
 
 import javax.inject.Inject;
 
+import kotlinx.coroutines.CoroutineScope;
+
 /**
  * Subclass of {@link PrivacyDotViewController}.
  */
@@ -62,15 +64,15 @@ public class CarPrivacyChipViewController extends PrivacyDotViewController
     @Inject
     public CarPrivacyChipViewController(
             @NotNull @Main Executor mainExecutor,
+            @Application CoroutineScope scope,
             @NotNull Context context,
             @NotNull StatusBarStateController stateController,
             @NotNull ConfigurationController configurationController,
             @NotNull StatusBarContentInsetsProvider contentInsetsProvider,
             @NotNull SystemStatusAnimationScheduler animationScheduler,
-            ShadeExpansionStateManager shadeExpansionStateManager,
             CommandQueue commandQueue) {
-        super(mainExecutor, stateController, configurationController, contentInsetsProvider,
-                animationScheduler, shadeExpansionStateManager);
+        super(mainExecutor, scope, stateController, configurationController, contentInsetsProvider,
+                animationScheduler, null);
         commandQueue.addCallback(this);
         mAnimationHelper = new CarPrivacyChipAnimationHelper(context);
         mBarType = SystemBarConfigs.BAR_PROVIDER_MAP[context.getResources().getInteger(
diff --git a/src/com/android/systemui/car/displaycompat/CarDisplayCompatSystemBarView.java b/src/com/android/systemui/car/displaycompat/CarDisplayCompatSystemBarView.java
new file mode 100644
index 00000000..479aa14d
--- /dev/null
+++ b/src/com/android/systemui/car/displaycompat/CarDisplayCompatSystemBarView.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.systemui.car.displaycompat;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+
+import com.android.systemui.R;
+import com.android.systemui.car.systembar.CarSystemBarView;
+
+/**
+ *
+ */
+public class CarDisplayCompatSystemBarView extends CarSystemBarView {
+
+    public static final String DISPLAYCOMPAT_SYSTEM_FEATURE = "android.car.displaycompatibility";
+
+    public CarDisplayCompatSystemBarView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        TypedArray a = context.obtainStyledAttributes(attrs,
+                R.styleable.CarDisplayCompatSystemBarView, 0, 0);
+        int defaultLayoutId =
+                a.getResourceId(R.styleable.CarDisplayCompatSystemBarView_default_layout, 0);
+        if (defaultLayoutId == 0) {
+            throw new IllegalArgumentException("default_layout attribute is not set");
+        }
+        int displayCompatLayoutId =
+                a.getResourceId(R.styleable.CarDisplayCompatSystemBarView_displaycompat_layout, 0);
+        int displayCompatConfig = context.getResources()
+                .getInteger(R.integer.config_showDisplayCompatToolbarOnSystemBar);
+        int compatDisplaySide = a.getInt(
+                R.styleable.CarDisplayCompatSystemBarView_displaycompat_side, 0);
+        a.recycle();
+
+        PackageManager packageManager = context.getPackageManager();
+        if (packageManager.hasSystemFeature(DISPLAYCOMPAT_SYSTEM_FEATURE)
+                && displayCompatConfig != 0
+                && displayCompatConfig == compatDisplaySide) {
+            inflate(context, displayCompatLayoutId, this);
+        } else {
+            inflate(context, defaultLayoutId, this);
+        }
+    }
+}
diff --git a/src/com/android/systemui/car/displaycompat/ToolbarController.java b/src/com/android/systemui/car/displaycompat/ToolbarController.java
new file mode 100644
index 00000000..0c9b6a0e
--- /dev/null
+++ b/src/com/android/systemui/car/displaycompat/ToolbarController.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.systemui.car.displaycompat;
+
+import android.annotation.NonNull;
+import android.app.ActivityManager.RunningTaskInfo;
+import android.view.View;
+import android.view.ViewGroup;
+
+/**
+ * Interface for controlling toolbar for apps that use display compatibility.
+ */
+public interface ToolbarController {
+    /**
+     * Call to initialize the toolbar.
+     *
+     * @param parent this is supposed to be the container of the toolbar which will be used to
+     * set the visibility of the toolbar.
+     */
+    void init(ViewGroup parent);
+
+    /**
+     * Sets the visibility of the toolbar to {@link View#VISIBLE}
+     */
+    void show();
+
+    /**
+     * Sets the visibility of the toolbar to {@link View#GONE}
+     */
+    void hide();
+
+    /**
+     * Call this method when a task is moved to front.
+     */
+    void update(@NonNull RunningTaskInfo taskInfo);
+}
diff --git a/src/com/android/systemui/car/displaycompat/ToolbarControllerImpl.java b/src/com/android/systemui/car/displaycompat/ToolbarControllerImpl.java
new file mode 100644
index 00000000..cfb5e66b
--- /dev/null
+++ b/src/com/android/systemui/car/displaycompat/ToolbarControllerImpl.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.systemui.car.displaycompat;
+
+import static android.car.Car.PERMISSION_QUERY_DISPLAY_COMPATIBILITY;
+import static android.view.Display.DEFAULT_DISPLAY;
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.app.ActivityManager.RunningTaskInfo;
+import android.car.content.pm.CarPackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.hardware.input.InputManager;
+import android.hardware.input.InputManagerGlobal;
+import android.os.Handler;
+import android.os.SystemClock;
+import android.util.Log;
+import android.view.KeyCharacterMap;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
+
+import androidx.annotation.MainThread;
+import androidx.annotation.RequiresPermission;
+
+import com.android.systemui.R;
+import com.android.systemui.car.CarServiceProvider;
+import com.android.systemui.dagger.qualifiers.Main;
+import com.android.systemui.dagger.qualifiers.UiBackground;
+
+import javax.inject.Inject;
+
+/**
+ * Implementation of {@link ToolbarController} for showing/hiding the display compatibility toolbar.
+ */
+public class ToolbarControllerImpl implements ToolbarController {
+
+    private static final String TAG = ToolbarControllerImpl.class.getSimpleName();
+
+    private ViewGroup mToolbarParent;
+
+    @NonNull
+    private final Handler mMainHandler;
+
+    @NonNull
+    private CarServiceProvider mCarServiceProvider;
+    @Nullable
+    private CarPackageManager mCarPackageManager;
+    @NonNull
+    @UiBackground
+    private final CarServiceProvider.CarServiceOnConnectedListener mCarServiceLifecycleListener =
+            car -> {
+                mCarPackageManager = car.getCarManager(CarPackageManager.class);
+            };
+    @Nullable
+    private ImageButton mBackButton;
+
+    @Inject
+    public ToolbarControllerImpl(@NonNull @Main Handler mainHandler,
+            CarServiceProvider carServiceProvider) {
+        mMainHandler = mainHandler;
+        mCarServiceProvider = carServiceProvider;
+    }
+
+    /**
+     * Needs to be called before calling any other method.
+     */
+    @Override
+    public void init(@NonNull ViewGroup parent) {
+        mToolbarParent = parent;
+        mCarServiceProvider.addListener(mCarServiceLifecycleListener);
+    }
+
+    @MainThread
+    @Override
+    public void show() {
+        if (mToolbarParent == null) {
+            Log.w(TAG, "init was not called");
+            return;
+        }
+        if (mBackButton == null) {
+            // Can't do this in init method because that's called when the window is available way
+            // before the views are inflated.
+            mBackButton = mToolbarParent.findViewById(R.id.back_btn);
+            if (mBackButton != null) {
+                mBackButton.setOnClickListener(v -> {
+                    sendVirtualBackPress();
+                });
+            }
+        }
+        mToolbarParent.setVisibility(VISIBLE);
+        View actionBar = mToolbarParent.findViewById(R.id.action_bar);
+        if (actionBar != null) {
+            actionBar.setVisibility(VISIBLE);
+        }
+    }
+
+    @MainThread
+    @Override
+    public void hide() {
+        if (mToolbarParent == null) {
+            Log.w(TAG, "init was not called");
+            return;
+        }
+        mToolbarParent.setVisibility(GONE);
+        View actionBar = mToolbarParent.findViewById(R.id.action_bar);
+        if (actionBar != null) {
+            actionBar.setVisibility(GONE);
+        }
+    }
+
+    @RequiresPermission(allOf = {PERMISSION_QUERY_DISPLAY_COMPATIBILITY,
+            android.Manifest.permission.QUERY_ALL_PACKAGES})
+    @Override
+    public void update(@NonNull RunningTaskInfo taskInfo) {
+        if (mToolbarParent == null) {
+            Log.w(TAG, "init was not called");
+            return;
+        }
+        if (requiresDisplayCompat(getPackageName(taskInfo))
+                && taskInfo.displayId == DEFAULT_DISPLAY) {
+            mMainHandler.post(() -> show());
+            return;
+        }
+        mMainHandler.post(() -> hide());
+    }
+
+    private String getPackageName(RunningTaskInfo taskInfo) {
+        if (taskInfo.topActivity != null) {
+            return taskInfo.topActivity.getPackageName();
+        }
+        return taskInfo.baseIntent.getComponent().getPackageName();
+    }
+
+    @RequiresPermission(allOf = {PERMISSION_QUERY_DISPLAY_COMPATIBILITY,
+            android.Manifest.permission.QUERY_ALL_PACKAGES})
+    private boolean requiresDisplayCompat(String packageName) {
+        boolean result = false;
+        if (mCarPackageManager != null) {
+            try {
+                result = mCarPackageManager.requiresDisplayCompat(packageName);
+            } catch (NameNotFoundException e) {
+            }
+        } else {
+            Log.w(TAG, "CarPackageManager is not set.");
+        }
+        return result;
+    }
+
+    /**
+     * Send both action down and up to be qualified as a back press. Set time for key events, so
+     * they are not staled.
+     */
+    public static void sendVirtualBackPress() {
+        long downEventTime = SystemClock.uptimeMillis();
+        long upEventTime = downEventTime + 1;
+
+        final KeyEvent keydown = new KeyEvent(downEventTime, downEventTime, KeyEvent.ACTION_DOWN,
+                KeyEvent.KEYCODE_BACK, /* repeat= */ 0, /* metaState= */ 0,
+                KeyCharacterMap.VIRTUAL_KEYBOARD, /* scancode= */ 0, KeyEvent.FLAG_FROM_SYSTEM);
+        final KeyEvent keyup = new KeyEvent(upEventTime, upEventTime, KeyEvent.ACTION_UP,
+                KeyEvent.KEYCODE_BACK, /* repeat= */ 0, /* metaState= */ 0,
+                KeyCharacterMap.VIRTUAL_KEYBOARD, /* scancode= */ 0, KeyEvent.FLAG_FROM_SYSTEM);
+
+        InputManagerGlobal inputManagerGlobal = InputManagerGlobal.getInstance();
+        inputManagerGlobal.injectInputEvent(keydown, InputManager.INJECT_INPUT_EVENT_MODE_ASYNC);
+        inputManagerGlobal.injectInputEvent(keyup, InputManager.INJECT_INPUT_EVENT_MODE_ASYNC);
+    }
+}
diff --git a/src/com/android/systemui/car/hvac/HvacController.java b/src/com/android/systemui/car/hvac/HvacController.java
index 80684bae..99bd7de1 100644
--- a/src/com/android/systemui/car/hvac/HvacController.java
+++ b/src/com/android/systemui/car/hvac/HvacController.java
@@ -91,7 +91,8 @@ public class HvacController implements HvacPropertySetter,
                     HVAC_STEERING_WHEEL_HEAT, HVAC_TEMPERATURE_DISPLAY_UNITS,
                     HVAC_ACTUAL_FAN_SPEED_RPM, HVAC_POWER_ON, HVAC_FAN_DIRECTION_AVAILABLE,
                     HVAC_AUTO_RECIRC_ON, HVAC_SEAT_VENTILATION, HVAC_ELECTRIC_DEFROSTER_ON};
-    private static final int[] HVAC_PROPERTIES_TO_GET_ON_INIT = {HVAC_POWER_ON, HVAC_AUTO_ON};
+    private static final int[] HVAC_PROPERTIES_TO_GET_ON_INIT =
+            {HVAC_POWER_ON, HVAC_AUTO_ON, HVAC_FAN_DIRECTION_AVAILABLE};
     private static final int GLOBAL_AREA_ID = 0;
 
     @IntDef(value = {HVAC_FAN_SPEED, HVAC_FAN_DIRECTION, HVAC_TEMPERATURE_CURRENT,
@@ -298,6 +299,7 @@ public class HvacController implements HvacPropertySetter,
 
                 hvacView.setHvacPropertySetter(this);
                 hvacView.setConfigInfo(carPropertyConfig);
+                hvacView.setDisableViewIfPowerOff(mHvacPowerDependentProperties.contains(propId));
 
                 ArrayList<Integer> supportedAreaIds = getAreaIdsFromTargetAreaId(propId.intValue(),
                         targetAreaId.intValue());
diff --git a/src/com/android/systemui/car/hvac/HvacPanelOverlayViewController.java b/src/com/android/systemui/car/hvac/HvacPanelOverlayViewController.java
index 5435f12b..ed2df3af 100644
--- a/src/com/android/systemui/car/hvac/HvacPanelOverlayViewController.java
+++ b/src/com/android/systemui/car/hvac/HvacPanelOverlayViewController.java
@@ -47,8 +47,10 @@ public class HvacPanelOverlayViewController extends OverlayPanelViewController i
     private final Resources mResources;
     private final HvacController mHvacController;
     private final UiModeManager mUiModeManager;
+    private final float mFullyOpenDimAmount;
 
     private boolean mIsUiModeNight;
+    private float mCurrentDimAmount = 0f;
 
     private HvacPanelView mHvacPanelView;
 
@@ -68,6 +70,8 @@ public class HvacPanelOverlayViewController extends OverlayPanelViewController i
         mHvacController = hvacController;
         mUiModeManager = uiModeManager;
         configurationController.addCallback(this);
+        mFullyOpenDimAmount = mContext.getResources().getFloat(
+                R.fraction.hvac_overlay_window_dim_amount);
     }
 
     @Override
@@ -125,6 +129,11 @@ public class HvacPanelOverlayViewController extends OverlayPanelViewController i
     }
 
     @Override
+    protected float getDefaultDimAmount() {
+        return mCurrentDimAmount;
+    }
+
+    @Override
     protected Integer getHandleBarViewId() {
         return R.id.handle_bar;
     }
@@ -177,6 +186,17 @@ public class HvacPanelOverlayViewController extends OverlayPanelViewController i
         }
     }
 
+    @Override
+    protected void onScroll(int y) {
+        super.onScroll(y);
+
+        float percentageOpen =
+                ((float) (mAnimateDirection > 0 ? y : getLayout().getHeight() - y))
+                        / getLayout().getHeight();
+        mCurrentDimAmount = mFullyOpenDimAmount * percentageOpen;
+        getOverlayViewGlobalStateController().updateWindowDimBehind(this, mCurrentDimAmount);
+    }
+
     private boolean isTouchOutside(Rect bounds, float x, float y) {
         return x < bounds.left || x > bounds.right || y < bounds.top || y > bounds.bottom;
     }
diff --git a/src/com/android/systemui/car/hvac/HvacUtils.java b/src/com/android/systemui/car/hvac/HvacUtils.java
new file mode 100644
index 00000000..e986734f
--- /dev/null
+++ b/src/com/android/systemui/car/hvac/HvacUtils.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.systemui.car.hvac;
+
+import android.car.hardware.CarPropertyConfig;
+import android.car.hardware.property.AreaIdConfig;
+
+/**
+ *  Utility class for HVAC-related use cases.
+ */
+public final class HvacUtils {
+    /**
+     * @see #shouldAllowControl(boolean, boolean, boolean, boolean)
+     */
+    public static boolean shouldAllowControl(boolean disableViewIfPowerOff, boolean powerOn) {
+        return shouldAllowControl(disableViewIfPowerOff, powerOn, /* disableViewIfAutoOn= */false,
+                /* autoOn= */false);
+    }
+
+    /**
+     * @see #shouldAllowControl(boolean, boolean, boolean, boolean)
+     */
+    public static boolean shouldAllowControl(boolean disableViewIfPowerOff, boolean powerOn,
+            boolean autoOn) {
+        return shouldAllowControl(disableViewIfPowerOff, powerOn, /* disableViewIfAutoOn= */true,
+                autoOn);
+    }
+
+    /**
+     * Returns whether the view can be controlled.
+     *
+     * @param disableViewIfPowerOff whether the view can be controlled when hvac power is off
+     * @param powerOn is hvac power on
+     * @param disableViewIfAutoOn whether the view can be controlled when hvac auto mode is on
+     * @param autoOn is auto mode on
+     * @return is the view controllable
+     */
+    public static boolean shouldAllowControl(boolean disableViewIfPowerOff, boolean powerOn,
+            boolean disableViewIfAutoOn, boolean autoOn) {
+        return (!disableViewIfPowerOff || powerOn) && (!disableViewIfAutoOn || !autoOn);
+    }
+
+    /**
+     * For an {@code Integer} property, return the highest minimum value specified for all area IDs.
+     * If there are no minimum values provided by all of the area IDs or if the property is not an
+     * {@code Integer} property, return {@code null}.
+     *
+     * @param carPropertyConfig {@code Integer} CarPropertyConfig
+     * @return highest min value or {@code null}
+     */
+    public static Integer getHighestMinValueForAllAreaIds(CarPropertyConfig<?> carPropertyConfig) {
+        if (!carPropertyConfig.getPropertyType().equals(Integer.class)) {
+            return null;
+        }
+        Integer highestMinValue = null;
+        for (AreaIdConfig<?> areaIdConfig: carPropertyConfig.getAreaIdConfigs()) {
+            if (highestMinValue == null || (areaIdConfig.getMinValue() != null
+                    && (Integer) areaIdConfig.getMinValue() > highestMinValue)) {
+                highestMinValue = (Integer) areaIdConfig.getMinValue();
+            }
+        }
+        return highestMinValue;
+    }
+
+    /**
+     * For an {@code Integer} property, return the lowest maximum value specified for all area IDs.
+     * If there are no maximum values provided by all of the area IDs or if the property is not an
+     * {@code Integer} property, return {@code null}.
+     *
+     * @param carPropertyConfig {@code Integer} CarPropertyConfig
+     * @return lowest max value or {@code null}
+     */
+    public static Integer getLowestMaxValueForAllAreaIds(CarPropertyConfig<?> carPropertyConfig) {
+        if (!carPropertyConfig.getPropertyType().equals(Integer.class)) {
+            return null;
+        }
+        Integer lowestMaxValue = null;
+        for (AreaIdConfig<?> areaIdConfig: carPropertyConfig.getAreaIdConfigs()) {
+            if (lowestMaxValue == null || (areaIdConfig.getMaxValue() != null
+                    && (Integer) areaIdConfig.getMaxValue() < lowestMaxValue)) {
+                lowestMaxValue = (Integer) areaIdConfig.getMaxValue();
+            }
+        }
+        return lowestMaxValue;
+    }
+}
diff --git a/src/com/android/systemui/car/hvac/HvacView.java b/src/com/android/systemui/car/hvac/HvacView.java
index 5a320a94..39119969 100644
--- a/src/com/android/systemui/car/hvac/HvacView.java
+++ b/src/com/android/systemui/car/hvac/HvacView.java
@@ -34,12 +34,17 @@ public interface HvacView {
      * Set config information using the CarPropertyConfig for this property. This can be min/max
      * values, config array values, etc.
      */
-    void setConfigInfo(CarPropertyConfig<?> carPropertyConfig);
+    default void setConfigInfo(CarPropertyConfig<?> carPropertyConfig) {}
+
+    /**
+     * Set whether the HvacView is dependent on the HVAC being powered on.
+     */
+    default void setDisableViewIfPowerOff(boolean disableViewIfPowerOff) {}
 
     /**
      * Called when the temperature display unit (Celsius or Fahrenheit) is changed.
      */
-    void onHvacTemperatureUnitChanged(boolean usesFahrenheit);
+    default void onHvacTemperatureUnitChanged(boolean usesFahrenheit) {}
 
     /**
      * Called when the subscribed CarPropertyValue is changed.
diff --git a/src/com/android/systemui/car/hvac/SeatTemperatureLevelButton.java b/src/com/android/systemui/car/hvac/SeatTemperatureLevelButton.java
index b05acdf7..c45f71bb 100644
--- a/src/com/android/systemui/car/hvac/SeatTemperatureLevelButton.java
+++ b/src/com/android/systemui/car/hvac/SeatTemperatureLevelButton.java
@@ -154,16 +154,6 @@ public class SeatTemperatureLevelButton extends ImageButton implements HvacView
         return mAreaId;
     }
 
-    @Override
-    public void onHvacTemperatureUnitChanged(boolean usesFahrenheit) {
-        // no-op.
-    }
-
-    @Override
-    public void onLocaleListChanged() {
-        // no-op.
-    }
-
     private void updateIcon() {
         mContext.getMainThreadHandler().post(() -> {
             setSelected(mCurrentLevel != 0);
diff --git a/src/com/android/systemui/car/hvac/TemperatureControlView.java b/src/com/android/systemui/car/hvac/TemperatureControlView.java
index dc2283aa..0aa5bd5b 100644
--- a/src/com/android/systemui/car/hvac/TemperatureControlView.java
+++ b/src/com/android/systemui/car/hvac/TemperatureControlView.java
@@ -40,19 +40,24 @@ import java.util.List;
 public class TemperatureControlView extends LinearLayout implements HvacView {
     protected static final int BUTTON_REPEAT_INTERVAL_MS = 500;
     protected TextView mTempTextView;
+    protected View mIncreaseButton;
+    protected View mDecreaseButton;
 
     private static final int INVALID_ID = -1;
+    /**
+     * @see android.car.VehiclePropertyIds#HVAC_TEMPERATURE_SET
+     */
+    private static final int HVAC_TEMPERATURE_SET_CONFIG_ARRAY_SIZE = 6;
 
     private final int mAreaId;
     private final int mAvailableTextColor;
     private final int mUnavailableTextColor;
 
     private boolean mPowerOn = false;
+    private boolean mDisableViewIfPowerOff = false;
     private boolean mTemperatureSetAvailable = false;
     private HvacPropertySetter mHvacPropertySetter;
     private String mTempInDisplay;
-    private View mIncreaseButton;
-    private View mDecreaseButton;
     private float mMinTempC;
     private float mMinTempF;
     private float mMaxTempC;
@@ -130,14 +135,21 @@ public class TemperatureControlView extends LinearLayout implements HvacView {
     }
 
     @Override
+    public void setDisableViewIfPowerOff(boolean disableViewIfPowerOff) {
+        mDisableViewIfPowerOff = disableViewIfPowerOff;
+    }
+
+    @Override
     public void setConfigInfo(CarPropertyConfig<?> carPropertyConfig) {
         List<Integer> configArray = carPropertyConfig.getConfigArray();
-        // Need to divide by 10 because config array values are temperature values that have been
-        // multiplied by 10.
+        if (configArray.size() != HVAC_TEMPERATURE_SET_CONFIG_ARRAY_SIZE) {
+            return;
+        }
+        // Need to divide by 10 because config array values are
+        // temperature values that have been multiplied by 10.
         mMinTempC = configArray.get(0) / 10f;
         mMaxTempC = configArray.get(1) / 10f;
         mTemperatureIncrementCelsius = configArray.get(2) / 10f;
-
         mMinTempF = configArray.get(3) / 10f;
         mTemperatureIncrementFahrenheit = configArray.get(5) / 10f;
     }
@@ -151,7 +163,15 @@ public class TemperatureControlView extends LinearLayout implements HvacView {
      * Returns {@code true} if temperature should be available for change.
      */
     public boolean isTemperatureAvailableForChange() {
-        return mPowerOn && mTemperatureSetAvailable && mHvacPropertySetter != null;
+        return HvacUtils.shouldAllowControl(mDisableViewIfPowerOff, mPowerOn)
+                && mTemperatureSetAvailable && mHvacPropertySetter != null;
+    }
+
+    /**
+     * Set the {@link OnClickListener} for the temperature TextView.
+     */
+    public void setTemperatureTextClickListener(OnClickListener onClickListener) {
+        mTempTextView.setOnClickListener(onClickListener);
     }
 
     /**
@@ -159,8 +179,11 @@ public class TemperatureControlView extends LinearLayout implements HvacView {
      */
     protected void updateTemperatureViewUiThread() {
         mTempTextView.setText(mTempInDisplay);
-        mTempTextView.setTextColor(mPowerOn && mTemperatureSetAvailable
+        boolean canChangeTemperature = isTemperatureAvailableForChange();
+        mTempTextView.setTextColor(canChangeTemperature
                 ? mAvailableTextColor : mUnavailableTextColor);
+        mIncreaseButton.setVisibility(canChangeTemperature ? View.VISIBLE : View.INVISIBLE);
+        mDecreaseButton.setVisibility(canChangeTemperature ? View.VISIBLE : View.INVISIBLE);
     }
 
     protected String getTempInDisplay() {
@@ -200,12 +223,16 @@ public class TemperatureControlView extends LinearLayout implements HvacView {
     }
 
     private void incrementTemperature(boolean increment) {
-        if (!mPowerOn) return;
+        if (!isTemperatureAvailableForChange()) {
+            return;
+        }
 
         float newTempC = increment
                 ? mCurrentTempC + mTemperatureIncrementCelsius
                 : mCurrentTempC - mTemperatureIncrementCelsius;
-        setTemperature(newTempC);
+        newTempC = Math.min(newTempC, mMaxTempC);
+        newTempC = Math.max(newTempC, mMinTempC);
+        mHvacPropertySetter.setHvacProperty(HVAC_TEMPERATURE_SET, mAreaId, newTempC);
     }
 
     private void updateTemperatureView() {
@@ -218,14 +245,6 @@ public class TemperatureControlView extends LinearLayout implements HvacView {
         mContext.getMainExecutor().execute(this::updateTemperatureViewUiThread);
     }
 
-    private void setTemperature(float tempC) {
-        tempC = Math.min(tempC, mMaxTempC);
-        tempC = Math.max(tempC, mMinTempC);
-        if (isTemperatureAvailableForChange()) {
-            mHvacPropertySetter.setHvacProperty(HVAC_TEMPERATURE_SET, mAreaId, tempC);
-        }
-    }
-
     /**
      * Configures the {@code button} to perform its click action repeatedly if pressed and held with
      * {@link #BUTTON_REPEAT_INTERVAL_MS}.
diff --git a/src/com/android/systemui/car/hvac/referenceui/BackgroundAdjustingTemperatureControlView.java b/src/com/android/systemui/car/hvac/referenceui/BackgroundAdjustingTemperatureControlView.java
index 63b50e8d..8583f77d 100644
--- a/src/com/android/systemui/car/hvac/referenceui/BackgroundAdjustingTemperatureControlView.java
+++ b/src/com/android/systemui/car/hvac/referenceui/BackgroundAdjustingTemperatureControlView.java
@@ -19,7 +19,7 @@ package com.android.systemui.car.hvac.referenceui;
 import android.annotation.ColorInt;
 import android.content.Context;
 import android.content.res.Resources;
-import android.graphics.Color;
+import android.content.res.TypedArray;
 import android.graphics.drawable.GradientDrawable;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -57,11 +57,14 @@ public class BackgroundAdjustingTemperatureControlView extends TemperatureContro
         Resources res = getResources();
         mUpperLimits = res.getIntArray(R.array.hvac_temperature_control_levels);
 
-        String[] colorStrings = res.getStringArray(R.array.hvac_temperature_level_backgrounds);
-        mTempColors = new int[colorStrings.length];
-        for (int i = 0; i < colorStrings.length; i++) {
-            mTempColors[i] = Color.parseColor(colorStrings[i]);
+        TypedArray colorRes = res.obtainTypedArray(R.array.hvac_temperature_level_backgrounds);
+        mTempColors = new int[colorRes.length()];
+        for (int i = 0; i < colorRes.length(); i++) {
+            mTempColors[i] = colorRes.getColor(i,
+                    res.getColor(R.color.hvac_temperature_default_bg_color,
+                            getContext().getTheme()));
         }
+        colorRes.recycle();
         mOffColor = res.getColor(R.color.hvac_temperature_off_text_bg_color, /* theme= */ null);
     }
 
@@ -72,6 +75,9 @@ public class BackgroundAdjustingTemperatureControlView extends TemperatureContro
                 isTemperatureAvailableForChange()
                         ? getTemperatureColor(getCurrentTempC())
                         : mOffColor);
+        boolean canChangeTemperature = isTemperatureAvailableForChange();
+        mIncreaseButton.setVisibility(canChangeTemperature ? View.VISIBLE : View.INVISIBLE);
+        mDecreaseButton.setVisibility(canChangeTemperature ? View.VISIBLE : View.INVISIBLE);
     }
 
     @VisibleForTesting
diff --git a/src/com/android/systemui/car/hvac/referenceui/FanDirectionButtons.java b/src/com/android/systemui/car/hvac/referenceui/FanDirectionButtons.java
index ea628afd..6a4e97b4 100644
--- a/src/com/android/systemui/car/hvac/referenceui/FanDirectionButtons.java
+++ b/src/com/android/systemui/car/hvac/referenceui/FanDirectionButtons.java
@@ -20,7 +20,6 @@ import static android.car.VehiclePropertyIds.HVAC_AUTO_ON;
 import static android.car.VehiclePropertyIds.HVAC_FAN_DIRECTION;
 import static android.car.VehiclePropertyIds.HVAC_POWER_ON;
 
-import android.car.hardware.CarPropertyConfig;
 import android.car.hardware.CarPropertyValue;
 import android.content.Context;
 import android.os.Build;
@@ -35,6 +34,7 @@ import androidx.annotation.Nullable;
 import com.android.systemui.R;
 import com.android.systemui.car.hvac.HvacController;
 import com.android.systemui.car.hvac.HvacPropertySetter;
+import com.android.systemui.car.hvac.HvacUtils;
 import com.android.systemui.car.hvac.HvacView;
 
 import java.util.ArrayList;
@@ -80,6 +80,7 @@ public class FanDirectionButtons extends LinearLayout implements HvacView {
     private HvacPropertySetter mHvacPropertySetter;
     private boolean mPowerOn = false;
     private boolean mAutoOn = false;
+    private boolean mDisableViewIfPowerOff = false;
     private float mOnAlpha;
     private float mOffAlpha;
     private int mCurrentDirection = INVALID_ID;
@@ -128,8 +129,8 @@ public class FanDirectionButtons extends LinearLayout implements HvacView {
     }
 
     @Override
-    public void setConfigInfo(CarPropertyConfig<?> carPropertyConfig) {
-        // no-op.
+    public void setDisableViewIfPowerOff(boolean disableViewIfPowerOff) {
+        mDisableViewIfPowerOff = disableViewIfPowerOff;
     }
 
     @Override
@@ -184,16 +185,6 @@ public class FanDirectionButtons extends LinearLayout implements HvacView {
         return mHvacGlobalAreaId;
     }
 
-    @Override
-    public void onLocaleListChanged() {
-        // no-op.
-    }
-
-    @Override
-    public void onHvacTemperatureUnitChanged(boolean usesFahrenheit) {
-        // no-op.
-    }
-
     private void init() {
         inflate(getContext(), R.layout.fan_direction, this);
         mHvacGlobalAreaId = getContext().getResources().getInteger(R.integer.hvac_global_area_id);
@@ -213,6 +204,6 @@ public class FanDirectionButtons extends LinearLayout implements HvacView {
     }
 
     private boolean shouldAllowControl() {
-        return mPowerOn && !mAutoOn;
+        return HvacUtils.shouldAllowControl(mDisableViewIfPowerOff, mPowerOn, mAutoOn);
     }
 }
diff --git a/src/com/android/systemui/car/hvac/referenceui/FanSpeedBar.java b/src/com/android/systemui/car/hvac/referenceui/FanSpeedBar.java
index 582ac443..3a78f255 100644
--- a/src/com/android/systemui/car/hvac/referenceui/FanSpeedBar.java
+++ b/src/com/android/systemui/car/hvac/referenceui/FanSpeedBar.java
@@ -27,12 +27,14 @@ import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.drawable.GradientDrawable;
 import android.util.AttributeSet;
+import android.view.View;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.android.systemui.R;
 import com.android.systemui.car.hvac.HvacController;
 import com.android.systemui.car.hvac.HvacPropertySetter;
+import com.android.systemui.car.hvac.HvacUtils;
 import com.android.systemui.car.hvac.HvacView;
 
 import java.util.ArrayList;
@@ -58,18 +60,22 @@ public class FanSpeedBar extends RelativeLayout implements HvacView {
     private TextView mMaxButton;
     private TextView mOffButton;
 
-    private FanSpeedBarSegment mFanSpeed1;
-    private FanSpeedBarSegment mFanSpeed2;
-    private FanSpeedBarSegment mFanSpeed3;
-    private FanSpeedBarSegment mFanSpeed4;
-
     private boolean mPowerOn = false;
     private boolean mAutoOn = false;
+    private boolean mDisableViewIfPowerOff = false;
 
     private float mOnAlpha;
     private float mOffAlpha;
+    private int mMinFanSpeedSupportedByUi;
+    private int mMaxFanSpeedSupportedByUi;
+    private int mCurrentFanSpeed;
 
-    private final List<FanSpeedBarSegment> mFanSpeedButtons = new ArrayList<>();
+    /**
+     * List of all fan buttons in the order they are displayed in the UI left to right. In other
+     * words, first the off button, then the {@link FanSpeedBarSegment} buttons, and lastly the max
+     * button.
+     */
+    private final List<View> mFanSpeedButtons = new ArrayList<>();
 
     public FanSpeedBar(Context context) {
         super(context);
@@ -94,7 +100,7 @@ public class FanSpeedBar extends RelativeLayout implements HvacView {
         // inset by fan speed inset to make it appear thinner.
         int barHeight = res.getDimensionPixelSize(R.dimen.hvac_fan_speed_bar_height);
         int insetHeight = res.getDimensionPixelSize(R.dimen.hvac_fan_speed_bar_vertical_inset);
-        mCornerRadius = (barHeight - 2 * insetHeight) / 2;
+        mCornerRadius = (float) (barHeight - 2 * insetHeight) / 2;
 
         mFanOffActiveBgColor = res.getColor(R.color.hvac_fanspeed_off_active_bg);
 
@@ -102,6 +108,8 @@ public class FanSpeedBar extends RelativeLayout implements HvacView {
         mButtonInactiveTextColor = res.getColor(R.color.hvac_fanspeed_off_inactive_text_color);
         mFanMaxActiveBgColor = res.getColor(R.color.hvac_fanspeed_segment_color);
         mHvacGlobalAreaId = res.getInteger(R.integer.hvac_global_area_id);
+        mMinFanSpeedSupportedByUi = res.getInteger(R.integer.hvac_min_fan_speed);
+        mMaxFanSpeedSupportedByUi = res.getInteger(R.integer.hvac_max_fan_speed);
     }
 
     @Override
@@ -110,40 +118,49 @@ public class FanSpeedBar extends RelativeLayout implements HvacView {
     }
 
     @Override
-    public void setConfigInfo(CarPropertyConfig<?> carPropertyConfig) {
-        // no-op.
+    public void setDisableViewIfPowerOff(boolean disableViewIfPowerOff) {
+        mDisableViewIfPowerOff = disableViewIfPowerOff;
     }
 
     @Override
     public void onPropertyChanged(CarPropertyValue value) {
         if (value.getPropertyId() == HVAC_FAN_SPEED) {
-            int level = (Integer) value.getValue();
-
-            setOffAndMaxButtonsActiveState(level);
-
-            int fanSpeedCount = mFanSpeedButtons.size();
-            int fanSpeedIndex = Math.min(level - 1, 4);
-
+            int fanSpeed = (Integer) value.getValue();
+            // Sanitize the fan speed value to not exceed the number of
+            // fan buttons.
+            if (fanSpeed > mMaxFanSpeedSupportedByUi) {
+                fanSpeed = mMaxFanSpeedSupportedByUi;
+            }
+            if (mCurrentFanSpeed == fanSpeed) {
+                return;
+            }
+            mCurrentFanSpeed = fanSpeed;
+            int fanSpeedIndex = fanSpeed - mMinFanSpeedSupportedByUi;
             int delay = 0;
             // Animate segments turning on when the fan speed is increased.
-            for (int i = 0; i < fanSpeedIndex; i++) {
-                FanSpeedBarSegment fanSpeedButton = mFanSpeedButtons.get(i);
+            // Start from index 1 to ignore off button.
+            for (int i = 1; i < fanSpeedIndex + 1; i++) {
+                if (!(mFanSpeedButtons.get(i) instanceof FanSpeedBarSegment fanSpeedButton)) {
+                    continue;
+                }
                 if (!fanSpeedButton.isTurnedOn()) {
                     fanSpeedButton.playTurnOnAnimation(delay, BAR_SEGMENT_ANIMATION_PERIOD_MS);
                     delay += BAR_SEGMENT_ANIMATION_DELAY_MS;
                 }
             }
-
             delay = 0;
             // Animate segments turning off when the fan speed is decreased.
-            for (int i = fanSpeedCount - 1; i >= fanSpeedIndex; i--) {
-                FanSpeedBarSegment fanSpeedButton = mFanSpeedButtons.get(i);
+            // Start from 2nd to last index to ignore max button.
+            for (int i = mFanSpeedButtons.size() - 2; i > fanSpeedIndex; i--) {
+                if (!(mFanSpeedButtons.get(i) instanceof FanSpeedBarSegment fanSpeedButton)) {
+                    continue;
+                }
                 if (fanSpeedButton.isTurnedOn()) {
                     fanSpeedButton.playTurnOffAnimation(delay, BAR_SEGMENT_ANIMATION_PERIOD_MS);
                     delay += BAR_SEGMENT_ANIMATION_DELAY_MS;
                 }
             }
-
+            setOffAndMaxButtonsActiveState(fanSpeed);
             return;
         }
 
@@ -175,25 +192,17 @@ public class FanSpeedBar extends RelativeLayout implements HvacView {
         mOnAlpha = mContext.getResources().getFloat(R.dimen.hvac_turned_on_alpha);
         mOffAlpha = mContext.getResources().getFloat(R.dimen.hvac_turned_off_alpha);
 
-        mOffButton = (TextView) findViewById(R.id.fan_off);
-        mFanSpeed1 = (FanSpeedBarSegment) findViewById(R.id.fan_speed_1);
-        mFanSpeed2 = (FanSpeedBarSegment) findViewById(R.id.fan_speed_2);
-        mFanSpeed3 = (FanSpeedBarSegment) findViewById(R.id.fan_speed_3);
-        mFanSpeed4 = (FanSpeedBarSegment) findViewById(R.id.fan_speed_4);
-        mMaxButton = (TextView) findViewById(R.id.fan_max);
-
-        mFanSpeedButtons.add(mFanSpeed1);
-        mFanSpeedButtons.add(mFanSpeed2);
-        mFanSpeedButtons.add(mFanSpeed3);
-        mFanSpeedButtons.add(mFanSpeed4);
-
-        for (int i = 0; i < mFanSpeedButtons.size(); i++) {
-            mFanSpeedButtons.get(i).setOnClickListener(
-                    getOnClickListener(/* fanSpeedLevel =*/ i + 2));
-        }
-
-        mMaxButton.setOnClickListener(getOnClickListener(6));
-        mOffButton.setOnClickListener(getOnClickListener(1));
+        // Buttons are added to list in the order that they are displayed
+        // in the UI from left to right.
+        mOffButton = findViewById(R.id.fan_off);
+        mFanSpeedButtons.add(mOffButton);
+        mFanSpeedButtons.add(findViewById(R.id.fan_speed_1));
+        mFanSpeedButtons.add(findViewById(R.id.fan_speed_2));
+        mFanSpeedButtons.add(findViewById(R.id.fan_speed_3));
+        mFanSpeedButtons.add(findViewById(R.id.fan_speed_4));
+        mMaxButton = findViewById(R.id.fan_max);
+        mFanSpeedButtons.add(mMaxButton);
+        setFanSpeedButtonListeners();
 
         // Set the corner radius of the off/max button based on the height of the bar to get a
         // pill-shaped border.
@@ -212,13 +221,27 @@ public class FanSpeedBar extends RelativeLayout implements HvacView {
     }
 
     @Override
-    public void onHvacTemperatureUnitChanged(boolean usesFahrenheit) {
-        // no-op.
+    public void setConfigInfo(CarPropertyConfig<?> carPropertyConfig) {
+        // If there are different min/max values between area IDs,
+        // use the highest min value and lowest max value so the
+        // value can be set across all area IDs.
+        Integer highestMinValue = HvacUtils.getHighestMinValueForAllAreaIds(carPropertyConfig);
+        Integer lowestMaxValue = HvacUtils.getLowestMaxValueForAllAreaIds(carPropertyConfig);
+        if (highestMinValue != null) {
+            mMinFanSpeedSupportedByUi = highestMinValue;
+        }
+        if (lowestMaxValue != null) {
+            // The number of fan speeds cannot exceed the number of icons that represent
+            // the levels.
+            mMaxFanSpeedSupportedByUi = Math.min(lowestMaxValue,
+                    mMinFanSpeedSupportedByUi + mFanSpeedButtons.size() - 1);
+        }
+        setFanSpeedButtonListeners();
     }
 
-    protected void setOffAndMaxButtonsActiveState(int level) {
-        setOffButtonActive(level == 1);
-        setMaxButtonActive(level == 6);
+    private void setOffAndMaxButtonsActiveState(int fanSpeed) {
+        setOffButtonActive(fanSpeed == mMinFanSpeedSupportedByUi);
+        setMaxButtonActive(fanSpeed == mMaxFanSpeedSupportedByUi);
     }
 
     private void setMaxButtonActive(boolean active) {
@@ -243,10 +266,10 @@ public class FanSpeedBar extends RelativeLayout implements HvacView {
         }
     }
 
-    private OnClickListener getOnClickListener(int fanSpeedLevel) {
+    private OnClickListener getOnClickListener(int fanSpeed) {
         return v -> {
             if (shouldAllowControl()) {
-                mHvacPropertySetter.setHvacProperty(HVAC_FAN_SPEED, getAreaId(), fanSpeedLevel);
+                mHvacPropertySetter.setHvacProperty(HVAC_FAN_SPEED, getAreaId(), fanSpeed);
             }
         };
     }
@@ -256,6 +279,13 @@ public class FanSpeedBar extends RelativeLayout implements HvacView {
     }
 
     private boolean shouldAllowControl() {
-        return mPowerOn && !mAutoOn;
+        return HvacUtils.shouldAllowControl(mDisableViewIfPowerOff, mPowerOn, mAutoOn);
+    }
+
+    private void setFanSpeedButtonListeners() {
+        for (int i = 0; i < mFanSpeedButtons.size(); i++) {
+            mFanSpeedButtons.get(i).setOnClickListener(
+                    getOnClickListener(/* fanSpeed =*/ mMinFanSpeedSupportedByUi + i));
+        }
     }
 }
 \ No newline at end of file
diff --git a/src/com/android/systemui/car/hvac/toggle/HvacToggleButton.java b/src/com/android/systemui/car/hvac/toggle/HvacToggleButton.java
index a01ca260..15530aaf 100644
--- a/src/com/android/systemui/car/hvac/toggle/HvacToggleButton.java
+++ b/src/com/android/systemui/car/hvac/toggle/HvacToggleButton.java
@@ -20,7 +20,6 @@ import static android.car.VehiclePropertyIds.HVAC_AUTO_ON;
 import static android.car.VehiclePropertyIds.HVAC_POWER_ON;
 
 import android.car.VehiclePropertyIds;
-import android.car.hardware.CarPropertyConfig;
 import android.car.hardware.CarPropertyValue;
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -35,6 +34,7 @@ import androidx.annotation.CallSuper;
 import com.android.systemui.R;
 import com.android.systemui.car.hvac.HvacController;
 import com.android.systemui.car.hvac.HvacPropertySetter;
+import com.android.systemui.car.hvac.HvacUtils;
 import com.android.systemui.car.hvac.HvacView;
 
 /**
@@ -54,8 +54,8 @@ public abstract class HvacToggleButton<PropertyType> extends ImageButton impleme
     private boolean mIsOn;
     private boolean mPowerOn = false;
     private boolean mAutoOn = false;
-    private boolean mTurnOffIfPowerOff;
-    private boolean mTurnOffIfAutoOn;
+    private boolean mDisableViewIfPowerOff = false;
+    private boolean mDisableViewIfAutoOn;
     private Drawable mOnDrawable;
     private Drawable mOffDrawable;
     private float mOnAlpha;
@@ -87,10 +87,7 @@ public abstract class HvacToggleButton<PropertyType> extends ImageButton impleme
         super.onFinishInflate();
         setOnClickListener(v -> {
             if (!shouldAllowControl()) return;
-
-            if (mHvacPropertySetter != null) {
-                handleClick(mHvacPropertySetter);
-            }
+            handleClick(mHvacPropertySetter);
         });
         updateUIState();
     }
@@ -102,9 +99,8 @@ public abstract class HvacToggleButton<PropertyType> extends ImageButton impleme
         mAreaId = typedArray.getInt(R.styleable.HvacView_hvacAreaId, INVALID_ID);
         mOnDrawable = typedArray.getDrawable(R.styleable.HvacView_hvacToggleOnButtonDrawable);
         mOffDrawable = typedArray.getDrawable(R.styleable.HvacView_hvacToggleOffButtonDrawable);
-        mTurnOffIfPowerOff =
-                typedArray.getBoolean(R.styleable.HvacView_hvacTurnOffIfPowerOff, true);
-        mTurnOffIfAutoOn = typedArray.getBoolean(R.styleable.HvacView_hvacTurnOffIfAutoOn, false);
+        mDisableViewIfAutoOn =
+                typedArray.getBoolean(R.styleable.HvacView_hvacDisableViewIfAutoOn, false);
         mOnAlpha = mContext.getResources().getFloat(R.dimen.hvac_turned_on_alpha);
         mOffAlpha = mContext.getResources().getFloat(R.dimen.hvac_turned_off_alpha);
         typedArray.recycle();
@@ -132,14 +128,13 @@ public abstract class HvacToggleButton<PropertyType> extends ImageButton impleme
     protected abstract boolean isToggleOn();
 
     protected boolean shouldAllowControl() {
-        if ((mPropertyId & VEHICLE_AREA_MASK) == VEHICLE_AREA_SEAT) {
-            if (mTurnOffIfPowerOff && !mPowerOn) {
-                return false;
-            }
+        if (mHvacPropertySetter == null) {
+            return false;
+        }
 
-            if (mTurnOffIfAutoOn && mAutoOn) {
-                return false;
-            }
+        if ((mPropertyId & VEHICLE_AREA_MASK) == VEHICLE_AREA_SEAT) {
+            return HvacUtils.shouldAllowControl(mDisableViewIfPowerOff, mPowerOn,
+                    mDisableViewIfAutoOn, mAutoOn);
         }
 
         return true;
@@ -192,17 +187,7 @@ public abstract class HvacToggleButton<PropertyType> extends ImageButton impleme
     }
 
     @Override
-    public void onHvacTemperatureUnitChanged(boolean usesFahrenheit) {
-        // no-op.
-    }
-
-    @Override
-    public void setConfigInfo(CarPropertyConfig<?> carPropertyConfig) {
-        // no-op.
-    }
-
-    @Override
-    public void onLocaleListChanged() {
-        // no-op.
+    public void setDisableViewIfPowerOff(boolean disableViewIfPowerOff) {
+        mDisableViewIfPowerOff = disableViewIfPowerOff;
     }
 }
diff --git a/src/com/android/systemui/car/keyguard/CarKeyguardModule.java b/src/com/android/systemui/car/keyguard/CarKeyguardModule.java
index 90da2980..b3e55fc3 100644
--- a/src/com/android/systemui/car/keyguard/CarKeyguardModule.java
+++ b/src/com/android/systemui/car/keyguard/CarKeyguardModule.java
@@ -16,6 +16,7 @@
 
 package com.android.systemui.car.keyguard;
 
+import android.app.IActivityTaskManager;
 import android.app.trust.TrustManager;
 import android.content.Context;
 import android.os.PowerManager;
@@ -49,6 +50,7 @@ import com.android.systemui.keyguard.KeyguardViewMediator;
 import com.android.systemui.keyguard.WindowManagerLockscreenVisibilityManager;
 import com.android.systemui.keyguard.dagger.KeyguardFaceAuthNotSupportedModule;
 import com.android.systemui.keyguard.data.repository.KeyguardRepositoryModule;
+import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor;
 import com.android.systemui.keyguard.ui.viewmodel.DreamingToLockscreenTransitionViewModel;
 import com.android.systemui.log.SessionTracker;
 import com.android.systemui.navigationbar.NavigationModeController;
@@ -62,6 +64,7 @@ import com.android.systemui.statusbar.phone.ScreenOffAnimationController;
 import com.android.systemui.statusbar.phone.ScrimController;
 import com.android.systemui.statusbar.policy.KeyguardStateController;
 import com.android.systemui.statusbar.policy.UserSwitcherController;
+import com.android.systemui.user.domain.interactor.SelectedUserInteractor;
 import com.android.systemui.util.DeviceConfigProxy;
 import com.android.systemui.util.kotlin.JavaAdapter;
 import com.android.systemui.util.settings.SecureSettings;
@@ -133,6 +136,7 @@ public class CarKeyguardModule {
             Lazy<NotificationShadeWindowController> notificationShadeWindowController,
             Lazy<ActivityLaunchAnimator> activityLaunchAnimator,
             Lazy<ScrimController> scrimControllerLazy,
+            IActivityTaskManager activityTaskManagerService,
             FeatureFlags featureFlags,
             SecureSettings secureSettings,
             SystemSettings systemSettings,
@@ -140,7 +144,9 @@ public class CarKeyguardModule {
             @Main CoroutineDispatcher mainDispatcher,
             Lazy<DreamingToLockscreenTransitionViewModel> dreamingToLockscreenTransitionViewModel,
             SystemPropertiesHelper systemPropertiesHelper,
-            Lazy<WindowManagerLockscreenVisibilityManager> wmLockscreenVisibilityManager) {
+            Lazy<WindowManagerLockscreenVisibilityManager> wmLockscreenVisibilityManager,
+            SelectedUserInteractor selectedUserInteractor,
+            KeyguardInteractor keyguardInteractor) {
         return new CarKeyguardViewMediator(
                 context,
                 uiEventLogger,
@@ -176,6 +182,7 @@ public class CarKeyguardModule {
                 notificationShadeWindowController,
                 activityLaunchAnimator,
                 scrimControllerLazy,
+                activityTaskManagerService,
                 featureFlags,
                 secureSettings,
                 systemSettings,
@@ -183,7 +190,9 @@ public class CarKeyguardModule {
                 mainDispatcher,
                 dreamingToLockscreenTransitionViewModel,
                 systemPropertiesHelper,
-                wmLockscreenVisibilityManager);
+                wmLockscreenVisibilityManager,
+                selectedUserInteractor,
+                keyguardInteractor);
     }
 
     /** */
diff --git a/src/com/android/systemui/car/keyguard/CarKeyguardViewController.java b/src/com/android/systemui/car/keyguard/CarKeyguardViewController.java
index 0cdc5c89..06bd2c7c 100644
--- a/src/com/android/systemui/car/keyguard/CarKeyguardViewController.java
+++ b/src/com/android/systemui/car/keyguard/CarKeyguardViewController.java
@@ -67,6 +67,7 @@ import com.android.systemui.statusbar.phone.KeyguardBypassController;
 import com.android.systemui.statusbar.policy.KeyguardStateController;
 import com.android.systemui.toast.SystemUIToast;
 import com.android.systemui.toast.ToastFactory;
+import com.android.systemui.user.domain.interactor.SelectedUserInteractor;
 import com.android.systemui.util.concurrency.DelayableExecutor;
 
 import dagger.Lazy;
@@ -86,7 +87,6 @@ public class CarKeyguardViewController extends OverlayViewController implements
     private static final float TOAST_PARAMS_VERTICAL_WEIGHT = 1.0f;
 
     private final Context mContext;
-    private final UserTracker mUserTracker;
     private final DelayableExecutor mMainExecutor;
     private final WindowManager mWindowManager;
     private final ToastFactory mToastFactory;
@@ -138,6 +138,7 @@ public class CarKeyguardViewController extends OverlayViewController implements
     private final KeyguardMessageAreaController.Factory mMessageAreaControllerFactory;
     private final BouncerLogger mBouncerLogger;
     private final FeatureFlags mFeatureFlags;
+    private final SelectedUserInteractor mSelectedUserInteractor;
     private final BouncerMessageInteractor mBouncerMessageInteractor;
 
     private OnKeyguardCancelClickedListener mKeyguardCancelClickedListener;
@@ -171,11 +172,11 @@ public class CarKeyguardViewController extends OverlayViewController implements
             KeyguardMessageAreaController.Factory messageAreaControllerFactory,
             BouncerLogger bouncerLogger,
             FeatureFlags featureFlags,
-            BouncerMessageInteractor bouncerMessageInteractor) {
+            BouncerMessageInteractor bouncerMessageInteractor,
+            SelectedUserInteractor selectedUserInteractor) {
         super(R.id.keyguard_stub, overlayViewGlobalStateController);
 
         mContext = context;
-        mUserTracker = userTracker;
         mMainExecutor = mainExecutor;
         mWindowManager = windowManager;
         mToastFactory = toastFactory;
@@ -192,6 +193,7 @@ public class CarKeyguardViewController extends OverlayViewController implements
         mKeyguardBouncerComponentFactory = keyguardBouncerComponentFactory;
         mPrimaryBouncerToGoneTransitionViewModel = primaryBouncerToGoneTransitionViewModel;
         mBouncerView = bouncerView;
+        mSelectedUserInteractor = selectedUserInteractor;
 
         mToastShowDurationMillisecond = mContext.getResources().getInteger(
                 R.integer.car_keyguard_toast_show_duration_millisecond);
@@ -221,14 +223,15 @@ public class CarKeyguardViewController extends OverlayViewController implements
                 mMessageAreaControllerFactory,
                 mBouncerMessageInteractor,
                 mBouncerLogger,
-                mFeatureFlags);
+                mFeatureFlags,
+                mSelectedUserInteractor);
         mBiometricUnlockControllerLazy.get().setKeyguardViewController(this);
     }
 
     @Override
     @MainThread
     public void notifyKeyguardAuthenticated(boolean strongAuth) {
-        mPrimaryBouncerInteractor.notifyKeyguardAuthenticated(strongAuth);
+        mPrimaryBouncerInteractor.notifyKeyguardAuthenticatedBiometrics(strongAuth);
     }
 
     @Override
@@ -502,8 +505,8 @@ public class CarKeyguardViewController extends OverlayViewController implements
      * WARNING: This method might cause Binder calls.
      */
     private boolean isSecure() {
-        return mKeyguardSecurityModel.getSecurityMode(
-                KeyguardUpdateMonitor.getCurrentUser()) != KeyguardSecurityModel.SecurityMode.None;
+        return mKeyguardSecurityModel.getSecurityMode(mSelectedUserInteractor.getSelectedUserId())
+                != KeyguardSecurityModel.SecurityMode.None;
     }
 
 
diff --git a/src/com/android/systemui/car/keyguard/CarKeyguardViewMediator.java b/src/com/android/systemui/car/keyguard/CarKeyguardViewMediator.java
index 71636a5b..f4a1fa8b 100644
--- a/src/com/android/systemui/car/keyguard/CarKeyguardViewMediator.java
+++ b/src/com/android/systemui/car/keyguard/CarKeyguardViewMediator.java
@@ -16,6 +16,7 @@
 
 package com.android.systemui.car.keyguard;
 
+import android.app.IActivityTaskManager;
 import android.app.trust.TrustManager;
 import android.content.Context;
 import android.os.PowerManager;
@@ -44,6 +45,7 @@ import com.android.systemui.flags.SystemPropertiesHelper;
 import com.android.systemui.keyguard.DismissCallbackRegistry;
 import com.android.systemui.keyguard.KeyguardUnlockAnimationController;
 import com.android.systemui.keyguard.KeyguardViewMediator;
+import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor;
 import com.android.systemui.keyguard.WindowManagerLockscreenVisibilityManager;
 import com.android.systemui.keyguard.ui.viewmodel.DreamingToLockscreenTransitionViewModel;
 import com.android.systemui.log.SessionTracker;
@@ -58,6 +60,7 @@ import com.android.systemui.statusbar.phone.ScreenOffAnimationController;
 import com.android.systemui.statusbar.phone.ScrimController;
 import com.android.systemui.statusbar.policy.KeyguardStateController;
 import com.android.systemui.statusbar.policy.UserSwitcherController;
+import com.android.systemui.user.domain.interactor.SelectedUserInteractor;
 import com.android.systemui.util.DeviceConfigProxy;
 import com.android.systemui.util.kotlin.JavaAdapter;
 import com.android.systemui.util.settings.SecureSettings;
@@ -121,6 +124,7 @@ public class CarKeyguardViewMediator extends KeyguardViewMediator {
             Lazy<NotificationShadeWindowController> notificationShadeWindowControllerLazy,
             Lazy<ActivityLaunchAnimator> activityLaunchAnimator,
             Lazy<ScrimController> scrimControllerLazy,
+            IActivityTaskManager activityTaskManagerService,
             FeatureFlags featureFlags,
             SecureSettings secureSettings,
             SystemSettings systemSettings,
@@ -128,7 +132,9 @@ public class CarKeyguardViewMediator extends KeyguardViewMediator {
             @Main CoroutineDispatcher mainDispatcher,
             Lazy<DreamingToLockscreenTransitionViewModel> dreamingToLockscreenTransitionViewModel,
             SystemPropertiesHelper systemPropertiesHelper,
-            Lazy<WindowManagerLockscreenVisibilityManager> wmLockscreenVisibilityManager) {
+            Lazy<WindowManagerLockscreenVisibilityManager> wmLockscreenVisibilityManager,
+            SelectedUserInteractor selectedUserInteractor,
+            KeyguardInteractor keyguardInteractor) {
         super(context, uiEventLogger, sessionTracker,
                 userTracker, falsingCollector, lockPatternUtils, broadcastDispatcher,
                 statusBarKeyguardViewManagerLazy, dismissCallbackRegistry, keyguardUpdateMonitor,
@@ -143,11 +149,15 @@ public class CarKeyguardViewMediator extends KeyguardViewMediator {
                 mShadeControllerLazy,
                 notificationShadeWindowControllerLazy,
                 activityLaunchAnimator,
-                scrimControllerLazy, featureFlags, secureSettings, systemSettings, systemClock,
+                scrimControllerLazy,
+                activityTaskManagerService,
+                featureFlags, secureSettings, systemSettings, systemClock,
                 mainDispatcher,
                 dreamingToLockscreenTransitionViewModel,
                 systemPropertiesHelper,
-                wmLockscreenVisibilityManager);
+                wmLockscreenVisibilityManager,
+                selectedUserInteractor,
+                keyguardInteractor);
         mContext = context;
     }
 
diff --git a/src/com/android/systemui/car/notification/NotificationPanelViewController.java b/src/com/android/systemui/car/notification/NotificationPanelViewController.java
index a7aa72ec..581744ca 100644
--- a/src/com/android/systemui/car/notification/NotificationPanelViewController.java
+++ b/src/com/android/systemui/car/notification/NotificationPanelViewController.java
@@ -41,6 +41,7 @@ import com.android.car.notification.CarNotificationListener;
 import com.android.car.notification.CarNotificationView;
 import com.android.car.notification.CarUxRestrictionManagerWrapper;
 import com.android.car.notification.NotificationClickHandlerFactory;
+import com.android.car.notification.NotificationClickHandlerFactory.OnNotificationClickListener;
 import com.android.car.notification.NotificationDataManager;
 import com.android.car.notification.NotificationViewController;
 import com.android.car.notification.PreprocessingManager;
@@ -48,6 +49,7 @@ import com.android.internal.statusbar.IStatusBarService;
 import com.android.systemui.R;
 import com.android.systemui.car.CarDeviceProvisionedController;
 import com.android.systemui.car.CarServiceProvider;
+import com.android.systemui.car.CarServiceProvider.CarServiceOnConnectedListener;
 import com.android.systemui.car.window.OverlayPanelViewController;
 import com.android.systemui.car.window.OverlayViewController;
 import com.android.systemui.car.window.OverlayViewGlobalStateController;
@@ -103,8 +105,35 @@ public class NotificationPanelViewController extends OverlayPanelViewController
     private boolean mIsSwipingVerticallyToClose;
     private boolean mIsNotificationCardSwiping;
     private boolean mImeVisible = false;
+    private boolean mOnConnectListenerAdded;
 
     private OnUnseenCountUpdateListener mUnseenCountUpdateListener;
+    private OnNotificationClickListener mOnNotificationClickListener =
+            (launchResult, alertEntry) -> {
+                if (launchResult == ActivityManager.START_TASK_TO_FRONT
+                        || launchResult == ActivityManager.START_SUCCESS) {
+                    animateCollapsePanel();
+                }
+            };
+
+    private CarServiceOnConnectedListener mCarConnectedListener =
+            new CarServiceOnConnectedListener() {
+                @Override
+                public void onConnected(Car car) {
+                    CarUxRestrictionsManager carUxRestrictionsManager =
+                            (CarUxRestrictionsManager)
+                                    car.getCarManager(Car.CAR_UX_RESTRICTION_SERVICE);
+                    mCarUxRestrictionManagerWrapper.setCarUxRestrictionsManager(
+                            carUxRestrictionsManager);
+
+                    PreprocessingManager preprocessingManager =
+                            PreprocessingManager.getInstance(mContext);
+                    preprocessingManager.setCarUxRestrictionManagerWrapper(
+                            mCarUxRestrictionManagerWrapper);
+
+                    mNotificationViewController.enable();
+                }
+            };
 
     @Inject
     public NotificationPanelViewController(
@@ -276,6 +305,13 @@ public class NotificationPanelViewController extends OverlayPanelViewController
         // Do not reinflate the view if it has not been inflated at all.
         if (!isInflated()) return;
 
+        mNotificationClickHandlerFactory.unregisterClickListener(mOnNotificationClickListener);
+
+        if (mOnConnectListenerAdded) {
+            mCarServiceProvider.removeListener(mCarConnectedListener);
+            mOnConnectListenerAdded = false;
+        }
+
         ViewGroup container = (ViewGroup) getLayout();
         container.removeView(mNotificationView);
 
@@ -304,12 +340,7 @@ public class NotificationPanelViewController extends OverlayPanelViewController
         setUpHandleBar();
         setupNotificationPanel();
 
-        mNotificationClickHandlerFactory.registerClickListener((launchResult, alertEntry) -> {
-            if (launchResult == ActivityManager.START_TASK_TO_FRONT
-                    || launchResult == ActivityManager.START_SUCCESS) {
-                animateCollapsePanel();
-            }
-        });
+        mNotificationClickHandlerFactory.registerClickListener(mOnNotificationClickListener);
 
         mNotificationDataManager.setOnUnseenCountUpdateListener(() -> {
             if (mUnseenCountUpdateListener != null) {
@@ -334,18 +365,10 @@ public class NotificationPanelViewController extends OverlayPanelViewController
                 mCarNotificationListener,
                 mCarUxRestrictionManagerWrapper);
 
-        mCarServiceProvider.addListener(car -> {
-            CarUxRestrictionsManager carUxRestrictionsManager =
-                    (CarUxRestrictionsManager)
-                            car.getCarManager(Car.CAR_UX_RESTRICTION_SERVICE);
-            mCarUxRestrictionManagerWrapper.setCarUxRestrictionsManager(
-                    carUxRestrictionsManager);
-
-            PreprocessingManager preprocessingManager = PreprocessingManager.getInstance(mContext);
-            preprocessingManager.setCarUxRestrictionManagerWrapper(mCarUxRestrictionManagerWrapper);
-
-            mNotificationViewController.enable();
-        });
+        if (!mOnConnectListenerAdded) {
+            mCarServiceProvider.addListener(mCarConnectedListener);
+            mOnConnectListenerAdded = true;
+        }
     }
 
     private void setupNotificationPanel() {
@@ -448,6 +471,15 @@ public class NotificationPanelViewController extends OverlayPanelViewController
         mNotificationDataManager.clearAll();
     }
 
+    /**
+     * Forwards the call to clear all Notification cache.
+     * Note: This is a blocking call so should not execute any long-running or time-consuming tasks
+     * like storing cache.
+     */
+    public void clearCache() {
+        mCarNotificationListener.clearCache();
+    }
+
     // OverlayPanelViewController
 
     @Override
diff --git a/src/com/android/systemui/car/notification/NotificationPanelViewMediator.java b/src/com/android/systemui/car/notification/NotificationPanelViewMediator.java
index d03689e5..b5fab268 100644
--- a/src/com/android/systemui/car/notification/NotificationPanelViewMediator.java
+++ b/src/com/android/systemui/car/notification/NotificationPanelViewMediator.java
@@ -26,6 +26,7 @@ import android.content.res.Configuration;
 import android.util.Log;
 
 import androidx.annotation.CallSuper;
+import androidx.annotation.NonNull;
 
 import com.android.systemui.broadcast.BroadcastDispatcher;
 import com.android.systemui.car.CarDeviceProvisionedController;
@@ -79,6 +80,11 @@ public class NotificationPanelViewMediator implements OverlayViewMediator,
                     new IntentFilter(Intent.ACTION_CLOSE_SYSTEM_DIALOGS), /* executor= */ null,
                     mUserTracker.getUserHandle());
         }
+
+        @Override
+        public void onUserChanging(int newUser, @NonNull Context userContext) {
+            mNotificationPanelViewController.clearCache();
+        }
     };
 
     private boolean mIsUiModeNight;
@@ -127,6 +133,9 @@ public class NotificationPanelViewMediator implements OverlayViewMediator,
                     }
                 });
 
+        mCarSystemBarController.registerNotificationPanelViewController(
+                mNotificationPanelViewController);
+
         mBroadcastDispatcher.registerReceiver(mBroadcastReceiver,
                 new IntentFilter(Intent.ACTION_CLOSE_SYSTEM_DIALOGS), null,
                 mUserTracker.getUserHandle());
diff --git a/src/com/android/systemui/car/qc/ProfileSwitcher.java b/src/com/android/systemui/car/qc/ProfileSwitcher.java
index 370b5844..b23eed6b 100644
--- a/src/com/android/systemui/car/qc/ProfileSwitcher.java
+++ b/src/com/android/systemui/car/qc/ProfileSwitcher.java
@@ -83,11 +83,24 @@ public class ProfileSwitcher extends BaseLocalQCProvider {
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
     private static final int TIMEOUT_MS = CarProperties.user_hal_timeout().orElse(5_000) + 500;
 
+    private final CarServiceProvider.CarServiceOnConnectedListener mCarServiceOnConnectedListener =
+            new CarServiceProvider.CarServiceOnConnectedListener() {
+                @Override
+                public void onConnected(Car car) {
+                    if (DEBUG) {
+                        Log.d(TAG, "car connected");
+                    }
+                    mCarUserManager = car.getCarManager(CarUserManager.class);
+                    notifyChange();
+                }
+            };
+
     protected final UserTracker mUserTracker;
     protected final UserIconProvider mUserIconProvider;
     private final UserManager mUserManager;
     private final DevicePolicyManager mDevicePolicyManager;
     public final Handler mHandler;
+    private final CarServiceProvider mCarServiceProvider;
     @Nullable
     private CarUserManager mCarUserManager;
     protected boolean mPendingUserAdd;
@@ -101,7 +114,8 @@ public class ProfileSwitcher extends BaseLocalQCProvider {
         mDevicePolicyManager = context.getSystemService(DevicePolicyManager.class);
         mUserIconProvider = new UserIconProvider();
         mHandler = handler;
-        carServiceProvider.addListener(this::onCarConnected);
+        mCarServiceProvider = carServiceProvider;
+        mCarServiceProvider.addListener(mCarServiceOnConnectedListener);
     }
 
     @VisibleForTesting
@@ -114,6 +128,7 @@ public class ProfileSwitcher extends BaseLocalQCProvider {
         mDevicePolicyManager = devicePolicyManager;
         mUserIconProvider = userIconProvider;
         mCarUserManager = carUserManager;
+        mCarServiceProvider = null;
         mHandler = handler;
     }
 
@@ -159,6 +174,13 @@ public class ProfileSwitcher extends BaseLocalQCProvider {
         return listBuilder.build();
     }
 
+    @Override
+    public void onDestroy() {
+        if (mCarServiceProvider != null) {
+            mCarServiceProvider.removeListener(mCarServiceOnConnectedListener);
+        }
+    }
+
     private List<UserInfo> getProfileList() {
         return mUserManager.getAliveUsers()
                 .stream()
@@ -465,14 +487,6 @@ public class ProfileSwitcher extends BaseLocalQCProvider {
                 window.getAttributes().getFitInsetsTypes() & ~statusBars());
     }
 
-    private void onCarConnected(Car car) {
-        if (DEBUG) {
-            Log.d(TAG, "car connected");
-        }
-        mCarUserManager = car.getCarManager(CarUserManager.class);
-        notifyChange();
-    }
-
     private class AddNewUserTask extends AsyncTask<String, Void, UserInfo> {
         @Override
         protected UserInfo doInBackground(String... userNames) {
diff --git a/src/com/android/systemui/car/statusicon/StatusIconController.java b/src/com/android/systemui/car/statusicon/StatusIconController.java
index 2c1e66bf..59168126 100644
--- a/src/com/android/systemui/car/statusicon/StatusIconController.java
+++ b/src/com/android/systemui/car/statusicon/StatusIconController.java
@@ -136,6 +136,7 @@ public abstract class StatusIconController {
         view.setVisibility(data.getIsIconVisible() ? View.VISIBLE : View.GONE);
         view.setContentDescription(data.getContentDescription());
     }
+
     /**
      * Returns the resource id of the layout to be drawn inside the panel associated with this
      * status icon.
diff --git a/src/com/android/systemui/car/statusicon/StatusIconPanelController.java b/src/com/android/systemui/car/statusicon/StatusIconPanelController.java
index 92e664f4..9435c60a 100644
--- a/src/com/android/systemui/car/statusicon/StatusIconPanelController.java
+++ b/src/com/android/systemui/car/statusicon/StatusIconPanelController.java
@@ -29,10 +29,13 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.graphics.Outline;
+import android.graphics.drawable.Drawable;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewOutlineProvider;
 import android.view.ViewTreeObserver;
 import android.view.WindowManager;
 import android.widget.ImageView;
@@ -61,6 +64,7 @@ import com.android.systemui.settings.UserTracker;
 import com.android.systemui.statusbar.policy.ConfigurationController;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import javax.inject.Provider;
 
@@ -463,18 +467,24 @@ public class StatusIconPanelController {
             return false;
         }
 
+        // inflate content
         int panelWidth = mContext.getResources().getDimensionPixelSize(mPanelWidthRes);
-
+        Drawable panelBackgroundDrawable = mContext.getResources()
+                .getDrawable(R.drawable.status_icon_panel_bg, mContext.getTheme());
         mPanelContent = (ViewGroup) LayoutInflater.from(mContext).inflate(mPanelLayoutRes,
                 /* root= */ null);
-        mPanelContent.setLayoutDirection(View.LAYOUT_DIRECTION_LOCALE);
-        findQcHeaderViews(mPanelContent);
-        findQcViews(mPanelContent);
-        findQcFooterViews(mPanelContent);
+        // clip content to the panel background (to handle rounded corners)
+        mPanelContent.setOutlineProvider(new DrawableViewOutlineProvider(panelBackgroundDrawable));
+        mPanelContent.setClipToOutline(true);
+
+        // initialize special views
+        initializeQcHeaderViews(mPanelContent);
+        initializeQcViews(mPanelContent);
+        initializeQcFooterViews(mPanelContent);
+
+        // initialize panel
         mPanel = new PopupWindow(mPanelContent, panelWidth, WRAP_CONTENT);
-        mPanel.setBackgroundDrawable(
-                mContext.getResources().getDrawable(R.drawable.status_icon_panel_bg,
-                        mContext.getTheme()));
+        mPanel.setBackgroundDrawable(panelBackgroundDrawable);
         mPanel.setWindowLayoutType(TYPE_SYSTEM_DIALOG);
         mPanel.setFocusable(true);
         mPanel.setOutsideTouchable(false);
@@ -539,47 +549,48 @@ public class StatusIconPanelController {
         createPanel();
     }
 
-    private void findQcHeaderViews(ViewGroup rootView) {
-        for (int i = 0; i < rootView.getChildCount(); i++) {
-            View v = rootView.getChildAt(i);
-            if (v instanceof QCHeaderReadOnlyIconsContainer) {
-                if (mQCPanelReadOnlyIconsController != null) {
-                    mQCPanelReadOnlyIconsController.addIconViews(
-                            (QCHeaderReadOnlyIconsContainer) v, /* shouldAttachPanel= */ false);
-                }
-            } else if (v instanceof ViewGroup) {
-                this.findQcHeaderViews((ViewGroup) v);
-            }
+    private void initializeQcHeaderViews(ViewGroup rootView) {
+        if (mQCPanelReadOnlyIconsController == null) return;
+        List<QCHeaderReadOnlyIconsContainer> views = findViewsOfType(rootView,
+                QCHeaderReadOnlyIconsContainer.class);
+        for (QCHeaderReadOnlyIconsContainer view : views) {
+            mQCPanelReadOnlyIconsController.addIconViews(view, /* shouldAttachPanel= */ false);
         }
     }
 
-    private void findQcViews(ViewGroup rootView) {
-        for (int i = 0; i < rootView.getChildCount(); i++) {
-            View v = rootView.getChildAt(i);
-            if (v instanceof SystemUIQCView) {
-                SystemUIQCView qcv = (SystemUIQCView) v;
-                SystemUIQCViewController controller = mQCViewControllerProvider.get();
-                controller.attachView(qcv);
-                mQCViewControllers.add(controller);
-                qcv.setActionListener(mQCActionListener);
-            } else if (v instanceof ViewGroup) {
-                this.findQcViews((ViewGroup) v);
-            }
+    private void initializeQcViews(ViewGroup rootView) {
+        List<SystemUIQCView> views = findViewsOfType(rootView, SystemUIQCView.class);
+        for (SystemUIQCView view : views) {
+            SystemUIQCViewController controller = mQCViewControllerProvider.get();
+            controller.attachView(view);
+            mQCViewControllers.add(controller);
+            view.setActionListener(mQCActionListener);
         }
     }
 
-    private void findQcFooterViews(ViewGroup rootView) {
+    private void initializeQcFooterViews(ViewGroup rootView) {
+        List<QCFooterButton> buttons = findViewsOfType(rootView, QCFooterButton.class);
+        for (QCFooterButton button : buttons) {
+            button.setUserTracker(mUserTracker);
+        }
+        List<QCFooterButtonView> buttonViews = findViewsOfType(rootView, QCFooterButtonView.class);
+        for (QCFooterButtonView buttonView : buttonViews) {
+            buttonView.setUserTracker(mUserTracker);
+            buttonView.setBroadcastDispatcher(mBroadcastDispatcher);
+        }
+    }
+
+    private <T extends View> List<T> findViewsOfType(ViewGroup rootView, Class<T> clazz) {
+        List<T> views = new ArrayList<>();
         for (int i = 0; i < rootView.getChildCount(); i++) {
             View v = rootView.getChildAt(i);
-            if (v instanceof QCFooterButton) {
-                ((QCFooterButton) v).setUserTracker(mUserTracker);
-            } else if (v instanceof QCFooterButtonView) {
-                ((QCFooterButtonView) v).setUserTracker(mUserTracker);
-                ((QCFooterButtonView) v).setBroadcastDispatcher(mBroadcastDispatcher);
+            if (clazz.isInstance(v)) {
+                views.add(clazz.cast(v));
             } else if (v instanceof ViewGroup) {
-                this.findQcFooterViews((ViewGroup) v);
+                views.addAll(findViewsOfType((ViewGroup) v, clazz));
             }
         }
+        return views;
     }
 
     private void setAnimatedStatusIconHighlightedStatus(boolean isHighlighted) {
@@ -602,4 +613,22 @@ public class StatusIconPanelController {
     private boolean isPanelShowing() {
         return mPanel != null && mPanel.isShowing();
     }
+
+    private static class DrawableViewOutlineProvider extends ViewOutlineProvider {
+        private final Drawable mDrawable;
+
+        private DrawableViewOutlineProvider(Drawable drawable) {
+            mDrawable = drawable;
+        }
+
+        @Override
+        public void getOutline(View view, Outline outline) {
+            if (mDrawable != null) {
+                mDrawable.getOutline(outline);
+            } else {
+                outline.setRect(0, 0, view.getWidth(), view.getHeight());
+                outline.setAlpha(0.0f);
+            }
+        }
+    }
 }
diff --git a/src/com/android/systemui/car/statusicon/ui/SignalStatusIconController.java b/src/com/android/systemui/car/statusicon/ui/SignalStatusIconController.java
index fd828b1b..40c021e0 100644
--- a/src/com/android/systemui/car/statusicon/ui/SignalStatusIconController.java
+++ b/src/com/android/systemui/car/statusicon/ui/SignalStatusIconController.java
@@ -26,6 +26,7 @@ import com.android.settingslib.graph.SignalDrawable;
 import com.android.systemui.R;
 import com.android.systemui.car.statusicon.StatusIconController;
 import com.android.systemui.dagger.qualifiers.Main;
+import com.android.systemui.statusbar.connectivity.IconState;
 import com.android.systemui.statusbar.connectivity.MobileDataIndicators;
 import com.android.systemui.statusbar.connectivity.NetworkController;
 import com.android.systemui.statusbar.connectivity.SignalCallback;
@@ -48,11 +49,14 @@ public class SignalStatusIconController extends StatusIconController implements
     private SignalDrawable mMobileSignalIconDrawable;
     private Drawable mWifiSignalIconDrawable;
     private Drawable mHotSpotIconDrawable;
+    private Drawable mEthernetIconDrawable;
     private boolean mIsWifiEnabledAndConnected;
     private boolean mIsHotspotEnabled;
+    private boolean mIsEthernetConnected;
     private String mMobileSignalContentDescription;
     private String mWifiConnectedContentDescription;
     private String mHotspotOnContentDescription;
+    private String mEthernetContentDescription;
 
     @Inject
     SignalStatusIconController(
@@ -87,6 +91,9 @@ public class SignalStatusIconController extends StatusIconController implements
         if (mIsHotspotEnabled) {
             setIconDrawableToDisplay(mHotSpotIconDrawable);
             setIconContentDescription(mHotspotOnContentDescription);
+        } else if (mIsEthernetConnected) {
+            setIconDrawableToDisplay(mEthernetIconDrawable);
+            setIconContentDescription(mEthernetContentDescription);
         } else if (mIsWifiEnabledAndConnected) {
             setIconDrawableToDisplay(mWifiSignalIconDrawable);
             setIconContentDescription(mWifiConnectedContentDescription);
@@ -118,6 +125,16 @@ public class SignalStatusIconController extends StatusIconController implements
     }
 
     @Override
+    public void setEthernetIndicators(IconState state) {
+        mIsEthernetConnected = state.visible;
+        if (mIsEthernetConnected) {
+            mEthernetIconDrawable = mResources.getDrawable(state.icon, mContext.getTheme());
+            mEthernetContentDescription = state.contentDescription;
+        }
+        updateStatus();
+    }
+
+    @Override
     protected int getPanelContentLayout() {
         return R.layout.qc_connectivity_panel;
     }
@@ -137,6 +154,11 @@ public class SignalStatusIconController extends StatusIconController implements
         return mHotSpotIconDrawable;
     }
 
+    @VisibleForTesting
+    Drawable getEthernetIconDrawable() {
+        return mEthernetIconDrawable;
+    }
+
     @Override
     protected int getId() {
         return R.id.qc_signal_status_icon;
diff --git a/src/com/android/systemui/car/systembar/AssistantButton.java b/src/com/android/systemui/car/systembar/AssistantButton.java
index f16d06a5..fcbea28a 100644
--- a/src/com/android/systemui/car/systembar/AssistantButton.java
+++ b/src/com/android/systemui/car/systembar/AssistantButton.java
@@ -19,6 +19,7 @@ package com.android.systemui.car.systembar;
 import static android.service.voice.VoiceInteractionSession.SHOW_SOURCE_ASSIST_GESTURE;
 
 import android.app.role.RoleManager;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.Bundle;
@@ -30,6 +31,8 @@ import com.android.internal.app.AssistUtils;
 import com.android.internal.app.IVoiceInteractionSessionListener;
 import com.android.internal.app.IVoiceInteractionSessionShowCallback;
 
+import java.util.Set;
+
 /**
  * AssistantButton is an UI component that will trigger the Voice Interaction Service.
  */
@@ -77,11 +80,34 @@ public class AssistantButton extends CarSystemBarButton {
     }
 
     void showAssistant() {
+        if (canShowTosAcceptanceFlow()) {
+            SystemBarUtil.INSTANCE.showTosAcceptanceFlow(getContext(), getUserTracker());
+            return;
+        }
         final Bundle args = new Bundle();
         mAssistUtils.showSessionForActiveService(args,
                 SHOW_SOURCE_ASSIST_GESTURE, mShowCallback, /*activityToken=*/ null);
     }
 
+    /**
+     * Helper method to check if tos acceptance flow can be launched. The tos flow can be launched
+     * when there is no active assistant selected by the system and the default assistant has been
+     * disabled because tos is unaccepted
+     *
+     * @return true if tos flow can be launched, false otherwise
+     */
+    private boolean canShowTosAcceptanceFlow() {
+        ComponentName activeAssistantComponent = mAssistUtils.getActiveServiceComponentName();
+        String defaultAssistantInConfig =
+                getContext().getString(com.android.internal.R.string.config_defaultAssistant);
+        Integer userId = getUserTracker() != null ? getUserTracker().getUserId() : null;
+        Set<String> tosDisabledApps = SystemBarUtil.INSTANCE
+                .getTosDisabledPackages(getContext(), userId);
+        boolean defaultAssistantDisabled = tosDisabledApps.contains(defaultAssistantInConfig);
+
+        return activeAssistantComponent == null && defaultAssistantDisabled;
+    }
+
     @Override
     protected void setUpIntents(TypedArray typedArray) {
         // left blank because for the assistant button Intent will not be passed from the layout.
diff --git a/src/com/android/systemui/car/systembar/CarSystemBar.java b/src/com/android/systemui/car/systembar/CarSystemBar.java
index 9f4e5fe0..e3cf7dc6 100644
--- a/src/com/android/systemui/car/systembar/CarSystemBar.java
+++ b/src/com/android/systemui/car/systembar/CarSystemBar.java
@@ -16,20 +16,32 @@
 
 package com.android.systemui.car.systembar;
 
+import static android.content.Intent.ACTION_OVERLAY_CHANGED;
 import static android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS;
 
+import static com.android.systemui.car.systembar.SystemBarConfigs.BOTTOM;
+import static com.android.systemui.car.systembar.SystemBarConfigs.LEFT;
+import static com.android.systemui.car.systembar.SystemBarConfigs.RIGHT;
+import static com.android.systemui.car.systembar.SystemBarConfigs.TOP;
 import static com.android.systemui.statusbar.phone.BarTransitions.MODE_SEMI_TRANSPARENT;
 import static com.android.systemui.statusbar.phone.BarTransitions.MODE_TRANSPARENT;
 
+import android.annotation.Nullable;
+import android.app.ActivityManager.RunningTaskInfo;
 import android.app.StatusBarManager.Disable2Flags;
 import android.app.StatusBarManager.DisableFlags;
 import android.app.UiModeManager;
+import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.res.Configuration;
 import android.graphics.Rect;
 import android.inputmethodservice.InputMethodService;
 import android.os.IBinder;
+import android.os.PatternMatcher;
 import android.os.RemoteException;
+import android.os.UserHandle;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
@@ -47,6 +59,7 @@ import com.android.systemui.CoreStartable;
 import com.android.systemui.R;
 import com.android.systemui.car.CarDeviceProvisionedController;
 import com.android.systemui.car.CarDeviceProvisionedListener;
+import com.android.systemui.car.displaycompat.ToolbarController;
 import com.android.systemui.car.hvac.HvacController;
 import com.android.systemui.car.users.CarSystemUIUserUtil;
 import com.android.systemui.dagger.qualifiers.Main;
@@ -81,6 +94,7 @@ import javax.inject.Inject;
 public class CarSystemBar implements CoreStartable, CommandQueue.Callbacks,
         ConfigurationController.ConfigurationListener,
         MDSystemBarsController.Listener {
+    private static final String OVERLAY_FILTER_DATA_SCHEME = "package";
     private final Context mContext;
     private final CarSystemBarController mCarSystemBarController;
     private final SysuiDarkIconDispatcher mStatusBarIconController;
@@ -96,12 +110,14 @@ public class CarSystemBar implements CoreStartable, CommandQueue.Callbacks,
     private final Lazy<KeyguardStateController> mKeyguardStateControllerLazy;
     private final Lazy<PhoneStatusBarPolicy> mIconPolicyLazy;
     private final HvacController mHvacController;
+    private final ConfigurationController mConfigurationController;
 
     private UiModeManager mUiModeManager;
 
     private final int mDisplayId;
     private final SystemBarConfigs mSystemBarConfigs;
-
+    @Nullable
+    private final ToolbarController mDisplayCompatToolbarController;
     private StatusBarSignalPolicy mSignalPolicy;
 
     // If the nav bar should be hidden when the soft keyboard is visible.
@@ -109,9 +125,6 @@ public class CarSystemBar implements CoreStartable, CommandQueue.Callbacks,
     private boolean mHideLeftBarForKeyboard;
     private boolean mHideRightBarForKeyboard;
     private boolean mHideBottomBarForKeyboard;
-
-    private boolean mBottomNavBarVisible;
-
     // Nav bar views.
     private ViewGroup mTopSystemBarWindow;
     private ViewGroup mBottomSystemBarWindow;
@@ -121,6 +134,10 @@ public class CarSystemBar implements CoreStartable, CommandQueue.Callbacks,
     private CarSystemBarView mBottomSystemBarView;
     private CarSystemBarView mLeftSystemBarView;
     private CarSystemBarView mRightSystemBarView;
+    private boolean mTopSystemBarAttached;
+    private boolean mBottomSystemBarAttached;
+    private boolean mLeftSystemBarAttached;
+    private boolean mRightSystemBarAttached;
 
     // To be attached to the navigation bars such that they can close the notification panel if
     // it's open.
@@ -159,7 +176,8 @@ public class CarSystemBar implements CoreStartable, CommandQueue.Callbacks,
             SystemBarConfigs systemBarConfigs,
             ConfigurationController configurationController,
             DisplayTracker displayTracker,
-            Optional<MDSystemBarsController> mdSystemBarsController
+            Optional<MDSystemBarsController> mdSystemBarsController,
+            @Nullable ToolbarController toolbarController
     ) {
         mContext = context;
         mCarSystemBarController = carSystemBarController;
@@ -181,21 +199,33 @@ public class CarSystemBar implements CoreStartable, CommandQueue.Callbacks,
         mUiModeManager = mContext.getSystemService(UiModeManager.class);
         mDisplayTracker = displayTracker;
         mIsUiModeNight = mContext.getResources().getConfiguration().isNightModeActive();
-        configurationController.addCallback(this);
         mMDSystemBarsController = mdSystemBarsController.orElse(null);
+        mConfigurationController = configurationController;
+        mDisplayCompatToolbarController = toolbarController;
+    }
+
+    private void registerOverlayChangeBroadcastReceiver() {
+        IntentFilter overlayFilter = new IntentFilter(ACTION_OVERLAY_CHANGED);
+        overlayFilter.addDataScheme(OVERLAY_FILTER_DATA_SCHEME);
+        overlayFilter.addDataSchemeSpecificPart(mContext.getPackageName(),
+                PatternMatcher.PATTERN_LITERAL);
+        BroadcastReceiver receiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                restartSystemBars();
+            }
+        };
+        mContext.registerReceiverAsUser(receiver, UserHandle.ALL,
+                overlayFilter, /* broadcastPermission= */null, /* handler= */ null);
     }
 
     @Override
     public void start() {
         // Set initial state.
-        mHideTopBarForKeyboard = mSystemBarConfigs.getHideForKeyboardBySide(SystemBarConfigs.TOP);
-        mHideBottomBarForKeyboard = mSystemBarConfigs.getHideForKeyboardBySide(
-                SystemBarConfigs.BOTTOM);
-        mHideLeftBarForKeyboard = mSystemBarConfigs.getHideForKeyboardBySide(SystemBarConfigs.LEFT);
-        mHideRightBarForKeyboard = mSystemBarConfigs.getHideForKeyboardBySide(
-                SystemBarConfigs.RIGHT);
-
-        mBottomNavBarVisible = false;
+        mHideTopBarForKeyboard = mSystemBarConfigs.getHideForKeyboardBySide(TOP);
+        mHideBottomBarForKeyboard = mSystemBarConfigs.getHideForKeyboardBySide(BOTTOM);
+        mHideLeftBarForKeyboard = mSystemBarConfigs.getHideForKeyboardBySide(LEFT);
+        mHideRightBarForKeyboard = mSystemBarConfigs.getHideForKeyboardBySide(RIGHT);
 
         // Connect into the status bar manager service
         mCommandQueue.addCallback(this);
@@ -283,16 +313,26 @@ public class CarSystemBar implements CoreStartable, CommandQueue.Callbacks,
                     }
                 });
 
+        mConfigurationController.addCallback(/* listener= */ this);
+        registerOverlayChangeBroadcastReceiver();
+
         createSystemBar(result);
 
         TaskStackChangeListeners.getInstance().registerTaskStackListener(
                 mButtonSelectionStateListener);
         TaskStackChangeListeners.getInstance().registerTaskStackListener(
                 new TaskStackChangeListener() {
-            @Override
-            public void onLockTaskModeChanged(int mode) {
-                mCarSystemBarController.refreshSystemBar();
-            }
+                @Override
+                public void onLockTaskModeChanged(int mode) {
+                    mCarSystemBarController.refreshSystemBar();
+                }
+
+                @Override
+                public void onTaskMovedToFront(RunningTaskInfo taskInfo) {
+                    if (mDisplayCompatToolbarController != null) {
+                        mDisplayCompatToolbarController.update(taskInfo);
+                    }
+                }
         });
 
         // Lastly, call to the icon policy to install/update all the icons.
@@ -323,30 +363,7 @@ public class CarSystemBar implements CoreStartable, CommandQueue.Callbacks,
         // remove and reattach all components such that we don't keep a reference to unused ui
         // elements
         mCarSystemBarController.removeAll();
-
-        if (mTopSystemBarWindow != null) {
-            mTopSystemBarWindow.removeAllViews();
-            mHvacController.unregisterViews(mTopSystemBarView);
-            mTopSystemBarView = null;
-        }
-
-        if (mBottomSystemBarWindow != null) {
-            mBottomSystemBarWindow.removeAllViews();
-            mHvacController.unregisterViews(mBottomSystemBarView);
-            mBottomSystemBarView = null;
-        }
-
-        if (mLeftSystemBarWindow != null) {
-            mLeftSystemBarWindow.removeAllViews();
-            mHvacController.unregisterViews(mLeftSystemBarView);
-            mLeftSystemBarView = null;
-        }
-
-        if (mRightSystemBarWindow != null) {
-            mRightSystemBarWindow.removeAllViews();
-            mHvacController.unregisterViews(mRightSystemBarView);
-            mRightSystemBarView = null;
-        }
+        clearSystemBarWindow(/* removeUnusedWindow= */ false);
 
         buildNavBarContent();
         // If the UI was rebuilt (day/night change or user change) while the keyguard was up we need
@@ -384,33 +401,43 @@ public class CarSystemBar implements CoreStartable, CommandQueue.Callbacks,
         mBottomSystemBarWindow = mCarSystemBarController.getBottomWindow();
         mLeftSystemBarWindow = mCarSystemBarController.getLeftWindow();
         mRightSystemBarWindow = mCarSystemBarController.getRightWindow();
+
+        if (mDisplayCompatToolbarController != null) {
+            if (mSystemBarConfigs
+                    .isLeftDisplayCompatToolbarEnabled()) {
+                mDisplayCompatToolbarController.init(mLeftSystemBarWindow);
+            } else if (mSystemBarConfigs
+                    .isRightDisplayCompatToolbarEnabled()) {
+                mDisplayCompatToolbarController.init(mRightSystemBarWindow);
+            }
+        }
     }
 
     private void buildNavBarContent() {
         mTopSystemBarView = mCarSystemBarController.getTopBar(isDeviceSetupForUser());
         if (mTopSystemBarView != null) {
-            mSystemBarConfigs.insetSystemBar(SystemBarConfigs.TOP, mTopSystemBarView);
+            mSystemBarConfigs.insetSystemBar(TOP, mTopSystemBarView);
             mHvacController.registerHvacViews(mTopSystemBarView);
             mTopSystemBarWindow.addView(mTopSystemBarView);
         }
 
         mBottomSystemBarView = mCarSystemBarController.getBottomBar(isDeviceSetupForUser());
         if (mBottomSystemBarView != null) {
-            mSystemBarConfigs.insetSystemBar(SystemBarConfigs.BOTTOM, mBottomSystemBarView);
+            mSystemBarConfigs.insetSystemBar(BOTTOM, mBottomSystemBarView);
             mHvacController.registerHvacViews(mBottomSystemBarView);
             mBottomSystemBarWindow.addView(mBottomSystemBarView);
         }
 
         mLeftSystemBarView = mCarSystemBarController.getLeftBar(isDeviceSetupForUser());
         if (mLeftSystemBarView != null) {
-            mSystemBarConfigs.insetSystemBar(SystemBarConfigs.LEFT, mLeftSystemBarView);
+            mSystemBarConfigs.insetSystemBar(LEFT, mLeftSystemBarView);
             mHvacController.registerHvacViews(mLeftSystemBarView);
             mLeftSystemBarWindow.addView(mLeftSystemBarView);
         }
 
         mRightSystemBarView = mCarSystemBarController.getRightBar(isDeviceSetupForUser());
         if (mRightSystemBarView != null) {
-            mSystemBarConfigs.insetSystemBar(SystemBarConfigs.RIGHT, mRightSystemBarView);
+            mSystemBarConfigs.insetSystemBar(RIGHT, mRightSystemBarView);
             mHvacController.registerHvacViews(mRightSystemBarView);
             mRightSystemBarWindow.addView(mRightSystemBarView);
         }
@@ -420,32 +447,50 @@ public class CarSystemBar implements CoreStartable, CommandQueue.Callbacks,
         mSystemBarConfigs.getSystemBarSidesByZOrder().forEach(this::attachNavBarBySide);
     }
 
+
+    @VisibleForTesting
+    ViewGroup getSystemBarWindowBySide(int side) {
+        switch (side) {
+            case TOP:
+                return mTopSystemBarWindow;
+            case BOTTOM:
+                return mBottomSystemBarWindow;
+            case LEFT:
+                return mLeftSystemBarWindow;
+            case RIGHT:
+                return mRightSystemBarWindow;
+            default: return null;
+        }
+    }
+
     private void attachNavBarBySide(int side) {
         switch (side) {
-            case SystemBarConfigs.TOP:
-                if (mTopSystemBarWindow != null) {
+            case TOP:
+                if (mTopSystemBarWindow != null && !mTopSystemBarAttached) {
                     mWindowManager.addView(mTopSystemBarWindow,
-                            mSystemBarConfigs.getLayoutParamsBySide(SystemBarConfigs.TOP));
+                            mSystemBarConfigs.getLayoutParamsBySide(TOP));
+                    mTopSystemBarAttached = true;
                 }
                 break;
-            case SystemBarConfigs.BOTTOM:
-                if (mBottomSystemBarWindow != null && !mBottomNavBarVisible) {
-                    mBottomNavBarVisible = true;
-
+            case BOTTOM:
+                if (mBottomSystemBarWindow != null && !mBottomSystemBarAttached) {
                     mWindowManager.addView(mBottomSystemBarWindow,
-                            mSystemBarConfigs.getLayoutParamsBySide(SystemBarConfigs.BOTTOM));
+                            mSystemBarConfigs.getLayoutParamsBySide(BOTTOM));
+                    mBottomSystemBarAttached = true;
                 }
                 break;
-            case SystemBarConfigs.LEFT:
-                if (mLeftSystemBarWindow != null) {
+            case LEFT:
+                if (mLeftSystemBarWindow != null && !mLeftSystemBarAttached) {
                     mWindowManager.addView(mLeftSystemBarWindow,
-                            mSystemBarConfigs.getLayoutParamsBySide(SystemBarConfigs.LEFT));
+                            mSystemBarConfigs.getLayoutParamsBySide(LEFT));
+                    mLeftSystemBarAttached = true;
                 }
                 break;
-            case SystemBarConfigs.RIGHT:
-                if (mRightSystemBarWindow != null) {
+            case RIGHT:
+                if (mRightSystemBarWindow != null && !mRightSystemBarAttached) {
                     mWindowManager.addView(mRightSystemBarWindow,
-                            mSystemBarConfigs.getLayoutParamsBySide(SystemBarConfigs.RIGHT));
+                            mSystemBarConfigs.getLayoutParamsBySide(RIGHT));
+                    mRightSystemBarAttached = true;
                 }
                 break;
             default:
@@ -560,7 +605,7 @@ public class CarSystemBar implements CoreStartable, CommandQueue.Callbacks,
     }
 
     @Override
-    public void showTransient(int displayId, int types) {
+    public void showTransient(int displayId, int types, boolean isGestureOnSystemBar) {
         if (displayId != mDisplayId) {
             return;
         }
@@ -698,6 +743,59 @@ public class CarSystemBar implements CoreStartable, CommandQueue.Callbacks,
     }
 
     @VisibleForTesting
+    void restartSystemBars() {
+        mCarSystemBarController.removeAll();
+        mCarSystemBarController.resetSystemBarConfigs();
+        clearSystemBarWindow(/* removeUnusedWindow= */ true);
+        buildNavBarWindows();
+        buildNavBarContent();
+        attachNavBarWindows();
+    }
+
+    private void clearSystemBarWindow(boolean removeUnusedWindow) {
+        if (mTopSystemBarWindow != null) {
+            mTopSystemBarWindow.removeAllViews();
+            mHvacController.unregisterViews(mTopSystemBarView);
+            if (removeUnusedWindow && !mSystemBarConfigs.getEnabledStatusBySide(TOP)) {
+                mWindowManager.removeViewImmediate(mTopSystemBarWindow);
+                mTopSystemBarAttached = false;
+            }
+            mTopSystemBarView = null;
+        }
+
+        if (mBottomSystemBarWindow != null) {
+            mBottomSystemBarWindow.removeAllViews();
+            mHvacController.unregisterViews(mBottomSystemBarView);
+            if (removeUnusedWindow && !mSystemBarConfigs.getEnabledStatusBySide(BOTTOM)) {
+                mWindowManager.removeViewImmediate(mBottomSystemBarWindow);
+                mBottomSystemBarAttached = false;
+            }
+            mBottomSystemBarView = null;
+
+        }
+
+        if (mLeftSystemBarWindow != null) {
+            mLeftSystemBarWindow.removeAllViews();
+            mHvacController.unregisterViews(mLeftSystemBarView);
+            if (removeUnusedWindow && !mSystemBarConfigs.getEnabledStatusBySide(LEFT)) {
+                mWindowManager.removeViewImmediate(mLeftSystemBarWindow);
+                mLeftSystemBarAttached = false;
+            }
+            mLeftSystemBarView = null;
+        }
+
+        if (mRightSystemBarWindow != null) {
+            mRightSystemBarWindow.removeAllViews();
+            mHvacController.unregisterViews(mRightSystemBarView);
+            if (removeUnusedWindow && !mSystemBarConfigs.getEnabledStatusBySide(RIGHT)) {
+                mWindowManager.removeViewImmediate(mRightSystemBarWindow);
+                mRightSystemBarAttached = false;
+            }
+            mRightSystemBarView = null;
+        }
+    }
+
+    @VisibleForTesting
     void setUiModeManager(UiModeManager uiModeManager) {
         mUiModeManager = uiModeManager;
     }
diff --git a/src/com/android/systemui/car/systembar/CarSystemBarButton.java b/src/com/android/systemui/car/systembar/CarSystemBarButton.java
index ff163bc9..02bf886c 100644
--- a/src/com/android/systemui/car/systembar/CarSystemBarButton.java
+++ b/src/com/android/systemui/car/systembar/CarSystemBarButton.java
@@ -42,6 +42,7 @@ import androidx.annotation.Nullable;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.systemui.R;
+import com.android.systemui.car.window.OverlayViewController;
 import com.android.systemui.settings.UserTracker;
 import com.android.systemui.statusbar.AlphaOptimizedImageView;
 
@@ -52,7 +53,8 @@ import java.net.URISyntaxException;
  * xml file level. This allows for more control via overlays instead of having to update
  * code.
  */
-public class CarSystemBarButton extends LinearLayout {
+public class CarSystemBarButton extends LinearLayout implements
+        OverlayViewController.OverlayViewStateListener {
 
     private static final String TAG = "CarSystemBarButton";
     private static final String BUTTON_FILTER_DELIMITER = ";";
@@ -227,6 +229,11 @@ public class CarSystemBarButton extends LinearLayout {
         return mComponentNames;
     }
 
+    @Override
+    public void onVisibilityChanged(boolean isVisible) {
+        setSelected(isVisible);
+    }
+
     /**
      * Subclasses should override this method to return the {@link RoleManager} role associated
      * with this button.
@@ -440,4 +447,9 @@ public class CarSystemBarButton extends LinearLayout {
             icon.setAlpha(mHighlightWhenSelected && mSelected ? mSelectedAlpha : mUnselectedAlpha);
         }
     }
+
+    @Nullable
+    protected UserTracker getUserTracker() {
+        return mUserTracker;
+    }
 }
diff --git a/src/com/android/systemui/car/systembar/CarSystemBarController.java b/src/com/android/systemui/car/systembar/CarSystemBarController.java
index 663a4012..0b852193 100644
--- a/src/com/android/systemui/car/systembar/CarSystemBarController.java
+++ b/src/com/android/systemui/car/systembar/CarSystemBarController.java
@@ -38,6 +38,7 @@ import com.android.systemui.R;
 import com.android.systemui.broadcast.BroadcastDispatcher;
 import com.android.systemui.car.CarServiceProvider;
 import com.android.systemui.car.hvac.HvacPanelOverlayViewController;
+import com.android.systemui.car.notification.NotificationPanelViewController;
 import com.android.systemui.car.privacy.CameraPrivacyElementsProviderImpl;
 import com.android.systemui.car.privacy.MicPrivacyElementsProviderImpl;
 import com.android.systemui.car.qc.SystemUIQCViewController;
@@ -54,7 +55,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import javax.inject.Inject;
 import javax.inject.Provider;
 
 /** A single class which controls the navigation bar views. */
@@ -106,6 +106,7 @@ public class CarSystemBarController {
     private StatusIconPanelController mCameraPanelController;
     private StatusIconPanelController mProfilePanelController;
     private HvacPanelOverlayViewController mHvacPanelOverlayViewController;
+    private NotificationPanelViewController mNotificationPanelViewController;
 
     private CarSystemBarView mTopView;
     private CarSystemBarView mBottomView;
@@ -118,7 +119,6 @@ public class CarSystemBarController {
     private int mStatusBarState2;
     private int mLockTaskMode;
 
-    @Inject
     public CarSystemBarController(Context context,
             UserTracker userTracker,
             CarSystemBarViewFactory carSystemBarViewFactory,
@@ -393,7 +393,8 @@ public class CarSystemBarController {
 
         mTopView = mCarSystemBarViewFactory.getTopBar(isSetUp);
         setupBar(mTopView, mTopBarTouchListeners, mNotificationsShadeController,
-                mHvacPanelController, mHvacPanelOverlayViewController);
+                mHvacPanelController, mHvacPanelOverlayViewController,
+                mNotificationPanelViewController);
 
         if (isSetUp) {
             // We do not want the privacy chips or the profile picker to be clickable in
@@ -417,7 +418,8 @@ public class CarSystemBarController {
 
         mBottomView = mCarSystemBarViewFactory.getBottomBar(isSetUp);
         setupBar(mBottomView, mBottomBarTouchListeners, mNotificationsShadeController,
-                mHvacPanelController, mHvacPanelOverlayViewController);
+                mHvacPanelController, mHvacPanelOverlayViewController,
+                mNotificationPanelViewController);
         return mBottomView;
     }
 
@@ -430,7 +432,8 @@ public class CarSystemBarController {
 
         mLeftView = mCarSystemBarViewFactory.getLeftBar(isSetUp);
         setupBar(mLeftView, mLeftBarTouchListeners, mNotificationsShadeController,
-                mHvacPanelController, mHvacPanelOverlayViewController);
+                mHvacPanelController, mHvacPanelOverlayViewController,
+                mNotificationPanelViewController);
         return mLeftView;
     }
 
@@ -443,17 +446,20 @@ public class CarSystemBarController {
 
         mRightView = mCarSystemBarViewFactory.getRightBar(isSetUp);
         setupBar(mRightView, mRightBarTouchListeners, mNotificationsShadeController,
-                mHvacPanelController, mHvacPanelOverlayViewController);
+                mHvacPanelController, mHvacPanelOverlayViewController,
+                mNotificationPanelViewController);
         return mRightView;
     }
 
     private void setupBar(CarSystemBarView view, Set<View.OnTouchListener> statusBarTouchListeners,
             NotificationsShadeController notifShadeController,
             HvacPanelController hvacPanelController,
-            HvacPanelOverlayViewController hvacPanelOverlayViewController) {
+            HvacPanelOverlayViewController hvacPanelOverlayViewController,
+            NotificationPanelViewController notificationPanelViewController) {
         view.updateHomeButtonVisibility(CarSystemUIUserUtil.isSecondaryMUMDSystemUI());
         view.setStatusBarWindowTouchListeners(statusBarTouchListeners);
         view.setNotificationsPanelController(notifShadeController);
+        view.registerNotificationPanelViewController(notificationPanelViewController);
         view.setHvacPanelController(hvacPanelController);
         view.registerHvacPanelOverlayViewController(hvacPanelOverlayViewController);
         view.updateControlCenterButtonVisibility(CarSystemUIUserUtil.isMUMDSystemUI());
@@ -471,9 +477,12 @@ public class CarSystemBarController {
             panelController = new StatusIconPanelController(mContext, mUserTracker,
                     mCarServiceProvider, mBroadcastDispatcher, mConfigurationController,
                     mQCViewControllerProvider);
-            panelController.attachPanel(mTopView.requireViewById(chipId), panelLayoutRes,
-                R.dimen.car_sensor_qc_panel_width, mPrivacyChipXOffset,
-                panelController.getDefaultYOffset(), Gravity.TOP | Gravity.END);
+            View privacyChip = mTopView.findViewById(chipId);
+            if (privacyChip != null) {
+                panelController.attachPanel(privacyChip, panelLayoutRes,
+                        R.dimen.car_sensor_qc_panel_width, mPrivacyChipXOffset,
+                        panelController.getDefaultYOffset(), Gravity.TOP | Gravity.END);
+            }
         }
 
         return panelController;
@@ -542,6 +551,24 @@ public class CarSystemBarController {
         }
     }
 
+    /** Sets the HVACPanelOverlayViewController for views to listen to the panel's state. */
+    public void registerNotificationPanelViewController(
+            NotificationPanelViewController notificationPanelViewController) {
+        mNotificationPanelViewController = notificationPanelViewController;
+        if (mTopView != null) {
+            mTopView.registerNotificationPanelViewController(mNotificationPanelViewController);
+        }
+        if (mBottomView != null) {
+            mBottomView.registerNotificationPanelViewController(mNotificationPanelViewController);
+        }
+        if (mLeftView != null) {
+            mLeftView.registerNotificationPanelViewController(mNotificationPanelViewController);
+        }
+        if (mRightView != null) {
+            mRightView.registerNotificationPanelViewController(mNotificationPanelViewController);
+        }
+    }
+
     /** Sets an HVAC controller which toggles the HVAC panel. */
     public void registerHvacPanelController(HvacPanelController hvacPanelController) {
         mHvacPanelController = hvacPanelController;
diff --git a/src/com/android/systemui/car/systembar/CarSystemBarModule.java b/src/com/android/systemui/car/systembar/CarSystemBarModule.java
index f5eb1675..02fdded8 100644
--- a/src/com/android/systemui/car/systembar/CarSystemBarModule.java
+++ b/src/com/android/systemui/car/systembar/CarSystemBarModule.java
@@ -18,15 +18,26 @@ package com.android.systemui.car.systembar;
 
 import android.content.Context;
 
+import com.android.systemui.broadcast.BroadcastDispatcher;
+import com.android.systemui.car.CarServiceProvider;
 import com.android.systemui.car.dagger.CarSysUIDynamicOverride;
+import com.android.systemui.car.privacy.CameraPrivacyElementsProviderImpl;
+import com.android.systemui.car.privacy.MicPrivacyElementsProviderImpl;
+import com.android.systemui.car.qc.SystemUIQCViewController;
+import com.android.systemui.car.statusbar.UserNameViewController;
 import com.android.systemui.dagger.SysUISingleton;
-
-import java.util.Optional;
+import com.android.systemui.settings.UserTracker;
+import com.android.systemui.statusbar.policy.ConfigurationController;
 
 import dagger.BindsOptionalOf;
+import dagger.Lazy;
 import dagger.Module;
 import dagger.Provides;
 
+import java.util.Optional;
+
+import javax.inject.Provider;
+
 /**
  * Dagger injection module for {@link CarSystemBar}.
  *
@@ -65,4 +76,38 @@ public abstract class CarSystemBarModule {
         }
         return new ButtonSelectionStateController(context);
     }
+
+    @BindsOptionalOf
+    @CarSysUIDynamicOverride
+    abstract CarSystemBarController optionalCarSystemBarController();
+
+    @SysUISingleton
+    @Provides
+    static CarSystemBarController provideCarSystemBarController(
+            @CarSysUIDynamicOverride Optional<CarSystemBarController> carSystemBarController,
+            Context context,
+            UserTracker userTracker,
+            CarSystemBarViewFactory carSystemBarViewFactory,
+            CarServiceProvider carServiceProvider,
+            BroadcastDispatcher broadcastDispatcher,
+            ConfigurationController configurationController,
+            ButtonSelectionStateController buttonSelectionStateController,
+            Lazy<UserNameViewController> userNameViewControllerLazy,
+            Lazy<MicPrivacyChipViewController> micPrivacyChipViewControllerLazy,
+            Lazy<CameraPrivacyChipViewController> cameraPrivacyChipViewControllerLazy,
+            ButtonRoleHolderController buttonRoleHolderController,
+            SystemBarConfigs systemBarConfigs,
+            Provider<SystemUIQCViewController> qcViewControllerProvider,
+            Lazy<MicPrivacyElementsProviderImpl> micPrivacyElementsProvider,
+            Lazy<CameraPrivacyElementsProviderImpl> cameraPrivacyElementsProvider) {
+        if (carSystemBarController.isPresent()) {
+            return carSystemBarController.get();
+        }
+        return new CarSystemBarController(context, userTracker, carSystemBarViewFactory,
+                carServiceProvider, broadcastDispatcher, configurationController,
+                buttonSelectionStateController, userNameViewControllerLazy,
+                micPrivacyChipViewControllerLazy, cameraPrivacyChipViewControllerLazy,
+                buttonRoleHolderController, systemBarConfigs, qcViewControllerProvider,
+                micPrivacyElementsProvider, cameraPrivacyElementsProvider);
+    }
 }
diff --git a/src/com/android/systemui/car/systembar/CarSystemBarView.java b/src/com/android/systemui/car/systembar/CarSystemBarView.java
index 3c637871..6a5d9de6 100644
--- a/src/com/android/systemui/car/systembar/CarSystemBarView.java
+++ b/src/com/android/systemui/car/systembar/CarSystemBarView.java
@@ -28,6 +28,9 @@ import android.widget.LinearLayout;
 
 import com.android.systemui.R;
 import com.android.systemui.car.hvac.HvacPanelOverlayViewController;
+import com.android.systemui.car.hvac.HvacView;
+import com.android.systemui.car.hvac.TemperatureControlView;
+import com.android.systemui.car.notification.NotificationPanelViewController;
 import com.android.systemui.car.statusicon.ui.QuickControlsEntryPointsController;
 import com.android.systemui.car.statusicon.ui.ReadOnlyIconsController;
 import com.android.systemui.car.systembar.CarSystemBarController.HvacPanelController;
@@ -60,12 +63,15 @@ public class CarSystemBarView extends LinearLayout {
 
     private final boolean mConsumeTouchWhenPanelOpen;
     private final boolean mButtonsDraggable;
+    private final boolean mIsDockEnabled;
 
     private CarSystemBarButton mHomeButton;
     private CarSystemBarButton mPassengerHomeButton;
     private View mNavButtons;
     private CarSystemBarButton mNotificationsButton;
-    private HvacButton mHvacButton;
+    private CarSystemBarButton mHvacButton;
+    private HvacView mDriverHvacView;
+    private HvacView mPassengerHvacView;
     private NotificationsShadeController mNotificationsShadeController;
     private HvacPanelController mHvacPanelController;
     private View mLockScreenButtons;
@@ -75,6 +81,7 @@ public class CarSystemBarView extends LinearLayout {
     // used to wire in open/close gestures for overlay panels
     private Set<OnTouchListener> mStatusBarWindowTouchListeners;
     private HvacPanelOverlayViewController mHvacPanelOverlayViewController;
+    private NotificationPanelViewController mNotificationPanelViewController;
     private CarSystemBarButton mControlCenterButton;
 
     public CarSystemBarView(Context context, AttributeSet attrs) {
@@ -82,6 +89,7 @@ public class CarSystemBarView extends LinearLayout {
         mConsumeTouchWhenPanelOpen = getResources().getBoolean(
                 R.bool.config_consumeSystemBarTouchWhenNotificationPanelOpen);
         mButtonsDraggable = getResources().getBoolean(R.bool.config_systemBarButtonsDraggable);
+        mIsDockEnabled = getResources().getBoolean(R.bool.config_enableDock);
     }
 
     @Override
@@ -93,15 +101,15 @@ public class CarSystemBarView extends LinearLayout {
         mOcclusionButtons = findViewById(R.id.occlusion_buttons);
         mNotificationsButton = findViewById(R.id.notifications);
         mHvacButton = findViewById(R.id.hvac);
+        mDriverHvacView = findViewById(R.id.driver_hvac);
+        mPassengerHvacView = findViewById(R.id.passenger_hvac);
         mQcEntryPointsContainer = findViewById(R.id.qc_entry_points_container);
         mReadOnlyIconsContainer = findViewById(R.id.read_only_icons_container);
         mControlCenterButton = findViewById(R.id.control_center_nav);
         if (mNotificationsButton != null) {
             mNotificationsButton.setOnClickListener(this::onNotificationsClick);
         }
-        if (mHvacButton != null) {
-            mHvacButton.setOnClickListener(this::onHvacClick);
-        }
+        setupHvacButton();
         // Needs to be clickable so that it will receive ACTION_MOVE events.
         setClickable(true);
         // Needs to not be focusable so rotary won't highlight the entire nav bar.
@@ -124,6 +132,17 @@ public class CarSystemBarView extends LinearLayout {
         if (mHvacButton != null) {
             mHvacButton.setOnClickListener(this::onHvacClick);
         }
+
+        if (mIsDockEnabled) {
+            if (mDriverHvacView instanceof TemperatureControlView) {
+                ((TemperatureControlView) mDriverHvacView).setTemperatureTextClickListener(
+                        this::onHvacClick);
+            }
+            if (mPassengerHvacView instanceof TemperatureControlView) {
+                ((TemperatureControlView) mPassengerHvacView).setTemperatureTextClickListener(
+                        this::onHvacClick);
+            }
+        }
     }
 
     void setupQuickControlsEntryPoints(
@@ -318,6 +337,17 @@ public class CarSystemBarView extends LinearLayout {
         }
     }
 
+    /**
+     * Sets the NotificationPanelViewController and adds button listeners
+     */
+    public void registerNotificationPanelViewController(
+            NotificationPanelViewController controller) {
+        mNotificationPanelViewController = controller;
+        if (mNotificationPanelViewController != null && mNotificationsButton != null) {
+            mNotificationPanelViewController.registerViewStateListener(mNotificationsButton);
+        }
+    }
+
     private void setNavigationButtonsVisibility(@View.Visibility int visibility) {
         if (mNavButtons != null) {
             mNavButtons.setVisibility(visibility);
diff --git a/src/com/android/systemui/car/systembar/CarSystemBarViewFactory.java b/src/com/android/systemui/car/systembar/CarSystemBarViewFactory.java
index e22a8655..1832a2ab 100644
--- a/src/com/android/systemui/car/systembar/CarSystemBarViewFactory.java
+++ b/src/com/android/systemui/car/systembar/CarSystemBarViewFactory.java
@@ -44,8 +44,10 @@ public class CarSystemBarViewFactory {
     private static ArrayMap<Type, Integer> setupLayoutMapping() {
         ArrayMap<Type, Integer> map = new ArrayMap<>();
         map.put(Type.TOP, R.layout.car_top_system_bar);
+        map.put(Type.TOP_WITH_DOCK, R.layout.car_top_system_bar_dock);
         map.put(Type.TOP_UNPROVISIONED, R.layout.car_top_system_bar_unprovisioned);
         map.put(Type.BOTTOM, R.layout.car_bottom_system_bar);
+        map.put(Type.BOTTOM_WITH_DOCK, R.layout.car_bottom_system_bar_dock);
         map.put(Type.BOTTOM_UNPROVISIONED, R.layout.car_bottom_system_bar_unprovisioned);
         map.put(Type.LEFT, R.layout.car_left_system_bar);
         map.put(Type.LEFT_UNPROVISIONED, R.layout.car_left_system_bar_unprovisioned);
@@ -62,12 +64,15 @@ public class CarSystemBarViewFactory {
     private final QuickControlsEntryPointsController mQuickControlsEntryPointsController;
     private final ReadOnlyIconsController mReadOnlyIconsController;
     private final UserTracker mUserTracker;
+    private final boolean mIsDockEnabled;
 
     /** Type of navigation bar to be created. */
     private enum Type {
         TOP,
+        TOP_WITH_DOCK,
         TOP_UNPROVISIONED,
         BOTTOM,
+        BOTTOM_WITH_DOCK,
         BOTTOM_UNPROVISIONED,
         LEFT,
         LEFT_UNPROVISIONED,
@@ -88,6 +93,7 @@ public class CarSystemBarViewFactory {
         mQuickControlsEntryPointsController = quickControlsEntryPointsController;
         mReadOnlyIconsController = readOnlyIconsController;
         mUserTracker = userTracker;
+        mIsDockEnabled = context.getResources().getBoolean(R.bool.config_enableDock);
     }
 
     /** Gets the top window. */
@@ -112,11 +118,17 @@ public class CarSystemBarViewFactory {
 
     /** Gets the top bar. */
     public CarSystemBarView getTopBar(boolean isSetUp) {
+        if (mIsDockEnabled) {
+            return getBar(isSetUp, Type.TOP_WITH_DOCK, Type.TOP_UNPROVISIONED);
+        }
         return getBar(isSetUp, Type.TOP, Type.TOP_UNPROVISIONED);
     }
 
     /** Gets the bottom bar. */
     public CarSystemBarView getBottomBar(boolean isSetUp) {
+        if (mIsDockEnabled) {
+            return getBar(isSetUp, Type.BOTTOM_WITH_DOCK, Type.BOTTOM_UNPROVISIONED);
+        }
         return getBar(isSetUp, Type.BOTTOM, Type.BOTTOM_UNPROVISIONED);
     }
 
diff --git a/src/com/android/systemui/car/systembar/HvacButton.java b/src/com/android/systemui/car/systembar/HvacButton.java
deleted file mode 100644
index 8dc28cba..00000000
--- a/src/com/android/systemui/car/systembar/HvacButton.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.systemui.car.systembar;
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-import com.android.systemui.car.window.OverlayViewController;
-
-/**
- * A CarSystemBarButton that controls the HVAC panel
- */
-public class HvacButton extends CarSystemBarButton implements
-        OverlayViewController.OverlayViewStateListener {
-
-    public HvacButton(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    @Override
-    public void onVisibilityChanged(boolean visible) {
-        setSelected(visible);
-    }
-}
diff --git a/src/com/android/systemui/car/systembar/SystemBarConfigs.java b/src/com/android/systemui/car/systembar/SystemBarConfigs.java
index c70a0d5b..839117f4 100644
--- a/src/com/android/systemui/car/systembar/SystemBarConfigs.java
+++ b/src/com/android/systemui/car/systembar/SystemBarConfigs.java
@@ -100,6 +100,7 @@ public class SystemBarConfigs {
     private boolean mBottomNavBarEnabled;
     private boolean mLeftNavBarEnabled;
     private boolean mRightNavBarEnabled;
+    private int mDisplayCompatToolbarState = 0;
 
     @Inject
     public SystemBarConfigs(@Main Resources resources) {
@@ -111,6 +112,7 @@ public class SystemBarConfigs {
         populateMaps();
         readConfigs();
 
+        checkOnlyOneDisplayCompatIsEnabled();
         checkEnabledBarsHaveUniqueBarTypes();
         checkAllOverlappingBarsHaveDifferentZOrders();
         checkSystemBarEnabledForNotificationPanel();
@@ -136,7 +138,9 @@ public class SystemBarConfigs {
 
     protected WindowManager.LayoutParams getLayoutParamsBySide(@SystemBarSide int side) {
         return mSystemBarConfigMap.get(side) != null
-                ? mSystemBarConfigMap.get(side).getLayoutParams() : null;
+                ? mSystemBarConfigMap
+                .get(side).getLayoutParams(mResources.getBoolean(R.bool.config_enableDock))
+                : null;
     }
 
     protected boolean getEnabledStatusBySide(@SystemBarSide int side) {
@@ -146,9 +150,9 @@ public class SystemBarConfigs {
             case BOTTOM:
                 return mBottomNavBarEnabled;
             case LEFT:
-                return mLeftNavBarEnabled;
+                return mLeftNavBarEnabled || isLeftDisplayCompatToolbarEnabled();
             case RIGHT:
-                return mRightNavBarEnabled;
+                return mRightNavBarEnabled || isRightDisplayCompatToolbarEnabled();
             default:
                 return false;
         }
@@ -235,6 +239,16 @@ public class SystemBarConfigs {
         mBottomNavBarEnabled = mResources.getBoolean(R.bool.config_enableBottomSystemBar);
         mLeftNavBarEnabled = mResources.getBoolean(R.bool.config_enableLeftSystemBar);
         mRightNavBarEnabled = mResources.getBoolean(R.bool.config_enableRightSystemBar);
+        mDisplayCompatToolbarState =
+            mResources.getInteger(R.integer.config_showDisplayCompatToolbarOnSystemBar);
+        mSystemBarConfigMap.clear();
+
+        if ((mLeftNavBarEnabled && isLeftDisplayCompatToolbarEnabled())
+                || (mRightNavBarEnabled && isRightDisplayCompatToolbarEnabled())) {
+            throw new IllegalStateException(
+                "Navigation Bar and Display Compat toolbar can't be "
+                    + "on the same side");
+        }
 
         if (mTopNavBarEnabled) {
             SystemBarConfig topBarConfig =
@@ -242,8 +256,10 @@ public class SystemBarConfigs {
                             .setSide(TOP)
                             .setGirth(mResources.getDimensionPixelSize(
                                     R.dimen.car_top_system_bar_height))
-                            .setBarType(mResources.getInteger(R.integer.config_topSystemBarType))
-                            .setZOrder(mResources.getInteger(R.integer.config_topSystemBarZOrder))
+                            .setBarType(
+                                    mResources.getInteger(R.integer.config_topSystemBarType))
+                            .setZOrder(
+                                    mResources.getInteger(R.integer.config_topSystemBarZOrder))
                             .setHideForKeyboard(mResources.getBoolean(
                                     R.bool.config_hideTopSystemBarForKeyboard))
                             .build();
@@ -256,37 +272,43 @@ public class SystemBarConfigs {
                             .setSide(BOTTOM)
                             .setGirth(mResources.getDimensionPixelSize(
                                     R.dimen.car_bottom_system_bar_height))
-                            .setBarType(mResources.getInteger(R.integer.config_bottomSystemBarType))
+                            .setBarType(
+                                    mResources.getInteger(R.integer.config_bottomSystemBarType))
                             .setZOrder(
-                                    mResources.getInteger(R.integer.config_bottomSystemBarZOrder))
+                                    mResources.getInteger(
+                                            R.integer.config_bottomSystemBarZOrder))
                             .setHideForKeyboard(mResources.getBoolean(
                                     R.bool.config_hideBottomSystemBarForKeyboard))
                             .build();
             mSystemBarConfigMap.put(BOTTOM, bottomBarConfig);
         }
 
-        if (mLeftNavBarEnabled) {
+        if (mLeftNavBarEnabled || isLeftDisplayCompatToolbarEnabled()) {
             SystemBarConfig leftBarConfig =
                     new SystemBarConfigBuilder()
                             .setSide(LEFT)
                             .setGirth(mResources.getDimensionPixelSize(
                                     R.dimen.car_left_system_bar_width))
-                            .setBarType(mResources.getInteger(R.integer.config_leftSystemBarType))
-                            .setZOrder(mResources.getInteger(R.integer.config_leftSystemBarZOrder))
+                            .setBarType(
+                                    mResources.getInteger(R.integer.config_leftSystemBarType))
+                            .setZOrder(
+                                    mResources.getInteger(R.integer.config_leftSystemBarZOrder))
                             .setHideForKeyboard(mResources.getBoolean(
                                     R.bool.config_hideLeftSystemBarForKeyboard))
                             .build();
             mSystemBarConfigMap.put(LEFT, leftBarConfig);
         }
 
-        if (mRightNavBarEnabled) {
+        if (mRightNavBarEnabled || isRightDisplayCompatToolbarEnabled()) {
             SystemBarConfig rightBarConfig =
                     new SystemBarConfigBuilder()
                             .setSide(RIGHT)
                             .setGirth(mResources.getDimensionPixelSize(
                                     R.dimen.car_right_system_bar_width))
-                            .setBarType(mResources.getInteger(R.integer.config_rightSystemBarType))
-                            .setZOrder(mResources.getInteger(R.integer.config_rightSystemBarZOrder))
+                            .setBarType(
+                                    mResources.getInteger(R.integer.config_rightSystemBarType))
+                            .setZOrder(mResources.getInteger(
+                                    R.integer.config_rightSystemBarZOrder))
                             .setHideForKeyboard(mResources.getBoolean(
                                     R.bool.config_hideRightSystemBarForKeyboard))
                             .build();
@@ -294,6 +316,17 @@ public class SystemBarConfigs {
         }
     }
 
+    private void checkOnlyOneDisplayCompatIsEnabled() throws IllegalStateException {
+        boolean useRemoteLaunchTaskView =
+                mResources.getBoolean(R.bool.config_useRemoteLaunchTaskView);
+        int displayCompatEnabled =
+                mResources.getInteger(R.integer.config_showDisplayCompatToolbarOnSystemBar);
+        if (useRemoteLaunchTaskView && displayCompatEnabled != 0) {
+            throw new IllegalStateException("config_useRemoteLaunchTaskView is enabled but "
+                    + "config_showDisplayCompatToolbarOnSystemBar is non-zero");
+        }
+    }
+
     private void checkEnabledBarsHaveUniqueBarTypes() throws RuntimeException {
         Set<Integer> barTypesUsed = new ArraySet<>();
         int enabledNavBarCount = mSystemBarConfigMap.size();
@@ -391,8 +424,8 @@ public class SystemBarConfigs {
         ArrayMap<@SystemBarSide Integer, Boolean> visibilityMap = new ArrayMap<>();
         visibilityMap.put(TOP, mTopNavBarEnabled);
         visibilityMap.put(BOTTOM, mBottomNavBarEnabled);
-        visibilityMap.put(LEFT, mLeftNavBarEnabled);
-        visibilityMap.put(RIGHT, mRightNavBarEnabled);
+        visibilityMap.put(LEFT, mLeftNavBarEnabled || isLeftDisplayCompatToolbarEnabled());
+        visibilityMap.put(RIGHT, mRightNavBarEnabled || isRightDisplayCompatToolbarEnabled());
         return visibilityMap;
     }
 
@@ -430,6 +463,13 @@ public class SystemBarConfigs {
     private static boolean isVerticalBar(@SystemBarSide int side) {
         return side == LEFT || side == RIGHT;
     }
+    boolean isLeftDisplayCompatToolbarEnabled() {
+        return mDisplayCompatToolbarState == 1;
+    }
+
+    boolean isRightDisplayCompatToolbarEnabled() {
+        return mDisplayCompatToolbarState == 2;
+    }
 
     private static final class SystemBarConfig {
         private final int mSide;
@@ -473,7 +513,7 @@ public class SystemBarConfigs {
             return mPaddings;
         }
 
-        private WindowManager.LayoutParams getLayoutParams() {
+        private WindowManager.LayoutParams getLayoutParams(boolean isDockEnabled) {
             WindowManager.LayoutParams lp = new WindowManager.LayoutParams(
                     isHorizontalBar(mSide) ? ViewGroup.LayoutParams.MATCH_PARENT : mGirth,
                     isHorizontalBar(mSide) ? mGirth : ViewGroup.LayoutParams.MATCH_PARENT,
@@ -492,6 +532,10 @@ public class SystemBarConfigs {
             lp.windowAnimations = 0;
             lp.gravity = BAR_GRAVITY_MAP.get(mSide);
             lp.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
+            if (isDockEnabled) {
+                lp.privateFlags = lp.privateFlags
+                        | WindowManager.LayoutParams.PRIVATE_FLAG_INTERCEPT_GLOBAL_DRAG_AND_DROP;
+            }
             return lp;
         }
 
diff --git a/src/com/android/systemui/car/systembar/SystemBarUtil.kt b/src/com/android/systemui/car/systembar/SystemBarUtil.kt
new file mode 100644
index 00000000..633b05ce
--- /dev/null
+++ b/src/com/android/systemui/car/systembar/SystemBarUtil.kt
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.systemui.car.systembar
+
+import android.app.ActivityOptions
+import android.car.settings.CarSettings.Secure.KEY_UNACCEPTED_TOS_DISABLED_APPS
+import android.content.Context
+import android.content.Intent
+import android.os.UserHandle
+import android.provider.Settings
+import android.text.TextUtils
+import android.util.ArraySet
+import android.util.Log
+import com.android.systemui.R
+import com.android.systemui.settings.UserTracker
+import java.net.URISyntaxException
+
+object SystemBarUtil {
+    private const val TAG = "SystemBarUtil"
+    private const val TOS_DISABLED_APPS_SEPARATOR = ","
+
+    /**
+     * Returns a set of packages that are disabled by tos
+     *
+     * @param context The application context
+     * @param uid A user id for a particular user
+     *
+     * @return Set of packages disabled by tos
+     */
+    fun getTosDisabledPackages(context: Context, uid: Int?): Set<String> {
+        if (uid == null) {
+            return ArraySet()
+        }
+        val settingsValue = Settings.Secure
+                .getStringForUser(context.contentResolver, KEY_UNACCEPTED_TOS_DISABLED_APPS, uid)
+        return if (TextUtils.isEmpty(settingsValue)) {
+            ArraySet()
+        } else {
+            settingsValue.split(TOS_DISABLED_APPS_SEPARATOR).toSet()
+        }
+    }
+
+    /**
+     * Gets the intent for launching the TOS acceptance flow
+     *
+     * @param context The app context
+     * @param id The desired resource identifier
+     *
+     * @return TOS intent, or null
+     */
+    fun getIntentForTosAcceptanceFlow(context: Context, id: Int): Intent? {
+        val tosIntentName = context.resources.getString(id)
+        return try {
+            Intent.parseUri(tosIntentName, Intent.URI_ANDROID_APP_SCHEME)
+        } catch (e: URISyntaxException) {
+            Log.e(TAG, "Invalid intent URI in user_tos_activity_intent", e)
+            null
+        }
+    }
+
+    /**
+     * Helper method that launches an activity with an intent for a particular user.
+     *
+     * @param context The app context
+     * @param intent The description of the activity to start.
+     * @param userId The UserHandle of the user to start this activity for.
+     */
+    fun launchApp(context: Context, intent: Intent, userId: UserHandle) {
+        val options = ActivityOptions.makeBasic()
+        options.launchDisplayId = context.displayId
+        context.startActivityAsUser(intent, options.toBundle(), userId)
+    }
+
+    /**
+     * Launch the TOS acceptance flow
+     *
+     * @param context The app context
+     * @param userTracker user tracker object
+     */
+    fun showTosAcceptanceFlow(context: Context, userTracker: UserTracker?) {
+        val tosIntent = getIntentForTosAcceptanceFlow(context, R.string.user_tos_activity_intent)
+        val userHandle = userTracker?.userHandle
+        if (tosIntent == null) {
+            Log.w(TAG, "Unable to launch TOS flow from Assistant because intent is null")
+            return
+        }
+        if (userHandle == null) {
+            Log.w(TAG, "Unable to launch TOS flow from Assistant because userid is null")
+            return
+        }
+        launchApp(context, tosIntent, userHandle)
+    }
+}
diff --git a/src/com/android/systemui/car/systembar/VolumeButton.java b/src/com/android/systemui/car/systembar/VolumeButton.java
new file mode 100644
index 00000000..baa29b4e
--- /dev/null
+++ b/src/com/android/systemui/car/systembar/VolumeButton.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.systemui.car.systembar;
+
+import static android.media.AudioAttributes.USAGE_MEDIA;
+import static android.media.AudioManager.FLAG_SHOW_UI;
+
+import android.car.Car;
+import android.car.media.CarAudioManager;
+import android.content.Context;
+import android.util.AttributeSet;
+
+public class VolumeButton extends CarSystemBarButton {
+    public VolumeButton(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        Car car = Car.createCar(context);
+        CarAudioManager carAudioManager = car.getCarManager(CarAudioManager.class);
+
+        setOnClickListener(v -> {
+            if (carAudioManager != null) {
+                // todo(b/304797002): Use highest priority active group instead of USAGE_MEDIA
+                int groupId = carAudioManager.getVolumeGroupIdForUsage(USAGE_MEDIA);
+                carAudioManager.setGroupVolume(groupId, carAudioManager.getGroupVolume(groupId),
+                        FLAG_SHOW_UI);
+            }
+        });
+    }
+}
diff --git a/src/com/android/systemui/car/taskview/CarSystemUIProxyImpl.java b/src/com/android/systemui/car/taskview/CarSystemUIProxyImpl.java
index 94e20da4..b5cd9c4b 100644
--- a/src/com/android/systemui/car/taskview/CarSystemUIProxyImpl.java
+++ b/src/com/android/systemui/car/taskview/CarSystemUIProxyImpl.java
@@ -28,6 +28,7 @@ import android.car.app.CarTaskViewHost;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.hardware.display.DisplayManager;
+import android.os.Binder;
 import android.os.Process;
 import android.util.Slog;
 import android.view.Display;
@@ -127,7 +128,7 @@ public final class CarSystemUIProxyImpl
 
     @Override
     public CarTaskViewHost createCarTaskView(CarTaskViewClient carTaskViewClient) {
-        ensurePermission(Car.PERMISSION_MANAGE_CAR_SYSTEM_UI);
+        ensureManageSystemUIPermission(mContext);
         RemoteCarTaskViewServerImpl remoteCarTaskViewServerImpl =
                 new RemoteCarTaskViewServerImpl(
                         mContext,
@@ -186,9 +187,15 @@ public final class CarSystemUIProxyImpl
         }
     }
 
-    private void ensurePermission(String permission) {
-        if (mContext.checkCallingPermission(permission) != PackageManager.PERMISSION_GRANTED) {
-            throw new SecurityException("requires permission " + permission);
+    static void ensureManageSystemUIPermission(Context context) {
+        if (Binder.getCallingPid() == android.os.Process.myPid()) {
+            // If called from within CarSystemUI, allow.
+            return;
+        }
+        if (context.checkCallingPermission(Car.PERMISSION_MANAGE_CAR_SYSTEM_UI)
+                == PackageManager.PERMISSION_GRANTED) {
+            return;
         }
+        throw new SecurityException("requires permission " + Car.PERMISSION_MANAGE_CAR_SYSTEM_UI);
     }
 }
diff --git a/src/com/android/systemui/car/taskview/RemoteCarTaskViewServerImpl.java b/src/com/android/systemui/car/taskview/RemoteCarTaskViewServerImpl.java
index 2e0db2f8..24b2f67d 100644
--- a/src/com/android/systemui/car/taskview/RemoteCarTaskViewServerImpl.java
+++ b/src/com/android/systemui/car/taskview/RemoteCarTaskViewServerImpl.java
@@ -18,18 +18,18 @@ package com.android.systemui.car.taskview;
 
 import static android.app.ActivityTaskManager.INVALID_TASK_ID;
 
+import static com.android.systemui.car.taskview.CarSystemUIProxyImpl.ensureManageSystemUIPermission;
+
 import android.annotation.NonNull;
 import android.app.ActivityManager;
 import android.app.ActivityOptions;
 import android.app.ActivityTaskManager;
 import android.app.PendingIntent;
-import android.car.Car;
 import android.car.app.CarActivityManager;
 import android.car.app.CarTaskViewClient;
 import android.car.app.CarTaskViewHost;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.graphics.Rect;
 import android.os.Binder;
 import android.os.Bundle;
@@ -67,7 +67,7 @@ public class RemoteCarTaskViewServerImpl implements TaskViewBase {
     private final CarTaskViewHost mHostImpl = new CarTaskViewHost() {
         @Override
         public void release() {
-            ensureManageSystemUIPermission();
+            ensureManageSystemUIPermission(mContext);
             if (mReleased) {
                 Slog.w(TAG, "TaskView server part already released");
                 return;
@@ -91,19 +91,19 @@ public class RemoteCarTaskViewServerImpl implements TaskViewBase {
 
         @Override
         public void notifySurfaceCreated(SurfaceControl control) {
-            ensureManageSystemUIPermission();
+            ensureManageSystemUIPermission(mContext);
             mTaskViewTaskController.surfaceCreated(control);
         }
 
         @Override
         public void setWindowBounds(Rect bounds) {
-            ensureManageSystemUIPermission();
+            ensureManageSystemUIPermission(mContext);
             mTaskViewTaskController.setWindowBounds(bounds);
         }
 
         @Override
         public void notifySurfaceDestroyed() {
-            ensureManageSystemUIPermission();
+            ensureManageSystemUIPermission(mContext);
             mTaskViewTaskController.surfaceDestroyed();
         }
 
@@ -113,7 +113,7 @@ public class RemoteCarTaskViewServerImpl implements TaskViewBase {
                 Intent fillInIntent,
                 Bundle options,
                 Rect launchBounds) {
-            ensureManageSystemUIPermission();
+            ensureManageSystemUIPermission(mContext);
             mTaskViewTaskController.startActivity(
                     pendingIntent,
                     fillInIntent,
@@ -131,7 +131,7 @@ public class RemoteCarTaskViewServerImpl implements TaskViewBase {
         // in the base class.
         @Keep
         public void createRootTask(int displayId) {
-            ensureManageSystemUIPermission();
+            ensureManageSystemUIPermission(mContext);
             if (mRootTaskMediator != null) {
                 throw new IllegalStateException("Root task is already created for this task view.");
             }
@@ -152,7 +152,7 @@ public class RemoteCarTaskViewServerImpl implements TaskViewBase {
         @Keep
         public void createLaunchRootTask(int displayId, boolean embedHomeTask,
                 boolean embedRecentsTask, boolean embedAssistantTask) {
-            ensureManageSystemUIPermission();
+            ensureManageSystemUIPermission(mContext);
             if (mCarSystemUIProxy.isLaunchRootTaskPresent(displayId)) {
                 throw new IllegalArgumentException("Cannot create more than 1 root task on the"
                         + " display=" + displayId);
@@ -170,7 +170,7 @@ public class RemoteCarTaskViewServerImpl implements TaskViewBase {
 
         @Override
         public void showEmbeddedTask() {
-            ensureManageSystemUIPermission();
+            ensureManageSystemUIPermission(mContext);
             ActivityManager.RunningTaskInfo taskInfo =
                     mTaskViewTaskController.getTaskInfo();
             if (taskInfo == null) {
@@ -186,7 +186,7 @@ public class RemoteCarTaskViewServerImpl implements TaskViewBase {
 
         @Override
         public void addInsets(int index, int type, @NonNull Rect frame) {
-            ensureManageSystemUIPermission();
+            ensureManageSystemUIPermission(mContext);
             mInsets.append(InsetsSource.createId(mInsetsOwner, index, type), frame);
 
             if (mTaskViewTaskController.getTaskInfo() == null) {
@@ -202,7 +202,7 @@ public class RemoteCarTaskViewServerImpl implements TaskViewBase {
 
         @Override
         public void removeInsets(int index, int type) {
-            ensureManageSystemUIPermission();
+            ensureManageSystemUIPermission(mContext);
             if (mInsets.size() == 0) {
                 Slog.w(TAG, "No insets set.");
                 return;
@@ -246,18 +246,6 @@ public class RemoteCarTaskViewServerImpl implements TaskViewBase {
         mTaskViewTaskController.setTaskViewBase(this);
     }
 
-    private void ensureManageSystemUIPermission() {
-        if (Binder.getCallingPid() == android.os.Process.myPid()) {
-            // If called from within CarSystemUI, allow.
-            return;
-        }
-        if (mContext.checkCallingPermission(Car.PERMISSION_MANAGE_CAR_SYSTEM_UI)
-                == PackageManager.PERMISSION_GRANTED) {
-            return;
-        }
-        throw new SecurityException("requires permission " + Car.PERMISSION_MANAGE_CAR_SYSTEM_UI);
-    }
-
     public CarTaskViewHost getHostImpl() {
         return mHostImpl;
     }
@@ -283,9 +271,11 @@ public class RemoteCarTaskViewServerImpl implements TaskViewBase {
     public String toString() {
         ActivityManager.RunningTaskInfo taskInfo = mTaskViewTaskController.getTaskInfo();
         return "RemoteCarTaskViewServerImpl {"
-                + "mInsets=" + mInsets
+                + "insets=" + mInsets
                 + ", taskId=" + (taskInfo == null ? "null" : taskInfo.taskId)
                 + ", taskInfo=" + (taskInfo == null ? "null" : taskInfo)
+                + ", rootTaskMediator=" + (mRootTaskMediator == null ? "null"
+                : mRootTaskMediator.toString())
                 + "}";
     }
 
diff --git a/src/com/android/systemui/car/taskview/RootTaskMediator.java b/src/com/android/systemui/car/taskview/RootTaskMediator.java
index 681520ac..396b3fec 100644
--- a/src/com/android/systemui/car/taskview/RootTaskMediator.java
+++ b/src/com/android/systemui/car/taskview/RootTaskMediator.java
@@ -251,4 +251,19 @@ public final class RootTaskMediator implements ShellTaskOrganizer.TaskListener {
     LinkedHashMap<Integer, ActivityManager.RunningTaskInfo> getTaskStack() {
         return mTaskStack;
     }
+
+    @Override
+    public String toString() {
+        Iterator<ActivityManager.RunningTaskInfo> iterator = mTaskStack.values().iterator();
+        StringBuilder stringBuilder = new StringBuilder("{" + "displayId=" + mDisplayId + " ,");
+        stringBuilder.append("taskStack=[\n");
+        ActivityManager.RunningTaskInfo topTask;
+        while (iterator.hasNext()) {
+            topTask = iterator.next();
+            stringBuilder.append(" {" + " taskId=").append(topTask.taskId).append(",").append(
+                    " baseActivity=").append(topTask.baseActivity).append("}\n");
+        }
+        stringBuilder.append("]\n}\n");
+        return stringBuilder.toString();
+    }
 }
diff --git a/src/com/android/systemui/car/users/CarMUPANDUserTrackerImpl.java b/src/com/android/systemui/car/users/CarMUPANDUserTrackerImpl.java
index f8b1df11..31e253f2 100644
--- a/src/com/android/systemui/car/users/CarMUPANDUserTrackerImpl.java
+++ b/src/com/android/systemui/car/users/CarMUPANDUserTrackerImpl.java
@@ -37,12 +37,18 @@ import android.view.Display;
 import com.android.systemui.InitController;
 import com.android.systemui.car.CarServiceProvider;
 import com.android.systemui.dump.DumpManager;
+import com.android.systemui.flags.FeatureFlagsClassic;
 import com.android.systemui.settings.UserTrackerImpl;
 
 import java.util.List;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 
+import javax.inject.Provider;
+
+import kotlinx.coroutines.CoroutineDispatcher;
+import kotlinx.coroutines.CoroutineScope;
+
 /**
  * Custom user tracking class extended from {@link UserTrackerImpl} specifically for
  * the system user (user 0) running in a MUPAND configuration. This tracker will behave
@@ -91,11 +97,14 @@ public class CarMUPANDUserTrackerImpl extends UserTrackerImpl {
         }
     };
 
-    public CarMUPANDUserTrackerImpl(Context context, UserManager userManager,
+    public CarMUPANDUserTrackerImpl(Context context,
+            Provider<FeatureFlagsClassic> featureFlagsClassic, UserManager userManager,
             IActivityManager iActivityManager, DumpManager dumpManager,
+            CoroutineScope appScope, CoroutineDispatcher backgroundContext,
             Handler backgroundHandler, CarServiceProvider carServiceProvider,
             InitController initController) {
-        super(context, userManager, iActivityManager, dumpManager, backgroundHandler);
+        super(context, featureFlagsClassic, userManager, iActivityManager, dumpManager, appScope,
+                backgroundContext, backgroundHandler);
         mCarUserManagerCallbackExecutor = Executors.newSingleThreadExecutor();
         mCarServiceProvider = carServiceProvider;
 
diff --git a/src/com/android/systemui/car/users/CarMultiUserUtilsModule.java b/src/com/android/systemui/car/users/CarMultiUserUtilsModule.java
index 53fc3f96..e528bce8 100644
--- a/src/com/android/systemui/car/users/CarMultiUserUtilsModule.java
+++ b/src/com/android/systemui/car/users/CarMultiUserUtilsModule.java
@@ -28,8 +28,10 @@ import com.android.systemui.CoreStartable;
 import com.android.systemui.InitController;
 import com.android.systemui.car.CarServiceProvider;
 import com.android.systemui.dagger.SysUISingleton;
+import com.android.systemui.dagger.qualifiers.Application;
 import com.android.systemui.dagger.qualifiers.Background;
 import com.android.systemui.dump.DumpManager;
+import com.android.systemui.flags.FeatureFlagsClassic;
 import com.android.systemui.settings.DisplayTracker;
 import com.android.systemui.settings.UserContentResolverProvider;
 import com.android.systemui.settings.UserContextProvider;
@@ -43,6 +45,11 @@ import dagger.Provides;
 import dagger.multibindings.ClassKey;
 import dagger.multibindings.IntoMap;
 
+import javax.inject.Provider;
+
+import kotlinx.coroutines.CoroutineDispatcher;
+import kotlinx.coroutines.CoroutineScope;
+
 /**
  * Car-specific dagger Module for classes found within the com.android.systemui.settings package.
  */
@@ -61,17 +68,20 @@ public abstract class CarMultiUserUtilsModule {
     @Provides
     static UserTracker provideUserTracker(
             Context context,
+            Provider<FeatureFlagsClassic> featureFlagsProvider,
             UserManager userManager,
             IActivityManager iActivityManager,
             DumpManager dumpManager,
+            @Application CoroutineScope appScope,
+            @Background CoroutineDispatcher backgroundDispatcher,
             @Background Handler handler,
             CarServiceProvider carServiceProvider,
             InitController initController
     ) {
         if (CarSystemUIUserUtil.isMUPANDSystemUI()) {
             CarMUPANDUserTrackerImpl mupandTracker = new CarMUPANDUserTrackerImpl(context,
-                    userManager, iActivityManager, dumpManager, handler, carServiceProvider,
-                    initController);
+                    featureFlagsProvider, userManager, iActivityManager, dumpManager, appScope,
+                    backgroundDispatcher, handler, carServiceProvider, initController);
             mupandTracker.initialize(ActivityManager.getCurrentUser());
             return mupandTracker;
         }
@@ -81,8 +91,9 @@ public abstract class CarMultiUserUtilsModule {
         int startingUser = isSecondaryUserSystemUI
                 ? processUser.getIdentifier()
                 : ActivityManager.getCurrentUser();
-        CarUserTrackerImpl tracker = new CarUserTrackerImpl(context, userManager, iActivityManager,
-                dumpManager, handler, isSecondaryUserSystemUI);
+        CarUserTrackerImpl tracker = new CarUserTrackerImpl(context, featureFlagsProvider,
+                userManager, iActivityManager, dumpManager, appScope, backgroundDispatcher,
+                handler, isSecondaryUserSystemUI);
         tracker.initialize(startingUser);
         return tracker;
     }
diff --git a/src/com/android/systemui/car/users/CarUserTrackerImpl.java b/src/com/android/systemui/car/users/CarUserTrackerImpl.java
index 2fb37120..20f2b319 100644
--- a/src/com/android/systemui/car/users/CarUserTrackerImpl.java
+++ b/src/com/android/systemui/car/users/CarUserTrackerImpl.java
@@ -22,8 +22,14 @@ import android.os.Handler;
 import android.os.UserManager;
 
 import com.android.systemui.dump.DumpManager;
+import com.android.systemui.flags.FeatureFlagsClassic;
 import com.android.systemui.settings.UserTrackerImpl;
 
+import javax.inject.Provider;
+
+import kotlinx.coroutines.CoroutineDispatcher;
+import kotlinx.coroutines.CoroutineScope;
+
 /**
  * Custom user tracking class extended from {@link UserTrackerImpl} which defines custom behavior
  * when CarSystemUI is running as a secondary user on a multi-display device.
@@ -34,10 +40,12 @@ public class CarUserTrackerImpl extends UserTrackerImpl {
     // typically used for background users who should not be influenced by foreground user switches.
     private final boolean mShouldIgnoreUserSwitch;
 
-    public CarUserTrackerImpl(Context context, UserManager userManager,
-            IActivityManager iActivityManager, DumpManager dumpManager,
+    public CarUserTrackerImpl(Context context, Provider<FeatureFlagsClassic> featureFlagsClassic,
+            UserManager userManager, IActivityManager iActivityManager, DumpManager dumpManager,
+            CoroutineScope appScope, CoroutineDispatcher backgroundContext,
             Handler backgroundHandler, boolean ignoreUserSwitch) {
-        super(context, userManager, iActivityManager, dumpManager, backgroundHandler);
+        super(context, featureFlagsClassic, userManager, iActivityManager, dumpManager, appScope,
+                backgroundContext, backgroundHandler);
         mShouldIgnoreUserSwitch = ignoreUserSwitch;
     }
 
diff --git a/src/com/android/systemui/car/userswitcher/FullScreenUserSwitcherViewController.java b/src/com/android/systemui/car/userswitcher/FullScreenUserSwitcherViewController.java
index 6abd5384..34c61fd4 100644
--- a/src/com/android/systemui/car/userswitcher/FullScreenUserSwitcherViewController.java
+++ b/src/com/android/systemui/car/userswitcher/FullScreenUserSwitcherViewController.java
@@ -21,12 +21,17 @@ import android.animation.AnimatorListenerAdapter;
 import android.car.Car;
 import android.car.user.CarUserManager;
 import android.content.Context;
+import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.view.KeyEvent;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 
 import androidx.recyclerview.widget.GridLayoutManager;
 
+import com.android.settingslib.applications.InterestingConfigChanges;
 import com.android.systemui.R;
 import com.android.systemui.car.CarServiceProvider;
 import com.android.systemui.car.window.OverlayViewController;
@@ -34,6 +39,7 @@ import com.android.systemui.car.window.OverlayViewGlobalStateController;
 import com.android.systemui.dagger.SysUISingleton;
 import com.android.systemui.dagger.qualifiers.Main;
 import com.android.systemui.settings.UserTracker;
+import com.android.systemui.statusbar.policy.ConfigurationController;
 
 import javax.inject.Inject;
 
@@ -41,7 +47,8 @@ import javax.inject.Inject;
  * Controller for {@link R.layout#car_fullscreen_user_switcher}.
  */
 @SysUISingleton
-public class FullScreenUserSwitcherViewController extends OverlayViewController {
+public class FullScreenUserSwitcherViewController extends OverlayViewController
+        implements ConfigurationController.ConfigurationListener {
     private final Context mContext;
     private final UserTracker mUserTracker;
     private final Resources mResources;
@@ -50,12 +57,16 @@ public class FullScreenUserSwitcherViewController extends OverlayViewController
     private CarUserManager mCarUserManager;
     private UserGridRecyclerView mUserGridView;
     private UserGridRecyclerView.UserSelectionListener mUserSelectionListener;
+    private final InterestingConfigChanges mConfigChanges = new InterestingConfigChanges(
+            ActivityInfo.CONFIG_UI_MODE);
+
 
     @Inject
     public FullScreenUserSwitcherViewController(
             Context context,
             UserTracker userTracker,
             @Main Resources resources,
+            ConfigurationController configurationController,
             CarServiceProvider carServiceProvider,
             OverlayViewGlobalStateController overlayViewGlobalStateController) {
         super(R.id.fullscreen_user_switcher_stub, overlayViewGlobalStateController);
@@ -68,32 +79,36 @@ public class FullScreenUserSwitcherViewController extends OverlayViewController
             registerCarUserManagerIfPossible();
         });
         mShortAnimationDuration = mResources.getInteger(android.R.integer.config_shortAnimTime);
+        mConfigChanges.applyNewConfig(mContext.getResources());
+        configurationController.addCallback(this);
     }
 
     @Override
     protected void onFinishInflate() {
-        // Intercept back button.
-        UserSwitcherContainer container = getLayout().findViewById(R.id.user_switcher_container);
-        container.setKeyEventHandler(event -> {
-            if (event.getKeyCode() != KeyEvent.KEYCODE_BACK) {
-                return false;
-            }
-
-            if (event.getAction() == KeyEvent.ACTION_UP && getLayout().isVisibleToUser()) {
-                stop();
-            }
-            return true;
-        });
+        initializeViews();
+    }
 
-        // Initialize user grid.
-        mUserGridView = getLayout().findViewById(R.id.user_grid);
-        GridLayoutManager layoutManager = new GridLayoutManager(mContext,
-                mResources.getInteger(R.integer.user_fullscreen_switcher_num_col));
-        mUserGridView.setLayoutManager(layoutManager);
-        mUserGridView.setUserTracker(mUserTracker);
-        mUserGridView.buildAdapter();
-        mUserGridView.setUserSelectionListener(mUserSelectionListener);
-        registerCarUserManagerIfPossible();
+    @Override
+    public void onConfigChanged(Configuration configuration) {
+        if (mConfigChanges.applyNewConfig(mContext.getResources())) {
+            // prerequisites
+            if (getLayout() == null) return;
+            UserSwitcherContainer container = getLayout().findViewById(
+                    R.id.user_switcher_container);
+            if (container == null) return;
+            ViewGroup viewGroupParent = (ViewGroup) container.getParent();
+
+            // store index
+            int viewIndex = viewGroupParent.indexOfChild(container);
+
+            // reinflate
+            viewGroupParent.removeView(container);
+            UserSwitcherContainer newContainer = (UserSwitcherContainer) LayoutInflater.from(
+                    mContext).inflate(R.layout.car_fullscreen_user_switcher,
+                    viewGroupParent, /* attachToRoot= */ false);
+            viewGroupParent.addView(newContainer, viewIndex);
+            initializeViews();
+        }
     }
 
     @Override
@@ -117,6 +132,30 @@ public class FullScreenUserSwitcherViewController extends OverlayViewController
         fadeOut();
     }
 
+    private void initializeViews() {
+        // Intercept back button.
+        UserSwitcherContainer container = getLayout().findViewById(R.id.user_switcher_container);
+        container.setKeyEventHandler(event -> {
+            if (event.getKeyCode() != KeyEvent.KEYCODE_BACK) {
+                return false;
+            }
+
+            if (event.getAction() == KeyEvent.ACTION_UP && getLayout().isVisibleToUser()) {
+                stop();
+            }
+            return true;
+        });
+
+        mUserGridView = getLayout().findViewById(R.id.user_grid);
+        GridLayoutManager layoutManager = new GridLayoutManager(mContext,
+                mResources.getInteger(R.integer.user_fullscreen_switcher_num_col));
+        mUserGridView.setLayoutManager(layoutManager);
+        mUserGridView.setUserTracker(mUserTracker);
+        mUserGridView.buildAdapter();
+        mUserGridView.setUserSelectionListener(mUserSelectionListener);
+        registerCarUserManagerIfPossible();
+    }
+
     private void fadeOut() {
         mUserGridView.animate()
                 .alpha(0.0f)
diff --git a/src/com/android/systemui/car/volume/VolumeUI.java b/src/com/android/systemui/car/volume/VolumeUI.java
index bccbd46b..823040fd 100644
--- a/src/com/android/systemui/car/volume/VolumeUI.java
+++ b/src/com/android/systemui/car/volume/VolumeUI.java
@@ -18,9 +18,11 @@ package com.android.systemui.car.volume;
 
 import static android.car.media.CarAudioManager.AUDIO_FEATURE_VOLUME_GROUP_EVENTS;
 import static android.car.media.CarAudioManager.INVALID_AUDIO_ZONE;
+import static android.car.media.CarAudioManager.PRIMARY_AUDIO_ZONE;
 import static android.car.media.CarVolumeGroupEvent.EXTRA_INFO_SHOW_UI;
 import static android.car.media.CarVolumeGroupEvent.EXTRA_INFO_VOLUME_INDEX_CHANGED_BY_AUDIO_SYSTEM;
 
+import android.app.ActivityManager;
 import android.car.Car;
 import android.car.CarOccupantZoneManager;
 import android.car.media.CarAudioManager;
@@ -152,11 +154,12 @@ public class VolumeUI implements CoreStartable {
 
         mCarServiceProvider.addListener(car -> {
             if (mCarAudioManager != null) {
+                // already initialized
                 return;
             }
 
-            CarOccupantZoneManager carOccupantZoneManager =
-                    (CarOccupantZoneManager) car.getCarManager(Car.CAR_OCCUPANT_ZONE_SERVICE);
+            CarOccupantZoneManager carOccupantZoneManager = car.getCarManager(
+                    CarOccupantZoneManager.class);
             if (carOccupantZoneManager != null) {
                 CarOccupantZoneManager.OccupantZoneInfo info =
                         carOccupantZoneManager.getOccupantZoneForUser(mUserTracker.getUserHandle());
@@ -166,7 +169,14 @@ public class VolumeUI implements CoreStartable {
             }
 
             if (mAudioZoneId == INVALID_AUDIO_ZONE) {
-                return;
+                if (mUserTracker.getUserId() == ActivityManager.getCurrentUser()) {
+                    // Certain devices may not have occupant zones configured. As a fallback for
+                    // this situation, if the user is the foreground user, assume driver and use the
+                    // primary audio zone.
+                    mAudioZoneId = PRIMARY_AUDIO_ZONE;
+                } else {
+                    return;
+                }
             }
 
             mCarAudioManager = (CarAudioManager) car.getCarManager(Car.AUDIO_SERVICE);
diff --git a/src/com/android/systemui/car/window/OverlayPanelViewController.java b/src/com/android/systemui/car/window/OverlayPanelViewController.java
index 9e717a6c..8a97bb97 100644
--- a/src/com/android/systemui/car/window/OverlayPanelViewController.java
+++ b/src/com/android/systemui/car/window/OverlayPanelViewController.java
@@ -141,6 +141,9 @@ public abstract class OverlayPanelViewController extends OverlayViewController {
                 });
 
         mDragOpenTouchListener = (v, event) -> {
+            if (!shouldAnimateExpandPanel()) {
+                return true;
+            }
             if (!mCarDeviceProvisionedController.isCurrentUserFullySetup()) {
                 return true;
             }
diff --git a/src/com/android/systemui/car/window/OverlayViewController.java b/src/com/android/systemui/car/window/OverlayViewController.java
index 3117279f..a1f6f6ca 100644
--- a/src/com/android/systemui/car/window/OverlayViewController.java
+++ b/src/com/android/systemui/car/window/OverlayViewController.java
@@ -268,6 +268,14 @@ public class OverlayViewController {
     }
 
     /**
+     * Returns the amount of dimming to apply to the overlay window when initially brought to front.
+     * Range is from 1.0 for completely opaque to 0.0 for no dim.
+     */
+    protected float getDefaultDimAmount() {
+        return 0f;
+    }
+
+    /**
      * Returns {@code true} if the window should use stable insets. Using stable insets means that
      * even when system bars are temporarily not visible, inset from the system bars will still be
      * applied.
diff --git a/src/com/android/systemui/car/window/OverlayViewGlobalStateController.java b/src/com/android/systemui/car/window/OverlayViewGlobalStateController.java
index 0358f76f..3da60cf1 100644
--- a/src/com/android/systemui/car/window/OverlayViewGlobalStateController.java
+++ b/src/com/android/systemui/car/window/OverlayViewGlobalStateController.java
@@ -129,6 +129,7 @@ public class OverlayViewGlobalStateController {
         refreshUseStableInsets();
         refreshInsetsToFit();
         refreshWindowFocus();
+        refreshWindowDefaultDimBehind();
         refreshSystemBarVisibility();
         refreshStatusBarVisibility();
         refreshRotaryFocusIfNeeded();
@@ -204,6 +205,7 @@ public class OverlayViewGlobalStateController {
         refreshUseStableInsets();
         refreshInsetsToFit();
         refreshWindowFocus();
+        refreshWindowDefaultDimBehind();
         refreshSystemBarVisibility();
         refreshStatusBarVisibility();
         refreshRotaryFocusIfNeeded();
@@ -216,6 +218,20 @@ public class OverlayViewGlobalStateController {
         debugLog();
     }
 
+    /**
+     * After the default dim amount is set via {@link OverlayViewController#getDefaultDimAmount},
+     * this function can be called to make further updates to the dim amount when an overlay view
+     * is the top z-ordered window. Returns {@code true} if the dim amount of the window has been
+     * updated
+     */
+    public boolean updateWindowDimBehind(OverlayViewController viewController, float dimAmount) {
+        if (mHighestZOrder == null || viewController != mHighestZOrder) {
+            return false;
+        }
+        mSystemUIOverlayWindowController.setDimBehind(dimAmount);
+        return true;
+    }
+
     private void refreshHighestZOrderWhenHidingView(OverlayViewController viewController) {
         if (mZOrderVisibleSortedMap.isEmpty()) {
             mHighestZOrder = null;
@@ -260,6 +276,11 @@ public class OverlayViewGlobalStateController {
         setWindowFocusable(mHighestZOrder == null ? false : mHighestZOrder.shouldFocusWindow());
     }
 
+    private void refreshWindowDefaultDimBehind() {
+        float dimAmount = mHighestZOrder == null ? 0f : mHighestZOrder.getDefaultDimAmount();
+        mSystemUIOverlayWindowController.setDimBehind(dimAmount);
+    }
+
     private void refreshUseStableInsets() {
         mSystemUIOverlayWindowController.setUsingStableInsets(
                 mHighestZOrder == null ? false : mHighestZOrder.shouldUseStableInsets());
diff --git a/src/com/android/systemui/car/window/SystemUIOverlayWindowController.java b/src/com/android/systemui/car/window/SystemUIOverlayWindowController.java
index f4d6c9da..0ea7187d 100644
--- a/src/com/android/systemui/car/window/SystemUIOverlayWindowController.java
+++ b/src/com/android/systemui/car/window/SystemUIOverlayWindowController.java
@@ -121,11 +121,13 @@ public class SystemUIOverlayWindowController implements
                         | WindowManager.LayoutParams.FLAG_TOUCHABLE_WHEN_WAKING
                         | WindowManager.LayoutParams.FLAG_SPLIT_TOUCH
                         | WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH
-                        | WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS,
+                        | WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS
+                        | WindowManager.LayoutParams.FLAG_DIM_BEHIND,
                 PixelFormat.TRANSLUCENT);
         mLp.token = new Binder();
         mLp.gravity = Gravity.TOP;
         mLp.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE;
+        mLp.dimAmount = 0f;
         mLp.setTitle("SystemUIOverlayWindow");
         mLp.packageName = mContext.getPackageName();
         mLp.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
@@ -172,6 +174,12 @@ public class SystemUIOverlayWindowController implements
         updateWindow();
     }
 
+    /** Sets the dim behind the window */
+    public void setDimBehind(float dimAmount) {
+        mLpChanged.dimAmount = dimAmount;
+        updateWindow();
+    }
+
     /** Sets the window to enable IME. */
     public void setWindowNeedsInput(boolean needsInput) {
         if (needsInput) {
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 998bf046..af0ecfe9 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -20,6 +20,14 @@
           android:sharedUserId="android.uid.system"
           package="com.android.systemui.tests">
 
+    <permission
+        android:name="com.android.car.docklib.permission.BROADCAST_SENDER"
+        tools:node="remove" />
+
+    <permission
+        android:name="com.android.car.docklib.permission.BROADCAST_RECEIVER"
+        tools:node="remove" />
+
     <application
         android:name="com.android.systemui.SystemUIApplication"
         android:debuggable="true"
diff --git a/tests/res/layout/hvac_toggle_button_view.xml b/tests/res/layout/hvac_toggle_button_view.xml
index 1dd730b5..423055a4 100644
--- a/tests/res/layout/hvac_toggle_button_view.xml
+++ b/tests/res/layout/hvac_toggle_button_view.xml
@@ -39,7 +39,6 @@
         style="@style/HvacButton"
         systemui:hvacAreaId="1"
         systemui:hvacPropertyId="354419973"
-        systemui:hvacTurnOffIfPowerOff="false"
         systemui:hvacToggleOnButtonDrawable="@drawable/ic_front_defroster_on"
         systemui:hvacToggleOffButtonDrawable="@drawable/ic_front_defroster_off"/>
 
@@ -49,7 +48,7 @@
         style="@style/HvacButton"
         systemui:hvacAreaId="1"
         systemui:hvacPropertyId="354419973"
-        systemui:hvacTurnOffIfAutoOn="true"
+        systemui:hvacDisableViewIfAutoOn="true"
         systemui:hvacToggleOnButtonDrawable="@drawable/ic_front_defroster_on"
         systemui:hvacToggleOffButtonDrawable="@drawable/ic_front_defroster_off"/>
 
@@ -70,7 +69,6 @@
         style="@style/HvacButton"
         systemui:hvacAreaId="1"
         systemui:hvacPropertyId="356517120"
-        systemui:hvacTurnOffIfPowerOff="false"
         systemui:hvacToggleOnButtonDrawable="@drawable/ic_front_defroster_on"
         systemui:hvacToggleOffButtonDrawable="@drawable/ic_front_defroster_off"
         systemui:onValue="1"
@@ -82,7 +80,7 @@
         style="@style/HvacButton"
         systemui:hvacAreaId="1"
         systemui:hvacPropertyId="356517120"
-        systemui:hvacTurnOffIfAutoOn="true"
+        systemui:hvacDisableViewIfAutoOn="true"
         systemui:hvacToggleOnButtonDrawable="@drawable/ic_front_defroster_on"
         systemui:hvacToggleOffButtonDrawable="@drawable/ic_front_defroster_off"
         systemui:onValue="1"
diff --git a/tests/src/com/android/systemui/car/hvac/FanDirectionButtonTest.java b/tests/src/com/android/systemui/car/hvac/FanDirectionButtonTest.java
index a036c491..ec148af3 100644
--- a/tests/src/com/android/systemui/car/hvac/FanDirectionButtonTest.java
+++ b/tests/src/com/android/systemui/car/hvac/FanDirectionButtonTest.java
@@ -89,6 +89,7 @@ public class FanDirectionButtonTest extends SysuiTestCase {
         mDirectionDefrostButton = mFanDirectionButtons.findViewById(R.id.direction_defrost);
 
         mFanDirectionButtons.setHvacPropertySetter(mHvacPropertySetter);
+        mFanDirectionButtons.setDisableViewIfPowerOff(true);
     }
 
     @Test
@@ -335,6 +336,35 @@ public class FanDirectionButtonTest extends SysuiTestCase {
         verify(mHvacPropertySetter, never()).setHvacProperty(anyInt(), anyInt(), anyInt());
     }
 
+    @Test
+    public void onClickWhenNotHvacPowerDependent_autoOff_setsNewValue() {
+        mFanDirectionButtons.setDisableViewIfPowerOff(false);
+        setPowerPropertyValue(false);
+        mFanDirectionButtons.onPropertyChanged(mHvacPowerProperty);
+        setAutoPropertyValue(false);
+        mFanDirectionButtons.onPropertyChanged(mHvacAutoProperty);
+        waitForIdleSync();
+
+        mDirectionFaceButton.performClick();
+
+        verify(mHvacPropertySetter).setHvacProperty(PROPERTY_ID, GLOBAL_AREA_ID,
+                FAN_DIRECTION_FACE);
+    }
+
+    @Test
+    public void onClickWhenNotHvacPowerDependent_autoOn_doesNotSetNewValue() {
+        mFanDirectionButtons.setDisableViewIfPowerOff(false);
+        setPowerPropertyValue(false);
+        mFanDirectionButtons.onPropertyChanged(mHvacPowerProperty);
+        setAutoPropertyValue(true);
+        mFanDirectionButtons.onPropertyChanged(mHvacAutoProperty);
+        waitForIdleSync();
+
+        mDirectionFaceButton.performClick();
+
+        verify(mHvacPropertySetter, never()).setHvacProperty(anyInt(), anyInt(), anyInt());
+    }
+
     private void setCarPropertyValue(@Nullable Integer value) {
         when(mCarPropertyValue.getAreaId()).thenReturn(GLOBAL_AREA_ID);
         when(mCarPropertyValue.getPropertyId()).thenReturn(PROPERTY_ID);
@@ -348,8 +378,8 @@ public class FanDirectionButtonTest extends SysuiTestCase {
     }
 
     private void setAutoPropertyValue(boolean value) {
-        when(mCarPropertyValue.getAreaId()).thenReturn(GLOBAL_AREA_ID);
-        when(mCarPropertyValue.getPropertyId()).thenReturn(HVAC_AUTO_ON);
-        when(mCarPropertyValue.getValue()).thenReturn(value);
+        when(mHvacAutoProperty.getAreaId()).thenReturn(GLOBAL_AREA_ID);
+        when(mHvacAutoProperty.getPropertyId()).thenReturn(HVAC_AUTO_ON);
+        when(mHvacAutoProperty.getValue()).thenReturn(value);
     }
 }
diff --git a/tests/src/com/android/systemui/car/hvac/FanSpeedBarTest.java b/tests/src/com/android/systemui/car/hvac/FanSpeedBarTest.java
index c9b11561..f43668ab 100644
--- a/tests/src/com/android/systemui/car/hvac/FanSpeedBarTest.java
+++ b/tests/src/com/android/systemui/car/hvac/FanSpeedBarTest.java
@@ -17,12 +17,9 @@
 package com.android.systemui.car.hvac;
 
 import static android.car.VehiclePropertyIds.HVAC_AUTO_ON;
-import static android.car.VehiclePropertyIds.HVAC_FAN_DIRECTION;
 import static android.car.VehiclePropertyIds.HVAC_FAN_SPEED;
 import static android.car.VehiclePropertyIds.HVAC_POWER_ON;
 
-import static com.android.systemui.car.hvac.referenceui.FanDirectionButtons.FAN_DIRECTION_FACE;
-
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -86,7 +83,7 @@ public class FanSpeedBarTest extends SysuiTestCase {
     }
 
     @Test
-    public void onClickOffButton_allowsControl_setsFanSpeedToOff() {
+    public void onClickOffButton_allowsControl_setsFanSpeedToMin() {
         setPowerPropertyValue(true);
         mFanSpeedBar.onPropertyChanged(mHvacPowerProperty);
         setAutoPropertyValue(false);
@@ -98,7 +95,7 @@ public class FanSpeedBarTest extends SysuiTestCase {
     }
 
     @Test
-    public void onClickSpeedOneButton_allowsControl_setsFanSpeedToOne() {
+    public void onClickSpeedOneButton_allowsControl_setsFanSpeedToTwo() {
         setPowerPropertyValue(true);
         mFanSpeedBar.onPropertyChanged(mHvacPowerProperty);
         setAutoPropertyValue(false);
@@ -110,7 +107,7 @@ public class FanSpeedBarTest extends SysuiTestCase {
     }
 
     @Test
-    public void onClickSpeedTwoButton_allowsControl_setsFanSpeedToTwo() {
+    public void onClickSpeedTwoButton_allowsControl_setsFanSpeedToThree() {
         setPowerPropertyValue(true);
         mFanSpeedBar.onPropertyChanged(mHvacPowerProperty);
         setAutoPropertyValue(false);
@@ -122,7 +119,7 @@ public class FanSpeedBarTest extends SysuiTestCase {
     }
 
     @Test
-    public void onClickSpeedThreeButton_allowsControl_setsFanSpeedToThree() {
+    public void onClickSpeedThreeButton_allowsControl_setsFanSpeedToFour() {
         setPowerPropertyValue(true);
         mFanSpeedBar.onPropertyChanged(mHvacPowerProperty);
         setAutoPropertyValue(false);
@@ -134,7 +131,7 @@ public class FanSpeedBarTest extends SysuiTestCase {
     }
 
     @Test
-    public void onClickSpeedFourButton_allowsControl_setsFanSpeedToFour() {
+    public void onClickSpeedFourButton_allowsControl_setsFanSpeedToFive() {
         setPowerPropertyValue(true);
         mFanSpeedBar.onPropertyChanged(mHvacPowerProperty);
         setAutoPropertyValue(false);
diff --git a/tests/src/com/android/systemui/car/hvac/HvacPanelOverlayViewControllerTest.java b/tests/src/com/android/systemui/car/hvac/HvacPanelOverlayViewControllerTest.java
index 14710deb..8d13cbdf 100644
--- a/tests/src/com/android/systemui/car/hvac/HvacPanelOverlayViewControllerTest.java
+++ b/tests/src/com/android/systemui/car/hvac/HvacPanelOverlayViewControllerTest.java
@@ -16,11 +16,14 @@
 
 package com.android.systemui.car.hvac;
 
+import static com.android.systemui.car.window.OverlayPanelViewController.OVERLAY_FROM_BOTTOM_BAR;
+
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyFloat;
 import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.app.UiModeManager;
@@ -90,6 +93,20 @@ public class HvacPanelOverlayViewControllerTest extends SysuiTestCase {
     }
 
     @Test
+    public void onScroll_updateDim() {
+        int height = 100;
+        View mockLayout = mock(View.class);
+        when(mockLayout.getHeight()).thenReturn(height);
+        mHvacPanelOverlayViewController.setLayout(mockLayout);
+        mHvacPanelOverlayViewController.setOverlayDirection(OVERLAY_FROM_BOTTOM_BAR);
+
+        mHvacPanelOverlayViewController.onScroll(50);
+
+        verify(mOverlayViewGlobalStateController).updateWindowDimBehind(
+                eq(mHvacPanelOverlayViewController), anyFloat());
+    }
+
+    @Test
     public void onConfigChanged_oldHVACViewRemoved_newHVACViewAdded() {
         Configuration config = new Configuration();
         config.uiMode = Configuration.UI_MODE_NIGHT_YES;
diff --git a/tests/src/com/android/systemui/car/hvac/HvacUtilsTest.java b/tests/src/com/android/systemui/car/hvac/HvacUtilsTest.java
new file mode 100644
index 00000000..3fecd48c
--- /dev/null
+++ b/tests/src/com/android/systemui/car/hvac/HvacUtilsTest.java
@@ -0,0 +1,229 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.systemui.car.hvac;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.when;
+
+import android.car.hardware.CarPropertyConfig;
+import android.car.hardware.property.AreaIdConfig;
+import android.test.suitebuilder.annotation.SmallTest;
+
+import com.android.systemui.SysuiTestCase;
+import com.android.systemui.car.CarSystemUiTest;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.List;
+
+@CarSystemUiTest
+@SmallTest
+public class HvacUtilsTest extends SysuiTestCase {
+    @Mock
+    private CarPropertyConfig<Float> mFloatCarPropertyConfig;
+    @Mock
+    private CarPropertyConfig<Integer> mIntegerCarPropertyConfig;
+    @Mock
+    private AreaIdConfig<Integer> mAreaIdConfig1;
+    @Mock
+    private AreaIdConfig<Integer> mAreaIdConfig2;
+    @Mock
+    private AreaIdConfig<Integer> mAreaIdConfig3;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @Test
+    public void shouldAllowControl_powerNotNeeded_powerOff_autoNotNeeded_autoOff() {
+        assertThat(HvacUtils.shouldAllowControl(/* disableViewIfPowerOff= */ false,
+                /* powerOn=*/ false, /* disableViewIfAutoOn= */ false,
+                /* autoOn= */ false)).isTrue();
+    }
+
+    @Test
+    public void shouldAllowControl_powerNotNeeded_powerOff_autoNotNeeded_autoOn() {
+        assertThat(HvacUtils.shouldAllowControl(/* disableViewIfPowerOff= */ false,
+                /* powerOn=*/ false, /* disableViewIfAutoOn= */ false,
+                /* autoOn= */ true)).isTrue();
+    }
+
+    @Test
+    public void shouldAllowControl_powerNotNeeded_powerOff_autoNeeded_autoOn() {
+        assertThat(HvacUtils.shouldAllowControl(/* disableViewIfPowerOff= */ false,
+                /* powerOn=*/ false, /* disableViewIfAutoOn= */ true,
+                /* autoOn= */ true)).isFalse();
+    }
+
+    @Test
+    public void shouldAllowControl_powerNotNeeded_powerOff_autoNeeded_autoOff() {
+        assertThat(HvacUtils.shouldAllowControl(/* disableViewIfPowerOff= */ false,
+                /* powerOn=*/ false, /* disableViewIfAutoOn= */ true,
+                /* autoOn= */ false)).isTrue();
+    }
+
+    @Test
+    public void shouldAllowControl_powerNotNeeded_powerOn_autoNeeded_autoOn() {
+        assertThat(HvacUtils.shouldAllowControl(/* disableViewIfPowerOff= */ false,
+                /* powerOn=*/ true, /* disableViewIfAutoOn= */ true,
+                /* autoOn= */ true)).isFalse();
+    }
+
+    @Test
+    public void shouldAllowControl_powerNotNeeded_powerOn_autoNeeded_autoOff() {
+        assertThat(HvacUtils.shouldAllowControl(/* disableViewIfPowerOff= */ false,
+                /* powerOn=*/ true, /* disableViewIfAutoOn= */ true,
+                /* autoOn= */ false)).isTrue();
+    }
+
+    @Test
+    public void shouldAllowControl_powerNotNeeded_powerOn_autoNotNeeded_autoOn() {
+        assertThat(HvacUtils.shouldAllowControl(/* disableViewIfPowerOff= */ false,
+                /* powerOn=*/ true, /* disableViewIfAutoOn= */ false,
+                /* autoOn= */ true)).isTrue();
+    }
+
+    @Test
+    public void shouldAllowControl_powerNotNeeded_powerOn_autoNotNeeded_autoOff() {
+        assertThat(HvacUtils.shouldAllowControl(/* disableViewIfPowerOff= */ false,
+                /* powerOn=*/ true, /* disableViewIfAutoOn= */ false,
+                /* autoOn= */ false)).isTrue();
+    }
+
+    @Test
+    public void shouldAllowControl_powerNeeded_powerOn_autoNeeded_autoOn() {
+        assertThat(HvacUtils.shouldAllowControl(/* disableViewIfPowerOff= */ true,
+                /* powerOn=*/ true, /* disableViewIfAutoOn= */ true,
+                /* autoOn= */ true)).isFalse();
+    }
+
+    @Test
+    public void shouldAllowControl_powerNeeded_powerOn_autoNeeded_autoOff() {
+        assertThat(HvacUtils.shouldAllowControl(/* disableViewIfPowerOff= */ true,
+                /* powerOn=*/ true, /* disableViewIfAutoOn= */ true,
+                /* autoOn= */ false)).isTrue();
+    }
+
+    @Test
+    public void shouldAllowControl_powerNeeded_powerOn_autoNotNeeded_autoOn() {
+        assertThat(HvacUtils.shouldAllowControl(/* disableViewIfPowerOff= */ true,
+                /* powerOn=*/ true, /* disableViewIfAutoOn= */ false,
+                /* autoOn= */ true)).isTrue();
+    }
+
+    @Test
+    public void shouldAllowControl_powerNeeded_powerOn_autoNotNeeded_autoOff() {
+        assertThat(HvacUtils.shouldAllowControl(/* disableViewIfPowerOff= */ true,
+                /* powerOn=*/ true, /* disableViewIfAutoOn= */ false,
+                /* autoOn= */ false)).isTrue();
+    }
+
+    @Test
+    public void shouldAllowControl_powerNeeded_powerOff_autoNotNeeded_autoOff() {
+        assertThat(HvacUtils.shouldAllowControl(/* disableViewIfPowerOff= */ true,
+                /* powerOn=*/ false, /* disableViewIfAutoOn= */ false,
+                /* autoOn= */ false)).isFalse();
+    }
+
+    @Test
+    public void shouldAllowControl_powerNeeded_powerOff_autoNotNeeded_autoOn() {
+        assertThat(HvacUtils.shouldAllowControl(/* disableViewIfPowerOff= */ true,
+                /* powerOn=*/ false, /* disableViewIfAutoOn= */ false,
+                /* autoOn= */ true)).isFalse();
+    }
+
+    @Test
+    public void shouldAllowControl_powerNeeded_powerOff_autoNeeded_autoOn() {
+        assertThat(HvacUtils.shouldAllowControl(/* disableViewIfPowerOff= */ true,
+                /* powerOn=*/ false, /* disableViewIfAutoOn= */ true,
+                /* autoOn= */ true)).isFalse();
+    }
+
+    @Test
+    public void shouldAllowControl_powerNeeded_powerOff_autoNeeded_autoOff() {
+        assertThat(HvacUtils.shouldAllowControl(/* disableViewIfPowerOff= */ true,
+                /* powerOn=*/ false, /* disableViewIfAutoOn= */ true,
+                /* autoOn= */ false)).isFalse();
+    }
+
+    @Test
+    public void getHighestMinValueForAllAreaIds_nonInteger_returnsNull() {
+        when(mFloatCarPropertyConfig.getPropertyType()).thenReturn(Float.class);
+        assertThat(HvacUtils.getHighestMinValueForAllAreaIds(mFloatCarPropertyConfig))
+                .isEqualTo(null);
+    }
+
+    @Test
+    public void getHighestMinValueForAllAreaIds_integer_returnsHighest() {
+        when(mAreaIdConfig1.getMinValue()).thenReturn(1);
+        when(mAreaIdConfig2.getMinValue()).thenReturn(2);
+        when(mAreaIdConfig3.getMinValue()).thenReturn(3);
+        when(mIntegerCarPropertyConfig.getPropertyType()).thenReturn(Integer.class);
+        when(mIntegerCarPropertyConfig.getAreaIdConfigs())
+                .thenReturn(List.of(mAreaIdConfig1, mAreaIdConfig2, mAreaIdConfig3));
+        assertThat(HvacUtils.getHighestMinValueForAllAreaIds(mIntegerCarPropertyConfig))
+                .isEqualTo(3);
+    }
+
+    @Test
+    public void getHighestMinValueForAllAreaIds_integer_ignoresNullValues() {
+        when(mAreaIdConfig1.getMinValue()).thenReturn(1);
+        when(mAreaIdConfig2.getMinValue()).thenReturn(2);
+        when(mAreaIdConfig3.getMinValue()).thenReturn(null);
+        when(mIntegerCarPropertyConfig.getPropertyType()).thenReturn(Integer.class);
+        when(mIntegerCarPropertyConfig.getAreaIdConfigs())
+                .thenReturn(List.of(mAreaIdConfig1, mAreaIdConfig2, mAreaIdConfig3));
+        assertThat(HvacUtils.getHighestMinValueForAllAreaIds(mIntegerCarPropertyConfig))
+                .isEqualTo(2);
+    }
+
+    @Test
+    public void getLowestMaxValueForAllAreaIds_nonInteger_returnsNull() {
+        when(mFloatCarPropertyConfig.getPropertyType()).thenReturn(Float.class);
+        assertThat(HvacUtils.getLowestMaxValueForAllAreaIds(mFloatCarPropertyConfig))
+                .isEqualTo(null);
+    }
+
+    @Test
+    public void getLowestMaxValueForAllAreaIds_integer_returnsLowest() {
+        when(mAreaIdConfig1.getMaxValue()).thenReturn(1);
+        when(mAreaIdConfig2.getMaxValue()).thenReturn(2);
+        when(mAreaIdConfig3.getMaxValue()).thenReturn(3);
+        when(mIntegerCarPropertyConfig.getPropertyType()).thenReturn(Integer.class);
+        when(mIntegerCarPropertyConfig.getAreaIdConfigs())
+                .thenReturn(List.of(mAreaIdConfig1, mAreaIdConfig2, mAreaIdConfig3));
+        assertThat(HvacUtils.getLowestMaxValueForAllAreaIds(mIntegerCarPropertyConfig))
+                .isEqualTo(1);
+    }
+
+    @Test
+    public void getLowestMaxValueForAllAreaIds_integer_ignoresNullValues() {
+        when(mAreaIdConfig1.getMaxValue()).thenReturn(0);
+        when(mAreaIdConfig2.getMaxValue()).thenReturn(1);
+        when(mAreaIdConfig3.getMaxValue()).thenReturn(null);
+        when(mIntegerCarPropertyConfig.getPropertyType()).thenReturn(Integer.class);
+        when(mIntegerCarPropertyConfig.getAreaIdConfigs())
+                .thenReturn(List.of(mAreaIdConfig1, mAreaIdConfig2, mAreaIdConfig3));
+        assertThat(HvacUtils.getLowestMaxValueForAllAreaIds(mIntegerCarPropertyConfig))
+                .isEqualTo(0);
+    }
+}
diff --git a/tests/src/com/android/systemui/car/hvac/toggle/HvacBooleanToggleButtonTest.java b/tests/src/com/android/systemui/car/hvac/toggle/HvacBooleanToggleButtonTest.java
index 983fe212..ede05dea 100644
--- a/tests/src/com/android/systemui/car/hvac/toggle/HvacBooleanToggleButtonTest.java
+++ b/tests/src/com/android/systemui/car/hvac/toggle/HvacBooleanToggleButtonTest.java
@@ -84,6 +84,9 @@ public class HvacBooleanToggleButtonTest extends SysuiTestCase {
         mDefaultButton.setHvacPropertySetter(mHvacPropertySetterDefault);
         mTurnOnWhenPowerOffButton.setHvacPropertySetter(mHvacPropertySetterTurnOnWhenPowerOff);
         mTurnOffWhenAutoOnButton.setHvacPropertySetter(mHvacPropertySetterTurnOffWhenAutoOn);
+        mDefaultButton.setDisableViewIfPowerOff(true);
+        mTurnOnWhenPowerOffButton.setDisableViewIfPowerOff(false);
+        mTurnOffWhenAutoOnButton.setDisableViewIfPowerOff(true);
     }
 
     @Test
@@ -230,6 +233,37 @@ public class HvacBooleanToggleButtonTest extends SysuiTestCase {
                 anyBoolean());
     }
 
+    @Test
+    public void onClickWhenNotHvacPowerDependent_autoOff_setsNewValue() {
+        mTurnOffWhenAutoOnButton.setDisableViewIfPowerOff(false);
+        setPowerPropertyValue(false);
+        mTurnOffWhenAutoOnButton.onPropertyChanged(mHvacPowerProperty);
+        setAutoPropertyValue(false);
+        mTurnOffWhenAutoOnButton.onPropertyChanged(mHvacAutoProperty);
+        setCarPropertyValue(true);
+        mTurnOffWhenAutoOnButton.onPropertyChanged(mCarPropertyValue);
+
+        mTurnOffWhenAutoOnButton.performClick();
+
+        verify(mHvacPropertySetterTurnOffWhenAutoOn).setHvacProperty(PROPERTY_ID, AREA_ID, false);
+    }
+
+    @Test
+    public void onClickWhenNotHvacPowerDependent_autoOn_doesNotSetNewValue() {
+        mTurnOffWhenAutoOnButton.setDisableViewIfPowerOff(false);
+        setPowerPropertyValue(false);
+        mTurnOffWhenAutoOnButton.onPropertyChanged(mHvacPowerProperty);
+        setAutoPropertyValue(true);
+        mTurnOffWhenAutoOnButton.onPropertyChanged(mHvacAutoProperty);
+        setCarPropertyValue(false);
+        mTurnOffWhenAutoOnButton.onPropertyChanged(mCarPropertyValue);
+
+        mTurnOffWhenAutoOnButton.performClick();
+
+        verify(mHvacPropertySetterTurnOffWhenAutoOn, never()).setHvacProperty(anyInt(), anyInt(),
+                anyBoolean());
+    }
+
     private void setCarPropertyValue(boolean value) {
         when(mCarPropertyValue.getAreaId()).thenReturn(AREA_ID);
         when(mCarPropertyValue.getPropertyId()).thenReturn(PROPERTY_ID);
diff --git a/tests/src/com/android/systemui/car/hvac/toggle/HvacIntegerToggleButtonTest.java b/tests/src/com/android/systemui/car/hvac/toggle/HvacIntegerToggleButtonTest.java
index 72bda991..63c06634 100644
--- a/tests/src/com/android/systemui/car/hvac/toggle/HvacIntegerToggleButtonTest.java
+++ b/tests/src/com/android/systemui/car/hvac/toggle/HvacIntegerToggleButtonTest.java
@@ -91,6 +91,10 @@ public class HvacIntegerToggleButtonTest extends SysuiTestCase {
         mTurnOnWhenPowerOffButton.setHvacPropertySetter(mHvacPropertySetterTurnOnWhenPowerOff);
         mTurnOffWhenAutoOnButton.setHvacPropertySetter(mHvacPropertySetterTurnOffWhenAutoOn);
         mKeepOnPreventOffButton.setHvacPropertySetter(mHvacPropertySetterKeepOnPreventOff);
+        mDefaultButton.setDisableViewIfPowerOff(true);
+        mTurnOnWhenPowerOffButton.setDisableViewIfPowerOff(false);
+        mTurnOffWhenAutoOnButton.setDisableViewIfPowerOff(true);
+        mKeepOnPreventOffButton.setDisableViewIfPowerOff(true);
     }
 
     @Test
@@ -268,6 +272,38 @@ public class HvacIntegerToggleButtonTest extends SysuiTestCase {
                 anyInt());
     }
 
+    @Test
+    public void onClickWhenNotHvacPowerDependent_autoOff_setsNewValue() {
+        mTurnOffWhenAutoOnButton.setDisableViewIfPowerOff(false);
+        setPowerPropertyValue(false);
+        mTurnOffWhenAutoOnButton.onPropertyChanged(mHvacPowerProperty);
+        setAutoPropertyValue(false);
+        mTurnOffWhenAutoOnButton.onPropertyChanged(mHvacAutoProperty);
+        setCarPropertyValue(OFF_VALUE);
+        mTurnOffWhenAutoOnButton.onPropertyChanged(mCarPropertyValue);
+
+        mTurnOffWhenAutoOnButton.performClick();
+
+        verify(mHvacPropertySetterTurnOffWhenAutoOn).setHvacProperty(PROPERTY_ID, AREA_ID,
+                ON_VALUE);
+    }
+
+    @Test
+    public void onClickWhenNotHvacPowerDependent_autoOn_doesNotSetNewValue() {
+        mTurnOffWhenAutoOnButton.setDisableViewIfPowerOff(false);
+        setPowerPropertyValue(false);
+        mTurnOffWhenAutoOnButton.onPropertyChanged(mHvacPowerProperty);
+        setAutoPropertyValue(true);
+        mTurnOffWhenAutoOnButton.onPropertyChanged(mHvacAutoProperty);
+        setCarPropertyValue(OFF_VALUE);
+        mTurnOffWhenAutoOnButton.onPropertyChanged(mCarPropertyValue);
+
+        mTurnOffWhenAutoOnButton.performClick();
+
+        verify(mHvacPropertySetterTurnOffWhenAutoOn, never()).setHvacProperty(anyInt(), anyInt(),
+                anyInt());
+    }
+
     private void setCarPropertyValue(int value) {
         when(mCarPropertyValue.getAreaId()).thenReturn(AREA_ID);
         when(mCarPropertyValue.getPropertyId()).thenReturn(PROPERTY_ID);
diff --git a/tests/src/com/android/systemui/car/keyguard/CarKeyguardViewControllerTest.java b/tests/src/com/android/systemui/car/keyguard/CarKeyguardViewControllerTest.java
index b32be387..ca7edcf9 100644
--- a/tests/src/com/android/systemui/car/keyguard/CarKeyguardViewControllerTest.java
+++ b/tests/src/com/android/systemui/car/keyguard/CarKeyguardViewControllerTest.java
@@ -43,7 +43,6 @@ import com.android.keyguard.ViewMediatorCallback;
 import com.android.keyguard.dagger.KeyguardBouncerComponent;
 import com.android.systemui.R;
 import com.android.systemui.SysuiTestCase;
-
 import com.android.systemui.bouncer.domain.interactor.BouncerMessageInteractor;
 import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerCallbackInteractor;
 import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor;
@@ -61,6 +60,7 @@ import com.android.systemui.settings.UserTracker;
 import com.android.systemui.statusbar.phone.BiometricUnlockController;
 import com.android.systemui.statusbar.policy.KeyguardStateController;
 import com.android.systemui.toast.ToastFactory;
+import com.android.systemui.user.domain.interactor.SelectedUserInteractor;
 import com.android.systemui.util.concurrency.FakeExecutor;
 import com.android.systemui.util.time.FakeSystemClock;
 
@@ -146,7 +146,8 @@ public class CarKeyguardViewControllerTest extends SysuiTestCase {
                 mock(KeyguardMessageAreaController.Factory.class),
                 mock(BouncerLogger.class),
                 fakeFeatureFlags,
-                mock(BouncerMessageInteractor.class)
+                mock(BouncerMessageInteractor.class),
+                mock(SelectedUserInteractor.class)
         );
         mCarKeyguardViewController.inflate((ViewGroup) LayoutInflater.from(mContext).inflate(
                 R.layout.sysui_overlay_window, /* root= */ null));
diff --git a/tests/src/com/android/systemui/car/qc/QCLogoutButtonTest.java b/tests/src/com/android/systemui/car/qc/QCLogoutButtonTest.java
index 1c701984..6ca4125f 100644
--- a/tests/src/com/android/systemui/car/qc/QCLogoutButtonTest.java
+++ b/tests/src/com/android/systemui/car/qc/QCLogoutButtonTest.java
@@ -129,11 +129,11 @@ public class QCLogoutButtonTest extends SysuiTestCase {
         AlertDialog alertDialog = mQCLogoutButton.createDialog();
         doReturn(alertDialog).when(mQCLogoutButton).createDialog();
         spyOn(alertDialog);
+        doNothing().when(alertDialog).show();
 
         mQCLogoutButton.getOnClickListener().onClick(mView);
 
         verify(alertDialog).show();
-        alertDialog.dismiss();
     }
 
     @Test
diff --git a/tests/src/com/android/systemui/car/statusicon/ui/SignalStatusIconControllerTest.java b/tests/src/com/android/systemui/car/statusicon/ui/SignalStatusIconControllerTest.java
index 97ba9eab..f468d168 100644
--- a/tests/src/com/android/systemui/car/statusicon/ui/SignalStatusIconControllerTest.java
+++ b/tests/src/com/android/systemui/car/statusicon/ui/SignalStatusIconControllerTest.java
@@ -79,6 +79,8 @@ public class SignalStatusIconControllerTest extends SysuiTestCase {
     @Test
     public void onUpdateStatus_wifiDisabled_hotspotDisabled_showsMobileDataIcon() {
         mSignalStatusIconController.setWifiIndicators(getWifiIndicator(/* enabled= */ false));
+        mSignalStatusIconController.setEthernetIndicators(
+                getEthernetIndicator(/* enabled= */  false));
         mSignalStatusIconController.onHotspotChanged(/* enabled= */ false, /* numDevices= */  0);
 
         // onUpdateStatus is called by the events above.
@@ -90,6 +92,8 @@ public class SignalStatusIconControllerTest extends SysuiTestCase {
     @Test
     public void onUpdateStatus_wifiEnabled_hotspotDisabled_showsWifiIcon() {
         mSignalStatusIconController.setWifiIndicators(getWifiIndicator(/* enabled= */ true));
+        mSignalStatusIconController.setEthernetIndicators(
+                getEthernetIndicator(/* enabled= */  false));
         mSignalStatusIconController.onHotspotChanged(/* enabled= */ false, /* numDevices= */  0);
 
         // onUpdateStatus is called by the events above.
@@ -102,6 +106,8 @@ public class SignalStatusIconControllerTest extends SysuiTestCase {
     public void onUpdateStatus_wifiDisabled_hotspotEnabled_showsHotspotIcon() {
         mSignalStatusIconController.setWifiIndicators(
                 getWifiIndicator(/* enabled= */ false));
+        mSignalStatusIconController.setEthernetIndicators(
+                getEthernetIndicator(/* enabled= */  false));
         mSignalStatusIconController.onHotspotChanged(/* enabled= */ true, /* numDevices= */  0);
 
         // onUpdateStatus is called by the events above.
@@ -114,6 +120,8 @@ public class SignalStatusIconControllerTest extends SysuiTestCase {
     public void onUpdateStatus_wifiEnabled_hotspotEnabled_showsHotspotIcon() {
         mSignalStatusIconController.setWifiIndicators(
                 getWifiIndicator(/* enabled= */ true));
+        mSignalStatusIconController.setEthernetIndicators(
+                getEthernetIndicator(/* enabled= */  false));
         mSignalStatusIconController.onHotspotChanged(/* enabled= */ true, /* numDevices= */  0);
 
         // onUpdateStatus is called by the events above.
@@ -122,8 +130,39 @@ public class SignalStatusIconControllerTest extends SysuiTestCase {
                 mSignalStatusIconController.getHotSpotIconDrawable());
     }
 
+    @Test
+    public void onUpdateStatus_wifiEnabled_hotspotEnabled_ethernetEnabled_showsHotspotIcon() {
+        mSignalStatusIconController.setWifiIndicators(
+                getWifiIndicator(/* enabled= */ true));
+        mSignalStatusIconController.setEthernetIndicators(
+                getEthernetIndicator(/* enabled= */ true));
+        mSignalStatusIconController.onHotspotChanged(/* enabled= */ true, /* numDevices= */  0);
+
+        // onUpdateStatus is called by the events above.
+
+        assertThat(mSignalStatusIconController.getIconDrawableToDisplay()).isEqualTo(
+                mSignalStatusIconController.getHotSpotIconDrawable());
+    }
+
+    @Test
+    public void onUpdateStatus_wifiEnabled_hotspotDisabled_ethernetEnabled_showsEthernetIcon() {
+        mSignalStatusIconController.setWifiIndicators(getWifiIndicator(/* enabled= */ true));
+        mSignalStatusIconController.setEthernetIndicators(
+                getEthernetIndicator(/* enabled= */ true));
+        mSignalStatusIconController.onHotspotChanged(/* enabled= */ false, /* numDevices= */  0);
+
+        // onUpdateStatus is called by the events above.
+
+        assertThat(mSignalStatusIconController.getIconDrawableToDisplay()).isEqualTo(
+                mSignalStatusIconController.getEthernetIconDrawable());
+    }
+
     private WifiIndicators getWifiIndicator(boolean enabled) {
         IconState iconState = new IconState(true, R.drawable.icon, "");
         return new WifiIndicators(enabled, iconState, null, false, false, "", false, "");
     }
+
+    private IconState getEthernetIndicator(boolean enabled) {
+        return new IconState(enabled, R.drawable.stat_sys_ethernet_fully, "");
+    }
 }
diff --git a/tests/src/com/android/systemui/car/systembar/CarSystemBarControllerTest.java b/tests/src/com/android/systemui/car/systembar/CarSystemBarControllerTest.java
index 561871ed..789a2ce8 100644
--- a/tests/src/com/android/systemui/car/systembar/CarSystemBarControllerTest.java
+++ b/tests/src/com/android/systemui/car/systembar/CarSystemBarControllerTest.java
@@ -257,6 +257,7 @@ public class CarSystemBarControllerTest extends SysuiTestCase {
 
     @Test
     public void testGetLeftWindow_leftDisabled_returnsNull() {
+        mTestableResources.addOverride(R.integer.config_showDisplayCompatToolbarOnSystemBar, 0);
         mTestableResources.addOverride(R.bool.config_enableLeftSystemBar, false);
         mCarSystemBar = createSystemBarController();
         ViewGroup window = mCarSystemBar.getLeftWindow();
@@ -265,6 +266,7 @@ public class CarSystemBarControllerTest extends SysuiTestCase {
 
     @Test
     public void testGetLeftWindow_leftEnabled_returnsWindow() {
+        mTestableResources.addOverride(R.integer.config_showDisplayCompatToolbarOnSystemBar, 0);
         mTestableResources.addOverride(R.bool.config_enableLeftSystemBar, true);
         mCarSystemBar = createSystemBarController();
 
@@ -275,6 +277,7 @@ public class CarSystemBarControllerTest extends SysuiTestCase {
 
     @Test
     public void testGetLeftWindow_leftEnabled_calledTwice_returnsSameWindow() {
+        mTestableResources.addOverride(R.integer.config_showDisplayCompatToolbarOnSystemBar, 0);
         mTestableResources.addOverride(R.bool.config_enableLeftSystemBar, true);
         mCarSystemBar = createSystemBarController();
 
@@ -361,6 +364,7 @@ public class CarSystemBarControllerTest extends SysuiTestCase {
 
     @Test
     public void testSetLeftWindowVisibility_setTrue_isVisible() {
+        mTestableResources.addOverride(R.integer.config_showDisplayCompatToolbarOnSystemBar, 0);
         mTestableResources.addOverride(R.bool.config_enableLeftSystemBar, true);
         mCarSystemBar = createSystemBarController();
 
@@ -372,6 +376,7 @@ public class CarSystemBarControllerTest extends SysuiTestCase {
 
     @Test
     public void testSetLeftWindowVisibility_setFalse_isGone() {
+        mTestableResources.addOverride(R.integer.config_showDisplayCompatToolbarOnSystemBar, 0);
         mTestableResources.addOverride(R.bool.config_enableLeftSystemBar, true);
         mCarSystemBar = createSystemBarController();
 
diff --git a/tests/src/com/android/systemui/car/systembar/CarSystemBarTest.java b/tests/src/com/android/systemui/car/systembar/CarSystemBarTest.java
index 805e28d6..a9f266f4 100644
--- a/tests/src/com/android/systemui/car/systembar/CarSystemBarTest.java
+++ b/tests/src/com/android/systemui/car/systembar/CarSystemBarTest.java
@@ -20,6 +20,11 @@ import static android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS;
 import static android.view.WindowInsetsController.APPEARANCE_OPAQUE_STATUS_BARS;
 import static android.view.WindowInsetsController.BEHAVIOR_DEFAULT;
 
+import static com.android.systemui.car.systembar.SystemBarConfigs.BOTTOM;
+import static com.android.systemui.car.systembar.SystemBarConfigs.LEFT;
+import static com.android.systemui.car.systembar.SystemBarConfigs.RIGHT;
+import static com.android.systemui.car.systembar.SystemBarConfigs.TOP;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.junit.Assume.assumeFalse;
@@ -129,6 +134,7 @@ public class CarSystemBarTest extends SysuiTestCase {
     private RegisterStatusBarResult mBarResult;
     private AppearanceRegion[] mAppearanceRegions;
     private FakeExecutor mUiBgExecutor;
+    private SystemBarConfigs mSystemBarConfigs;
 
     @Before
     public void setUp() {
@@ -171,13 +177,14 @@ public class CarSystemBarTest extends SysuiTestCase {
 
     private void initCarSystemBar() {
         FakeDisplayTracker displayTracker = new FakeDisplayTracker(mContext);
+        mSystemBarConfigs = new SystemBarConfigs(mTestableResources.getResources());
         mCarSystemBar = new CarSystemBar(mContext, mCarSystemBarController, mLightBarController,
                 mStatusBarIconController, mWindowManager, mDeviceProvisionedController,
                 new CommandQueue(mContext, displayTracker), mAutoHideController,
                 mButtonSelectionStateListener, mExecutor, mUiBgExecutor, mBarService,
                 () -> mKeyguardStateController, () -> mIconPolicy, mHvacController, mSignalPolicy,
-                new SystemBarConfigs(mTestableResources.getResources()),
-                mock(ConfigurationController.class), displayTracker, Optional.empty());
+                mSystemBarConfigs,
+                mock(ConfigurationController.class), displayTracker, Optional.empty(), null);
         mCarSystemBar.setSignalPolicy(mSignalPolicy);
     }
 
@@ -273,7 +280,7 @@ public class CarSystemBarTest extends SysuiTestCase {
 
         int randomDisplay = Display.DEFAULT_DISPLAY + 10;
         int insetTypes = 0;
-        mCarSystemBar.showTransient(randomDisplay, insetTypes);
+        mCarSystemBar.showTransient(randomDisplay, insetTypes, false);
 
         assertThat(mCarSystemBar.isStatusBarTransientShown()).isFalse();
     }
@@ -286,7 +293,7 @@ public class CarSystemBarTest extends SysuiTestCase {
         mCarSystemBar.start();
 
         int insetTypes = 0;
-        mCarSystemBar.showTransient(Display.DEFAULT_DISPLAY, insetTypes);
+        mCarSystemBar.showTransient(Display.DEFAULT_DISPLAY, insetTypes, false);
 
         assertThat(mCarSystemBar.isStatusBarTransientShown()).isFalse();
     }
@@ -299,7 +306,7 @@ public class CarSystemBarTest extends SysuiTestCase {
         mCarSystemBar.start();
 
         int insetTypes = WindowInsets.Type.statusBars();
-        mCarSystemBar.showTransient(Display.DEFAULT_DISPLAY, insetTypes);
+        mCarSystemBar.showTransient(Display.DEFAULT_DISPLAY, insetTypes, false);
 
         assertThat(mCarSystemBar.isStatusBarTransientShown()).isTrue();
     }
@@ -312,7 +319,7 @@ public class CarSystemBarTest extends SysuiTestCase {
         mCarSystemBar.start();
 
         int insetTypes = 0;
-        mCarSystemBar.showTransient(Display.DEFAULT_DISPLAY, insetTypes);
+        mCarSystemBar.showTransient(Display.DEFAULT_DISPLAY, insetTypes, false);
 
         assertThat(mCarSystemBar.isNavBarTransientShown()).isFalse();
     }
@@ -325,7 +332,7 @@ public class CarSystemBarTest extends SysuiTestCase {
         mCarSystemBar.start();
 
         int insetTypes = WindowInsets.Type.navigationBars();
-        mCarSystemBar.showTransient(Display.DEFAULT_DISPLAY, insetTypes);
+        mCarSystemBar.showTransient(Display.DEFAULT_DISPLAY, insetTypes, false);
 
         assertThat(mCarSystemBar.isNavBarTransientShown()).isTrue();
     }
@@ -336,8 +343,10 @@ public class CarSystemBarTest extends SysuiTestCase {
         mTestableResources.addOverride(R.bool.config_enableBottomSystemBar, true);
         when(mDeviceProvisionedController.isCurrentUserSetup()).thenReturn(true);
         mCarSystemBar.start();
-        mCarSystemBar.showTransient(Display.DEFAULT_DISPLAY,
-                WindowInsets.Type.statusBars() | WindowInsets.Type.navigationBars());
+        mCarSystemBar.showTransient(
+                Display.DEFAULT_DISPLAY,
+                WindowInsets.Type.statusBars() | WindowInsets.Type.navigationBars(),
+                false);
         assertThat(mCarSystemBar.isStatusBarTransientShown()).isTrue();
         assertThat(mCarSystemBar.isNavBarTransientShown()).isTrue();
 
@@ -356,8 +365,10 @@ public class CarSystemBarTest extends SysuiTestCase {
         mTestableResources.addOverride(R.bool.config_enableBottomSystemBar, true);
         when(mDeviceProvisionedController.isCurrentUserSetup()).thenReturn(true);
         mCarSystemBar.start();
-        mCarSystemBar.showTransient(Display.DEFAULT_DISPLAY,
-                WindowInsets.Type.statusBars() | WindowInsets.Type.navigationBars());
+        mCarSystemBar.showTransient(
+                Display.DEFAULT_DISPLAY,
+                WindowInsets.Type.statusBars() | WindowInsets.Type.navigationBars(),
+                false);
         assertThat(mCarSystemBar.isStatusBarTransientShown()).isTrue();
         assertThat(mCarSystemBar.isNavBarTransientShown()).isTrue();
 
@@ -375,8 +386,10 @@ public class CarSystemBarTest extends SysuiTestCase {
         mTestableResources.addOverride(R.bool.config_enableBottomSystemBar, true);
         when(mDeviceProvisionedController.isCurrentUserSetup()).thenReturn(true);
         mCarSystemBar.start();
-        mCarSystemBar.showTransient(Display.DEFAULT_DISPLAY,
-                WindowInsets.Type.statusBars() | WindowInsets.Type.navigationBars());
+        mCarSystemBar.showTransient(
+                Display.DEFAULT_DISPLAY,
+                WindowInsets.Type.statusBars() | WindowInsets.Type.navigationBars(),
+                false);
         assertThat(mCarSystemBar.isStatusBarTransientShown()).isTrue();
         assertThat(mCarSystemBar.isNavBarTransientShown()).isTrue();
 
@@ -394,8 +407,10 @@ public class CarSystemBarTest extends SysuiTestCase {
         mTestableResources.addOverride(R.bool.config_enableBottomSystemBar, true);
         when(mDeviceProvisionedController.isCurrentUserSetup()).thenReturn(true);
         mCarSystemBar.start();
-        mCarSystemBar.showTransient(Display.DEFAULT_DISPLAY,
-                WindowInsets.Type.statusBars() | WindowInsets.Type.navigationBars());
+        mCarSystemBar.showTransient(
+                Display.DEFAULT_DISPLAY,
+                WindowInsets.Type.statusBars() | WindowInsets.Type.navigationBars(),
+                false);
         assertThat(mCarSystemBar.isStatusBarTransientShown()).isTrue();
         assertThat(mCarSystemBar.isNavBarTransientShown()).isTrue();
 
@@ -478,6 +493,44 @@ public class CarSystemBarTest extends SysuiTestCase {
                 .callQuickControlsOnClickFromClassName(clsName);
     }
 
+    @Test
+    public void restartSystemBars_newSystemBarConfig_recreatesSystemBars() {
+        mTestableResources.addOverride(R.integer.config_showDisplayCompatToolbarOnSystemBar, 0);
+        mTestableResources.addOverride(R.bool.config_enableTopSystemBar, true);
+        mTestableResources.addOverride(R.bool.config_enableBottomSystemBar, true);
+        mTestableResources.addOverride(R.bool.config_enableLeftSystemBar, false);
+        mTestableResources.addOverride(R.bool.config_enableRightSystemBar, false);
+        when(mCarSystemBarController.getTopWindow()).thenReturn(mock(ViewGroup.class));
+        when(mCarSystemBarController.getBottomWindow()).thenReturn(mock(ViewGroup.class));
+        when(mCarSystemBarController.getLeftWindow()).thenReturn(null);
+        when(mCarSystemBarController.getRightWindow()).thenReturn(null);
+
+        initCarSystemBar();
+        mCarSystemBar.start();
+        assertThat(mCarSystemBar.getSystemBarWindowBySide(TOP)).isNotNull();
+        assertThat(mCarSystemBar.getSystemBarWindowBySide(BOTTOM)).isNotNull();
+        assertThat(mCarSystemBar.getSystemBarWindowBySide(LEFT)).isNull();
+        assertThat(mCarSystemBar.getSystemBarWindowBySide(RIGHT)).isNull();
+
+        mTestableResources.addOverride(R.bool.config_enableTopSystemBar, true);
+        mTestableResources.addOverride(R.bool.config_enableBottomSystemBar, false);
+        mTestableResources.addOverride(R.bool.config_enableLeftSystemBar, true);
+        mTestableResources.addOverride(R.bool.config_enableRightSystemBar, true);
+        mSystemBarConfigs = new SystemBarConfigs(mTestableResources.getResources());
+        when(mCarSystemBarController.getTopWindow()).thenReturn(mock(ViewGroup.class));
+        when(mCarSystemBarController.getBottomWindow()).thenReturn(null);
+        when(mCarSystemBarController.getLeftWindow()).thenReturn(mock(ViewGroup.class));
+        when(mCarSystemBarController.getRightWindow()).thenReturn(mock(ViewGroup.class));
+        mCarSystemBar.restartSystemBars();
+
+        verify(mCarSystemBarController, times(1)).removeAll();
+        verify(mCarSystemBarController, times(1)).resetSystemBarConfigs();
+        assertThat(mCarSystemBar.getSystemBarWindowBySide(TOP)).isNotNull();
+        assertThat(mCarSystemBar.getSystemBarWindowBySide(BOTTOM)).isNull();
+        assertThat(mCarSystemBar.getSystemBarWindowBySide(LEFT)).isNotNull();
+        assertThat(mCarSystemBar.getSystemBarWindowBySide(RIGHT)).isNotNull();
+    }
+
     private void waitForDelayableExecutor() {
         mExecutor.advanceClockToLast();
         mExecutor.runAllReady();
diff --git a/tests/src/com/android/systemui/car/window/OverlayPanelViewControllerTest.java b/tests/src/com/android/systemui/car/window/OverlayPanelViewControllerTest.java
index e3df0e4c..43713eb9 100644
--- a/tests/src/com/android/systemui/car/window/OverlayPanelViewControllerTest.java
+++ b/tests/src/com/android/systemui/car/window/OverlayPanelViewControllerTest.java
@@ -418,6 +418,7 @@ public class OverlayPanelViewControllerTest extends SysuiTestCase {
 
     @Test
     public void dragOpenTouchListener_isNotInflated_inflatesView() {
+        mOverlayPanelViewController.setShouldAnimateExpandPanel(true);
         when(mCarDeviceProvisionedController.isCurrentUserFullySetup()).thenReturn(true);
         assertThat(mOverlayPanelViewController.isInflated()).isFalse();
 
@@ -428,6 +429,19 @@ public class OverlayPanelViewControllerTest extends SysuiTestCase {
         verify(mOverlayViewGlobalStateController).inflateView(mOverlayPanelViewController);
     }
 
+    @Test
+    public void dragOpenTouchListener_shouldNotAnimate_notInflatesView() {
+        mOverlayPanelViewController.setShouldAnimateExpandPanel(false);
+        when(mCarDeviceProvisionedController.isCurrentUserFullySetup()).thenReturn(true);
+        assertThat(mOverlayPanelViewController.isInflated()).isFalse();
+
+        mOverlayPanelViewController.getDragOpenTouchListener().onTouch(/* v= */ null,
+                MotionEvent.obtain(/* downTime= */ 200, /* eventTime= */ 300,
+                        MotionEvent.ACTION_MOVE, /* x= */ 0, /* y= */ 0, /* metaState= */ 0));
+
+        verify(mOverlayViewGlobalStateController, never()).inflateView(mOverlayPanelViewController);
+    }
+
     private void mockPanelWithSize(int size) {
         mOverlayPanelViewController.getLayout().setLeftTopRightBottom(0, 0, size, size);
     }
diff --git a/tests/src/com/android/systemui/car/window/OverlayViewGlobalStateControllerTest.java b/tests/src/com/android/systemui/car/window/OverlayViewGlobalStateControllerTest.java
index 3568f776..660bfdae 100644
--- a/tests/src/com/android/systemui/car/window/OverlayViewGlobalStateControllerTest.java
+++ b/tests/src/com/android/systemui/car/window/OverlayViewGlobalStateControllerTest.java
@@ -24,6 +24,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -361,6 +362,21 @@ public class OverlayViewGlobalStateControllerTest extends SysuiTestCase {
     }
 
     @Test
+    public void showView_newHighestZOrder_setDimAmount() {
+        float oldDim = 0.1f;
+        float newDim = 0.5f;
+        setupOverlayViewController1();
+        when(mOverlayViewController1.getDefaultDimAmount()).thenReturn(oldDim);
+        setOverlayViewControllerAsShowing(mOverlayViewController1);
+        setupOverlayViewController2();
+        when(mOverlayViewController2.getDefaultDimAmount()).thenReturn(newDim);
+
+        mOverlayViewGlobalStateController.showView(mOverlayViewController2, mRunnable);
+
+        verify(mSystemUIOverlayWindowController).setDimBehind(newDim);
+    }
+
+    @Test
     public void showView_oldHighestZOrder() {
         setupOverlayViewController2();
         setOverlayViewControllerAsShowing(mOverlayViewController2);
@@ -485,6 +501,23 @@ public class OverlayViewGlobalStateControllerTest extends SysuiTestCase {
     }
 
     @Test
+    public void showView_oldHighestZOrder_setDimAmount() {
+        float oldDim = 0.1f;
+        float newDim = 0.5f;
+        setupOverlayViewController1();
+        when(mOverlayViewController1.getDefaultDimAmount()).thenReturn(oldDim);
+        setupOverlayViewController2();
+        when(mOverlayViewController2.getDefaultDimAmount()).thenReturn(newDim);
+
+        mOverlayViewGlobalStateController.showView(mOverlayViewController2, mRunnable);
+        mOverlayViewGlobalStateController.showView(mOverlayViewController1, mRunnable);
+
+        verify(mSystemUIOverlayWindowController, never()).setDimBehind(oldDim);
+        // called twice - once for when each view is shown
+        verify(mSystemUIOverlayWindowController, times(2)).setDimBehind(newDim);
+    }
+
+    @Test
     public void showView_somethingAlreadyShown_windowVisibleNotCalled() {
         setupOverlayViewController1();
         setOverlayViewControllerAsShowing(mOverlayViewController1);
@@ -1015,6 +1048,32 @@ public class OverlayViewGlobalStateControllerTest extends SysuiTestCase {
         verify(mSystemUIOverlayWindowController, never()).setFitInsetsTypes(insetTypesToFit);
     }
 
+    @Test
+    public void updateWindowDimBehind_highestZOrder_updatesDimAmount() {
+        float newDim = 0.5f;
+        setupOverlayViewController1();
+        setupOverlayViewController2();
+        setOverlayViewControllerAsShowing(mOverlayViewController1);
+        setOverlayViewControllerAsShowing(mOverlayViewController2);
+
+        mOverlayViewGlobalStateController.updateWindowDimBehind(mOverlayViewController2, newDim);
+
+        verify(mSystemUIOverlayWindowController).setDimBehind(newDim);
+    }
+
+    @Test
+    public void updateWindowDimBehind_notHighestZOrder_noDimAmountUpdate() {
+        float newDim = 0.5f;
+        setupOverlayViewController1();
+        setupOverlayViewController2();
+        setOverlayViewControllerAsShowing(mOverlayViewController1);
+        setOverlayViewControllerAsShowing(mOverlayViewController2);
+
+        mOverlayViewGlobalStateController.updateWindowDimBehind(mOverlayViewController1, newDim);
+
+        verify(mSystemUIOverlayWindowController, never()).setDimBehind(newDim);
+    }
+
     private void setupOverlayViewController1() {
         setupOverlayViewController(mOverlayViewController1, R.id.overlay_view_controller_stub_1,
                 R.id.overlay_view_controller_1);
author	Xin Li <delphij@google.com>	2024-01-17 22:14:18 -0800
committer	Xin Li <delphij@google.com>	2024-01-17 22:14:18 -0800
commit	9c1df7c5e05084db1ec6905b2f591e43aa71cc38 (patch)
tree	1b7f4d125385de806a0f0e3f7a65c3faa8bd2c37
parent	b23abcfd5fb50e8f1ef216f9242ce21c0244f347 (diff)
parent	fce271ecc889073fcae7a7352ad11c8273c00b99 (diff)
download	SystemUI-9c1df7c5e05084db1ec6905b2f591e43aa71cc38.tar.gz