diff --git a/CopyEfsTest/Android.bp b/CopyEfsTest/Android.bp
new file mode 100644
index 00000000..52c5de4e
--- /dev/null
+++ b/CopyEfsTest/Android.bp
@@ -0,0 +1,35 @@
+// Copyright (C) 2024 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package {
+    default_applicable_licenses: ["device_google_zuma_license"],
+}
+
+java_test_host {
+    name: "CopyEfsTest",
+    // Include all test java files
+    srcs: ["src/**/*.java"],
+    static_libs: [
+        "junit",
+        "platform-test-annotations",
+        "truth",
+    ],
+    libs: [
+        "tradefed",
+        "compatibility-host-util",
+        "compatibility-tradefed",
+    ],
+    test_suites: ["device-tests"],
+    test_config: "AndroidTest.xml",
+}
diff --git a/CopyEfsTest/AndroidTest.xml b/CopyEfsTest/AndroidTest.xml
new file mode 100644
index 00000000..398991f3
--- /dev/null
+++ b/CopyEfsTest/AndroidTest.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2024 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<configuration description="Runs 16K developer option test.">
+    <option name="test-suite-tag" value="apct"/>
+
+    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer">
+        <option name="force-root" value="true" />
+    </target_preparer>
+
+    <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
+        <option name="jar" value="CopyEfsTest.jar" />
+    </test>
+
+    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+        <!-- Unlock screen -->
+        <option name="run-command" value="input keyevent KEYCODE_WAKEUP" />
+        <!-- Dismiss keyguard, in case it's set as "Swipe to unlock" -->
+        <option name="run-command" value="wm dismiss-keyguard" />
+        <!-- Collapse notifications -->
+        <option name="run-command" value="cmd statusbar collapse" />
+        <!-- dismiss all system dialogs before launch test -->
+        <option name="run-command" value="am broadcast -a android.intent.action.CLOSE_SYSTEM_DIALOGS" />
+    </target_preparer>
+
+</configuration>
diff --git a/CopyEfsTest/TEST_MAPPING b/CopyEfsTest/TEST_MAPPING
new file mode 100644
index 00000000..37a720b5
--- /dev/null
+++ b/CopyEfsTest/TEST_MAPPING
@@ -0,0 +1,8 @@
+{
+  "postsubmit": [
+    {
+      "name": "CopyEfsTest"
+    }
+  ]
+}
+
diff --git a/CopyEfsTest/src/com/android/test/CopyEfsTest.java b/CopyEfsTest/src/com/android/test/CopyEfsTest.java
new file mode 100644
index 00000000..b00ef2fc
--- /dev/null
+++ b/CopyEfsTest/src/com/android/test/CopyEfsTest.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+
+import android.platform.test.annotations.AppModeFull;
+
+import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
+import com.android.tradefed.testtype.junit4.DeviceTestRunOptions;
+import com.android.tradefed.util.RunUtil;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.BufferedReader;
+import java.io.StringReader;
+
+@RunWith(DeviceJUnit4ClassRunner.class)
+public class CopyEfsTest extends BaseHostJUnit4Test {
+
+
+
+
+    @Test
+    @AppModeFull
+    public void copyEfsTest() throws Exception {
+
+        getDevice().enableAdbRoot();
+
+        // This test can be run on OEM unlocked device only as unlocking bootloader requires
+        // manual intervention.
+        String result = getDevice().getProperty("ro.boot.flash.locked");
+        assumeTrue("0".equals(result));
+        final String dataFstype = getFsTypeFor("/data");
+        assertTrue(!dataFstype.isEmpty());
+        if (!dataFstype.equals("ext4")) {
+            getDevice().executeShellCommand("cmd recovery wipe ext4");
+            RunUtil.getDefault().sleep(10000);
+            // Wait for 2 mins device to be online againg
+            getDevice().waitForDeviceOnline(120000);
+            getDevice().enableAdbRoot();
+        }
+        assertEquals("ext4", getFsTypeFor("/data"));
+        String dataBlockDev = getBlockDevFor("/data");
+        assertEquals(dataBlockDev, getBlockDevFor("/mnt/vendor/efs"));
+        assertEquals(dataBlockDev, getBlockDevFor("/mnt/vendor/efs_backup"));
+        assertEquals(dataBlockDev, getBlockDevFor("/mnt/vendor/modem_userdata"));
+    }
+
+    private String[] getMountInfo(String mountPoint) throws Exception {
+        String result = getDevice().executeShellCommand("cat /proc/mounts");
+        BufferedReader br = new BufferedReader(new StringReader(result));
+        String line;
+        while ((line = br.readLine()) != null) {
+            final String[] fields = line.split(" ");
+            final String device = fields[0];
+            final String partition = fields[1];
+            final String fsType = fields[2];
+            if (partition.equals(mountPoint)) {
+                return fields;
+            }
+        }
+        return null;
+    }
+    private String getFsTypeFor(String mountPoint) throws Exception {
+        String[] result = getMountInfo(mountPoint);
+        if (result == null) {
+            return "";
+        }
+        return result[2];
+    }
+    private String getBlockDevFor(String mountPoint) throws Exception {
+        String[] result = getMountInfo(mountPoint);
+        if (result == null) {
+            return "";
+        }
+        return result[0];
+    }
+}