diff --git a/FeatureFlags/Android.bp b/FeatureFlags/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..897aa19a37a2f8b0dc67a4183b92d2958071d56d
--- /dev/null
+++ b/FeatureFlags/Android.bp
@@ -0,0 +1,10 @@
+android_app_import {
+    name: "FeatureFlags",
+    certificate: "platform",
+    apk: "app-release.apk",
+    system_ext_specific: true,
+    optional_uses_libs: [
+      "androidx.window.extensions",
+      "androidx.window.sidecar",
+    ],
+}
diff --git a/FeatureFlags/app-release.apk b/FeatureFlags/app-release.apk
new file mode 100644
index 0000000000000000000000000000000000000000..a12a5899d354a563f324b5b15817c8e0249ffe68
--- /dev/null
+++ b/FeatureFlags/app-release.apk
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eea930717a33bde2eb7743ea8c62ff6b173a787795a55f821ee3bc6fac571182
+size 2197777
diff --git a/Passwords/Android.bp b/Passwords/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..3ad42a30828bfda21ff4e9fed74ead5192960a72
--- /dev/null
+++ b/Passwords/Android.bp
@@ -0,0 +1,10 @@
+android_app_import {
+    name: "Passwords",
+    certificate: "platform",
+    apk: "app-universal-release.apk",
+    system_ext_specific: true,
+    optional_uses_libs: [
+      "androidx.window.extensions",
+      "androidx.window.sidecar",
+    ],
+}
diff --git a/Passwords/app-universal-release.apk b/Passwords/app-universal-release.apk
new file mode 100644
index 0000000000000000000000000000000000000000..efb5b1707b1f32f68279b0df03f11258fb05d9fc
--- /dev/null
+++ b/Passwords/app-universal-release.apk
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3fa7f44ee0d2e6d0bbf5d4fb8e8f7caaa3b20588f3ae37cfd9fd3eab44f0f358
+size 10440848
diff --git a/config/common.mk b/config/common.mk
index e4b1ee502c4966be4e16e8bfd7f231e075d6d749..f608e1f587d8c6e2789870c3d78c036f538bb1a0 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -32,6 +32,7 @@ PRODUCT_PACKAGES += \
     eCalendar \
     eDrive \
     FakeStore \
+    FeatureFlags \
     FindMyDevice \
     GmsCore \
     GsfProxy \
@@ -39,6 +40,7 @@ PRODUCT_PACKAGES += \
     Notes \
     Ntfy \
     ParentalControl \
+    Passwords \
     PwaPlayer \
     SpeechToText \
     Talkback \