diff --git a/GoogleCameraGo/Android.mk b/GoogleCameraGo/Android.mk
new file mode 100644
index 0000000..61599dd
--- /dev/null
+++ b/GoogleCameraGo/Android.mk
@@ -0,0 +1,13 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := GoogleCameraGo
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := GoogleCameraGo.apk
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_CLASS := APPS
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+LOCAL_OVERRIDES_PACKAGES := Snap Camera2
+LOCAL_DEX_PREOPT := false
+LOCAL_PRODUCT_MODULE := true
+include $(BUILD_PREBUILT)
diff --git a/GoogleCameraGo/GoogleCameraGo.apk b/GoogleCameraGo/GoogleCameraGo.apk
new file mode 100644
index 0000000..646bb40
Binary files /dev/null and b/GoogleCameraGo/GoogleCameraGo.apk differ
diff --git a/common.mk b/common.mk
index 3c68c18..22f1d4f 100644
--- a/common.mk
+++ b/common.mk
@@ -105,7 +105,7 @@ TARGET_SCREEN_WIDTH := 1080
 # Camera
 PRODUCT_PACKAGES += \
     libgui_vendor \
-    Snap
+    GoogleCameraGo
 
 PRODUCT_PACKAGES += \
     android.hardware.camera.provider@2.4-impl \
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 25ba2b9..38d1e46 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1413,6 +1413,7 @@ system_ext/lib/libmmrtpdecoder.so
 system_ext/lib/libmmrtpencoder.so
 system_ext/lib/libwfdaac.so
 system_ext/lib/libwfdavenhancements.so
+system_ext/lib/libwfdclient.so
 system_ext/lib/libwfdcommonutils.so
 system_ext/lib/libwfdconfigutils.so
 system_ext/lib/libwfddisplayconfig.so|f820d710151f2128422cd759891ff466b101844c
@@ -1448,6 +1449,7 @@ system_ext/lib64/libwfduibcsink.so
 system_ext/lib64/libwfduibcsinkinterface.so
 system_ext/lib64/libwfduibcsrc.so
 system_ext/lib64/libwfduibcsrcinterface.so
+system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so
 -system_ext/priv-app/WfdService/WfdService.apk
 vendor/bin/wfdhdcphalservice
 vendor/bin/wfdvndservice