diff --git a/common/Android.bp b/common/Android.bp
index 632ed6b1..d72a1b30 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -890,6 +890,20 @@ android_app_import {
 	system_ext_specific: true,
 }
 
+android_app_import {
+	name: "AvatarPickerGoogle",
+	owner: "gms",
+	apk: "proprietary/system_ext/priv-app/AvatarPickerGoogle/AvatarPickerGoogle.apk",
+	overrides: ["AvatarPicker"],
+	preprocessed: true,
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	system_ext_specific: true,
+}
+
 android_app_import {
 	name: "GoogleFeedback",
 	owner: "gms",
diff --git a/common/common-vendor.mk b/common/common-vendor.mk
index 5108eebe..c458ef0c 100644
--- a/common/common-vendor.mk
+++ b/common/common-vendor.mk
@@ -192,7 +192,8 @@ PRODUCT_COPY_FILES += \
     vendor/gms/common/proprietary/product/usr/srec/en-US/voice_match/MARBLE_speakerid.tflite:$(TARGET_COPY_OUT_PRODUCT)/usr/srec/en-US/voice_match/MARBLE_speakerid.tflite \
     vendor/gms/common/proprietary/product/usr/srec/en-US/voice_match/MARBLE_voice_filter.tflite:$(TARGET_COPY_OUT_PRODUCT)/usr/srec/en-US/voice_match/MARBLE_voice_filter.tflite \
     vendor/gms/common/proprietary/system/etc/permissions/privapp-permissions-google.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-google.xml \
-    vendor/gms/common/proprietary/system_ext/etc/permissions/privapp-permissions-google-se.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/privapp-permissions-google-se.xml
+    vendor/gms/common/proprietary/system_ext/etc/permissions/privapp-permissions-google-se.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/privapp-permissions-google-se.xml \
+    vendor/gms/common/proprietary/system_ext/etc/sysconfig/preinstalled-packages-com.android.google.avatarpicker.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/sysconfig/preinstalled-packages-com.android.google.avatarpicker.xml
 
 PRODUCT_PACKAGES += \
     GoogleExtShared \
@@ -264,6 +265,7 @@ PRODUCT_PACKAGES += \
     AccessibilityMenu \
     EmergencyInfoGoogleNoUi \
     Flipendo \
+    AvatarPickerGoogle \
     GoogleFeedback \
     GoogleServicesFramework \
     SetupWizardPixelPrebuilt \
diff --git a/common/proprietary/system_ext/etc/sysconfig/preinstalled-packages-com.android.google.avatarpicker.xml b/common/proprietary/system_ext/etc/sysconfig/preinstalled-packages-com.android.google.avatarpicker.xml
new file mode 100644
index 00000000..e84efc43
--- /dev/null
+++ b/common/proprietary/system_ext/etc/sysconfig/preinstalled-packages-com.android.google.avatarpicker.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+/**
+ * Copyright (C) 2024 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<config>
+    <install-in-user-type package="com.google.android.avatarpicker">
+        <install-in user-type="FULL"/>
+    </install-in-user-type>
+</config>
diff --git a/common/proprietary/system_ext/priv-app/AvatarPickerGoogle/AvatarPickerGoogle.apk b/common/proprietary/system_ext/priv-app/AvatarPickerGoogle/AvatarPickerGoogle.apk
new file mode 100644
index 00000000..2d4012e5
Binary files /dev/null and b/common/proprietary/system_ext/priv-app/AvatarPickerGoogle/AvatarPickerGoogle.apk differ
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 3510430e..114c1d1e 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -88,6 +88,9 @@ product/media/audio/ui/camera_focus.ogg
 product/media/audio/ui/reverse_charging_end.ogg
 product/media/audio/ui/reverse_charging_start.ogg
 
+# Avatar Picker
+system_ext/priv-app/AvatarPickerGoogle/AvatarPickerGoogle.apk;OVERRIDES=AvatarPicker;PRESIGNED
+
 # Browser
 product/app/Chrome-Stub/Chrome-Stub.apk;OVERRIDES=webview,Browser2,Jelly;PRESIGNED
 product/app/Chrome/Chrome.apk.gz
@@ -283,6 +286,7 @@ product/etc/permissions/split-permissions-google.xml
 product/etc/permissions/privapp-permissions-google-pearl.xml
 system/etc/permissions/privapp-permissions-google.xml
 system_ext/etc/permissions/privapp-permissions-google-se.xml
+system_ext/etc/sysconfig/preinstalled-packages-com.android.google.avatarpicker.xml
 
 # Phone
 product/app/GoogleContacts/GoogleContacts.apk;OVERRIDES=Contacts,Contacts2;PRESIGNED