diff --git a/Aerodactyl-vendor.mk b/Aerodactyl-vendor.mk
index 5960636..11eb13b 100644
--- a/Aerodactyl-vendor.mk
+++ b/Aerodactyl-vendor.mk
@@ -10,6 +10,7 @@ PRODUCT_COPY_FILES += \
     vendor/nothing/Aerodactyl/proprietary/system/etc/public.libraries-mtk.txt:$(TARGET_COPY_OUT_SYSTEM)/etc/public.libraries-mtk.txt \
     vendor/nothing/Aerodactyl/proprietary/system/etc/sysconfig/preinstalled-packages-audioeffect.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/preinstalled-packages-audioeffect.xml \
     vendor/nothing/Aerodactyl/proprietary/system_ext/etc/init/init.vtservice.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/init.vtservice.rc \
+    vendor/nothing/Aerodactyl/proprietary/system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.android.hotwordenrollment.common.util.xml \
     vendor/nothing/Aerodactyl/proprietary/system_ext/etc/sysconfig/com.mediatek.ims.config.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/sysconfig/com.mediatek.ims.config.xml \
     vendor/nothing/Aerodactyl/proprietary/vendor/bin/crossbuild/DataSet/SQLiteModule/db/ae/mt6886/ParameterDB_ae.db:$(TARGET_COPY_OUT_VENDOR)/bin/crossbuild/DataSet/SQLiteModule/db/ae/mt6886/ParameterDB_ae.db \
     vendor/nothing/Aerodactyl/proprietary/vendor/bin/crossbuild/DataSet/SQLiteModule/db/af/mt6886/ParameterDB_af.db:$(TARGET_COPY_OUT_VENDOR)/bin/crossbuild/DataSet/SQLiteModule/db/af/mt6886/ParameterDB_af.db \
@@ -1151,8 +1152,11 @@ PRODUCT_PACKAGES += \
     MobileFeliCaMenuMainApp \
     MobileFeliCaSettingApp \
     MobileFeliCaWebPluginBoot \
+    HotwordEnrollmentOKGoogleHEXAGON \
+    HotwordEnrollmentXGoogleHEXAGON \
     ImsService \
     MtkGbaService \
+    com.android.hotwordenrollment.common.util \
     mediatek-ims-base \
     mediatek-ims-common \
     mediatek-ims-extension-plugin \
diff --git a/Android.bp b/Android.bp
index 15e317b..77f0e9d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -24018,6 +24018,30 @@ android_app_import {
     product_specific: true,
 }
 
+android_app_import {
+    name: "HotwordEnrollmentOKGoogleHEXAGON",
+    owner: "nothing",
+    apk: "proprietary/product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk",
+    certificate: "platform",
+    dex_preopt: {
+        enabled: false,
+    },
+    privileged: true,
+    product_specific: true,
+}
+
+android_app_import {
+    name: "HotwordEnrollmentXGoogleHEXAGON",
+    owner: "nothing",
+    apk: "proprietary/product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk",
+    certificate: "platform",
+    dex_preopt: {
+        enabled: false,
+    },
+    privileged: true,
+    product_specific: true,
+}
+
 android_app_import {
     name: "ImsService",
     owner: "nothing",
@@ -24042,6 +24066,15 @@ android_app_import {
     system_ext_specific: true,
 }
 
+dex_import {
+    name: "com.android.hotwordenrollment.common.util",
+    owner: "nothing",
+    jars: [
+        "proprietary/system_ext/framework/com.android.hotwordenrollment.common.util.jar",
+    ],
+    system_ext_specific: true,
+}
+
 dex_import {
     name: "mediatek-ims-base",
     owner: "nothing",
diff --git a/proprietary/product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk b/proprietary/product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk
new file mode 100644
index 0000000..7e45da0
Binary files /dev/null and b/proprietary/product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk differ
diff --git a/proprietary/product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk b/proprietary/product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk
new file mode 100644
index 0000000..73bb993
Binary files /dev/null and b/proprietary/product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk differ
diff --git a/proprietary/system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml b/proprietary/system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml
new file mode 100644
index 0000000..91a8eec
--- /dev/null
+++ b/proprietary/system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+<permissions>
+    <library
+        name="com.android.hotwordenrollment.common.util"
+        file="/system_ext/framework/com.android.hotwordenrollment.common.util.jar"
+    />
+</permissions>
diff --git a/proprietary/system_ext/framework/com.android.hotwordenrollment.common.util.jar b/proprietary/system_ext/framework/com.android.hotwordenrollment.common.util.jar
new file mode 100644
index 0000000..788e317
Binary files /dev/null and b/proprietary/system_ext/framework/com.android.hotwordenrollment.common.util.jar differ