diff --git a/server/cros/tradefed/generate_controlfiles_CTS_R.py b/server/cros/tradefed/generate_controlfiles_CTS_R.py
index f347a57..83fbf03 100755
--- a/server/cros/tradefed/generate_controlfiles_CTS_R.py
+++ b/server/cros/tradefed/generate_controlfiles_CTS_R.py
@@ -357,8 +357,10 @@
 
 CONFIG['EXTRA_COMMANDLINE'] = {
         'CtsCameraTestCases.NativeCameraDeviceTest': [
-                '--include-filter',
-                'CtsCameraTestCases android.hardware.camera2.cts.NativeCameraDeviceTest',
+                '--module',
+                'CtsCameraTestCases',
+                '--test',
+                'android.hardware.camera2.cts.NativeCameraDeviceTest',
         ],
         'CtsDeqpTestCases.dEQP-EGL': [
                 '--include-filter', 'CtsDeqpTestCases', '--module',
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.NativeCameraDeviceTest b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.NativeCameraDeviceTest
index 7476cc8..021502d 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.NativeCameraDeviceTest
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.NativeCameraDeviceTest
@@ -23,7 +23,7 @@
         max_retry=9,
         tag='11_r5.arm.CtsCameraTestCases.NativeCameraDeviceTest',
         test_name='cheets_CTS_R.11_r5.arm.CtsCameraTestCases.NativeCameraDeviceTest',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases android.hardware.camera2.cts.NativeCameraDeviceTest', '--logcat-on-failure'],
+        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--test', 'android.hardware.camera2.cts.NativeCameraDeviceTest', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsCameraTestCases',
         target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.NativeCameraDeviceTest b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.NativeCameraDeviceTest
index 1daa59c..18aa399 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.NativeCameraDeviceTest
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.NativeCameraDeviceTest
@@ -23,7 +23,7 @@
         max_retry=9,
         tag='11_r5.x86.CtsCameraTestCases.NativeCameraDeviceTest',
         test_name='cheets_CTS_R.11_r5.x86.CtsCameraTestCases.NativeCameraDeviceTest',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases android.hardware.camera2.cts.NativeCameraDeviceTest', '--logcat-on-failure'],
+        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--test', 'android.hardware.camera2.cts.NativeCameraDeviceTest', '--logcat-on-failure'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsCameraTestCases',
         target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.arm.CtsCameraTestCases.NativeCameraDeviceTest b/server/site_tests/cheets_CTS_R/control.arm.CtsCameraTestCases.NativeCameraDeviceTest
index 00e47f7..cc5e86d 100644
--- a/server/site_tests/cheets_CTS_R/control.arm.CtsCameraTestCases.NativeCameraDeviceTest
+++ b/server/site_tests/cheets_CTS_R/control.arm.CtsCameraTestCases.NativeCameraDeviceTest
@@ -23,7 +23,7 @@
         iterations=1,
         tag='arm.CtsCameraTestCases.NativeCameraDeviceTest',
         test_name='cheets_CTS_R.arm.CtsCameraTestCases.NativeCameraDeviceTest',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases android.hardware.camera2.cts.NativeCameraDeviceTest'],
+        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--test', 'android.hardware.camera2.cts.NativeCameraDeviceTest'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsCameraTestCases',
         target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.x86.CtsCameraTestCases.NativeCameraDeviceTest b/server/site_tests/cheets_CTS_R/control.x86.CtsCameraTestCases.NativeCameraDeviceTest
index 98f3208..acca638 100644
--- a/server/site_tests/cheets_CTS_R/control.x86.CtsCameraTestCases.NativeCameraDeviceTest
+++ b/server/site_tests/cheets_CTS_R/control.x86.CtsCameraTestCases.NativeCameraDeviceTest
@@ -23,7 +23,7 @@
         iterations=1,
         tag='x86.CtsCameraTestCases.NativeCameraDeviceTest',
         test_name='cheets_CTS_R.x86.CtsCameraTestCases.NativeCameraDeviceTest',
-        run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases android.hardware.camera2.cts.NativeCameraDeviceTest'],
+        run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--test', 'android.hardware.camera2.cts.NativeCameraDeviceTest'],
         retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
         target_module='CtsCameraTestCases',
         target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/subplans/waivers.xml b/server/site_tests/cheets_CTS_R/subplans/waivers.xml
index 97874f7..7905a94 100644
--- a/server/site_tests/cheets_CTS_R/subplans/waivers.xml
+++ b/server/site_tests/cheets_CTS_R/subplans/waivers.xml
@@ -8,6 +8,7 @@
   -->
   <Entry include="CtsAppSecurityHostTestCases android.appsecurity.cts.DocumentsTest#testRestrictStorageAccessFrameworkDisabled_notBlockFromTree" />
   <Entry include="CtsCameraTestCases android.hardware.camera2.cts.RecordingTest" />
+  <Entry include="CtsCameraTestCases[instant] android.hardware.camera2.cts.RecordingTest" />
   <Entry include="CtsDeqpTestCases dEQP-VK.api.external.memory.android_hardware_buffer.dedicated.host_visible#import_multiple_times" />
   <Entry include="CtsDeqpTestCases dEQP-VK.api.external.memory.android_hardware_buffer.dedicated.image#bind_export_import_bind" />
   <Entry include="CtsDeqpTestCases dEQP-VK.api.external.memory.android_hardware_buffer.dedicated.image#export_bind_import_bind" />