diff --git a/apps/Android.bp b/apps/Android.bp
index 18ae755..4bc9645 100644
--- a/apps/Android.bp
+++ b/apps/Android.bp
@@ -11,9 +11,10 @@ android_app_import {
 }
 
 android_app_import {
-        name: "PixelThemesStub",
+        name: "GoogleCameraLegacy",
         owner: "google",
-        apk: "apks/PixelThemesStub.apk",
+        apk: "apks/GoogleCameraLegacy.apk",
+        overrides: ["Camera2", "Snap"],
         presigned: true,
         dex_preopt: {
                 enabled: false,
diff --git a/apps/GoogleApps.mk b/apps/GoogleApps.mk
index 28e58d3..3045c3e 100644
--- a/apps/GoogleApps.mk
+++ b/apps/GoogleApps.mk
@@ -1,23 +1,28 @@
 ## Build appropriate year wallpaper package on Pixels
 ifneq ($(filter $(PIXEL2016_CODENAMES),$(TARGET_PRODUCT)),)
 PRODUCT_PACKAGES += \
-    NexusWallpapersStubPrebuilt
+    NexusWallpapersStubPrebuilt \
+    GoogleCameraLegacy
 endif
 ifneq ($(filter $(PIXEL2017_CODENAMES),$(TARGET_PRODUCT)),)
 PRODUCT_PACKAGES += \
-    NexusWallpapersStubPrebuilt2017
+    NexusWallpapersStubPrebuilt2017 \
+    GoogleCameraLegacy
 endif
 ifneq ($(filter $(PIXEL2018_CODENAMES) $(PIXEL2019_MIDYEAR_CODENAMES),$(TARGET_PRODUCT)),)
 PRODUCT_PACKAGES += \
-    NexusWallpapersStubPrebuilt2018
+    NexusWallpapersStubPrebuilt2018 \
+    GoogleCamera
 endif
 ifneq ($(filter $(PIXEL2019_CODENAMES),$(TARGET_PRODUCT)),)
 PRODUCT_PACKAGES += \
-    NexusWallpapersStubPrebuilt2019
+    NexusWallpapersStubPrebuilt2019 \
+    GoogleCamera
 endif
 ifneq ($(filter $(PIXEL2020_CODENAMES),$(TARGET_PRODUCT)),)
 PRODUCT_PACKAGES += \
-    PixelWallpapers2020
+    PixelWallpapers2020 \
+    GoogleCamera
 endif
 
 ## Only build DevicePersonalizationServices on non-Pixels
diff --git a/apps/apks/GoogleCamera.apk b/apps/apks/GoogleCamera.apk
index 8de3dfd..c1a32b5 100644
Binary files a/apps/apks/GoogleCamera.apk and b/apps/apks/GoogleCamera.apk differ
diff --git a/apps/apks/GoogleCameraLegacy.apk b/apps/apks/GoogleCameraLegacy.apk
new file mode 100644
index 0000000..c1a32b5
Binary files /dev/null and b/apps/apks/GoogleCameraLegacy.apk differ