3 files changed, 15 insertions, 0 deletions
diff --git a/adservices/tests/cts/sandbox/fledge/AndroidTest.xml b/adservices/tests/cts/sandbox/fledge/AndroidTest.xml
index 12b4424e9c..5dedecd297 100644
--- a/adservices/tests/cts/sandbox/fledge/AndroidTest.xml
+++ b/adservices/tests/cts/sandbox/fledge/AndroidTest.xml
@@ -31,6 +31,11 @@
         <option name="package" value="com.android.tests.sandbox.fledge"/>
     </test>
 
+    <target_preparer class="com.android.tradefed.targetprep.DeviceSetup" >
+        <option name="force-skip-system-props" value="true" />
+        <option name="disable-device-config-sync" value="true" />
+    </target_preparer>
+
     <object type="module_controller"
             class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController" >
         <option name="mainline-module-package-name" value="com.google.android.adservices" />
diff --git a/adservices/tests/cts/sandbox/measurement/AndroidTest.xml b/adservices/tests/cts/sandbox/measurement/AndroidTest.xml
index 0d0c483d62..d6a48323d6 100644
--- a/adservices/tests/cts/sandbox/measurement/AndroidTest.xml
+++ b/adservices/tests/cts/sandbox/measurement/AndroidTest.xml
@@ -31,6 +31,11 @@
         <option name="package" value="com.android.tests.sandbox.measurement"/>
     </test>
 
+    <target_preparer class="com.android.tradefed.targetprep.DeviceSetup" >
+        <option name="force-skip-system-props" value="true" />
+        <option name="disable-device-config-sync" value="true" />
+    </target_preparer>
+
     <object type="module_controller"
             class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController" >
         <option name="mainline-module-package-name" value="com.google.android.adservices" />
diff --git a/adservices/tests/cts/sandbox/topics/AndroidTest.xml b/adservices/tests/cts/sandbox/topics/AndroidTest.xml
index 240224d585..368e5775a3 100644
--- a/adservices/tests/cts/sandbox/topics/AndroidTest.xml
+++ b/adservices/tests/cts/sandbox/topics/AndroidTest.xml
@@ -26,6 +26,11 @@
         <option name="test-file-name" value="CtsSandboxedTopicsManagerTests.apk"/>
     </target_preparer>
 
+    <target_preparer class="com.android.tradefed.targetprep.DeviceSetup" >
+        <option name="force-skip-system-props" value="true" />
+        <option name="disable-device-config-sync" value="true" />
+    </target_preparer>
+
     <test class="com.android.tradefed.testtype.AndroidJUnitTest">
         <option name="hidden-api-checks" value="false"/>
         <option name="package" value="com.android.tests.sandbox.topics"/>