diff --git a/FindMyDevice/Android.bp b/FindMyDevice/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..c2947335a9c234ec75c0342d1eeaa853eb80bc3e
--- /dev/null
+++ b/FindMyDevice/Android.bp
@@ -0,0 +1,7 @@
+android_app_import {
+    name: "FindMyDevice",
+    system_ext_specific: true,
+    certificate: "platform",
+    apk: "app-release.apk",
+}
+
diff --git a/FindMyDevice/app-release.apk b/FindMyDevice/app-release.apk
new file mode 100644
index 0000000000000000000000000000000000000000..973509164df95aa11bc4f3778367e77d7573d46a
--- /dev/null
+++ b/FindMyDevice/app-release.apk
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:94a6eb40e879e62206983c1f4f0d62e98946208702f81115d44bde6ecca796fd
+size 32628584
diff --git a/ParentalControl/app-release.apk b/ParentalControl/app-release.apk
index 459a5e1df4961849aa97ea54ee1a7cbf94b6a071..cb897b82c551245aa9a8b58faa8a2263a6fde5b5 100644
--- a/ParentalControl/app-release.apk
+++ b/ParentalControl/app-release.apk
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cee45f78d09b05465dfedae003894def4b42932bf2a924564e1441c37cf62195
-size 3582650
+oid sha256:71c1b6162561b36957dc171ac06541bdbebdda34e5efc439547eaa9752f9afae
+size 27331706
diff --git a/config/common.mk b/config/common.mk
index 2acd178f39db4834ef0c362a8255f0b6c04d4051..21260e03264e07ef301f5b6403bf4cd47cb4290c 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -26,6 +26,7 @@ PRODUCT_PACKAGES += \
     eCalendar \
     eDrive \
     FakeStore \
+    FindMyDevice \
     GmsCore \
     GsfProxy \
     Mail \