diff --git a/arm64/proprietary/lib/libjni_latinimegoogle.so b/arm64/proprietary/lib/libjni_latinimegoogle.so
old mode 100755
new mode 100644
diff --git a/arm64/proprietary/lib64/libjni_latinimegoogle.so b/arm64/proprietary/lib64/libjni_latinimegoogle.so
old mode 100755
new mode 100644
diff --git a/common/Android.mk b/common/Android.mk
index 7769dd8..1bc6863 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -124,6 +124,18 @@ LOCAL_MODULE_SUFFIX := .apk
 LOCAL_PRIVILEGED_MODULE := true
 include $(BUILD_PREBUILT)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := HotwordEnrollment
+LOCAL_MODULE_OWNER := gapps
+LOCAL_SRC_FILES := proprietary/HotwordEnrollment/HotwordEnrollment.apk
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := APPS
+LOCAL_DEX_PREOPT := false
+LOCAL_MODULE_SUFFIX := .apk
+LOCAL_PRIVILEGED_MODULE := true
+include $(BUILD_PREBUILT)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := Phonesky
 LOCAL_MODULE_OWNER := gapps
diff --git a/common/common-vendor.mk b/common/common-vendor.mk
index bde7a67..bbb01ab 100644
--- a/common/common-vendor.mk
+++ b/common/common-vendor.mk
@@ -33,6 +33,7 @@ PRODUCT_PACKAGES += \
     GoogleOneTimeInitializer \
     GooglePartnerSetup \
     GoogleServicesFramework \
+    HotwordEnrollment \
     Phonesky \
     SetupWizard \
     com.google.android.maps \
diff --git a/common/proprietary/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk b/common/proprietary/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk
index 77de230..380e33e 100644
Binary files a/common/proprietary/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk and b/common/proprietary/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk differ
diff --git a/common/proprietary/app/GoogleExtShared/GoogleExtShared.apk b/common/proprietary/app/GoogleExtShared/GoogleExtShared.apk
index 4d28bb7..8a6779f 100644
Binary files a/common/proprietary/app/GoogleExtShared/GoogleExtShared.apk and b/common/proprietary/app/GoogleExtShared/GoogleExtShared.apk differ
diff --git a/common/proprietary/framework/com.google.android.maps.jar b/common/proprietary/framework/com.google.android.maps.jar
index 7b1aac7..4a4144d 100644
Binary files a/common/proprietary/framework/com.google.android.maps.jar and b/common/proprietary/framework/com.google.android.maps.jar differ
diff --git a/common/proprietary/framework/com.google.android.media.effects.jar b/common/proprietary/framework/com.google.android.media.effects.jar
index d4330ae..3d249e1 100644
Binary files a/common/proprietary/framework/com.google.android.media.effects.jar and b/common/proprietary/framework/com.google.android.media.effects.jar differ
diff --git a/common/proprietary/framework/com.google.widevine.software.drm.jar b/common/proprietary/framework/com.google.widevine.software.drm.jar
index 8880ee7..7ea6653 100644
Binary files a/common/proprietary/framework/com.google.widevine.software.drm.jar and b/common/proprietary/framework/com.google.widevine.software.drm.jar differ
diff --git a/common/proprietary/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk b/common/proprietary/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk
index e46464f..1cd6787 100644
Binary files a/common/proprietary/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk and b/common/proprietary/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk differ
diff --git a/common/proprietary/priv-app/GoogleExtServices/GoogleExtServices.apk b/common/proprietary/priv-app/GoogleExtServices/GoogleExtServices.apk
index fa3a82d..286784b 100644
Binary files a/common/proprietary/priv-app/GoogleExtServices/GoogleExtServices.apk and b/common/proprietary/priv-app/GoogleExtServices/GoogleExtServices.apk differ
diff --git a/common/proprietary/priv-app/GoogleFeedback/GoogleFeedback.apk b/common/proprietary/priv-app/GoogleFeedback/GoogleFeedback.apk
index a98e4ff..7deffbd 100644
Binary files a/common/proprietary/priv-app/GoogleFeedback/GoogleFeedback.apk and b/common/proprietary/priv-app/GoogleFeedback/GoogleFeedback.apk differ
diff --git a/common/proprietary/priv-app/GoogleLoginService/GoogleLoginService.apk b/common/proprietary/priv-app/GoogleLoginService/GoogleLoginService.apk
index e33ad59..3ad8ba8 100644
Binary files a/common/proprietary/priv-app/GoogleLoginService/GoogleLoginService.apk and b/common/proprietary/priv-app/GoogleLoginService/GoogleLoginService.apk differ
diff --git a/common/proprietary/priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk b/common/proprietary/priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk
index c6c5472..d796028 100644
Binary files a/common/proprietary/priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk and b/common/proprietary/priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk differ
diff --git a/common/proprietary/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk b/common/proprietary/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk
index d5f5037..244d2f1 100644
Binary files a/common/proprietary/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk and b/common/proprietary/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk differ
diff --git a/common/proprietary/priv-app/HotwordEnrollment/HotwordEnrollment.apk b/common/proprietary/priv-app/HotwordEnrollment/HotwordEnrollment.apk
new file mode 100644
index 0000000..a6e86a3
Binary files /dev/null and b/common/proprietary/priv-app/HotwordEnrollment/HotwordEnrollment.apk differ
diff --git a/common/proprietary/priv-app/Phonesky/Phonesky.apk b/common/proprietary/priv-app/Phonesky/Phonesky.apk
index 955bbb3..37c4ae1 100644
Binary files a/common/proprietary/priv-app/Phonesky/Phonesky.apk and b/common/proprietary/priv-app/Phonesky/Phonesky.apk differ
diff --git a/common/proprietary/priv-app/SetupWizard/SetupWizard.apk b/common/proprietary/priv-app/SetupWizard/SetupWizard.apk
index 37c90b9..75f467c 100644
Binary files a/common/proprietary/priv-app/SetupWizard/SetupWizard.apk and b/common/proprietary/priv-app/SetupWizard/SetupWizard.apk differ