diff --git a/server/cros/tradefed/generate_controlfiles_CTS_P.py b/server/cros/tradefed/generate_controlfiles_CTS_P.py
index cabecaa..e4e1c6e 100755
--- a/server/cros/tradefed/generate_controlfiles_CTS_P.py
+++ b/server/cros/tradefed/generate_controlfiles_CTS_P.py
@@ -68,6 +68,7 @@
     'CtsActivityManagerDeviceTestCases': 2.0,
     'CtsAppSecurityHostTestCases':       2.0,
     'CtsAutoFillServiceTestCases':       2.5,  # TODO(b/134662826)
+    'CtsCameraTestCases':                2.0,  # TODO(b/150657700)
     'CtsDeqpTestCases':                 20.0,
     'CtsDeqpTestCases.dEQP-EGL'  :       2.0,
     'CtsDeqpTestCases.dEQP-GLES2':       2.0,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCamera b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCamera
index 403ce4f..c09d296 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCamera
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCamera
@@ -28,6 +28,6 @@
         target_plan=None,
         bundle='arm',
         uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
-        timeout=5400)
+        timeout=10800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCameraTestCases.camerabox.back b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCameraTestCases.camerabox.back
index 655e15a..ec038bc 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCameraTestCases.camerabox.back
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCameraTestCases.camerabox.back
@@ -30,6 +30,6 @@
         target_plan=None,
         bundle='arm',
         uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
-        timeout=3600)
+        timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCameraTestCases.camerabox.front b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCameraTestCases.camerabox.front
index 687da46..ad6e09f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCameraTestCases.camerabox.front
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsCameraTestCases.camerabox.front
@@ -30,6 +30,6 @@
         target_plan=None,
         bundle='arm',
         uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
-        timeout=3600)
+        timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
index 16e2596..2ddb08a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
@@ -32,6 +32,6 @@
         uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-arm.zip',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         prerequisites=['region_us', 'bluetooth'],
-        timeout=88200)
+        timeout=93600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCamera b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCamera
index 0abfa12..fa85618 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCamera
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCamera
@@ -28,6 +28,6 @@
         target_plan=None,
         bundle='x86',
         uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
-        timeout=5400)
+        timeout=10800)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCameraTestCases.camerabox.back b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCameraTestCases.camerabox.back
index 9264269..7007508 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCameraTestCases.camerabox.back
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCameraTestCases.camerabox.back
@@ -30,6 +30,6 @@
         target_plan=None,
         bundle='x86',
         uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
-        timeout=3600)
+        timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCameraTestCases.camerabox.front b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCameraTestCases.camerabox.front
index 3e495a2..7f33a21 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCameraTestCases.camerabox.front
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.CtsCameraTestCases.camerabox.front
@@ -30,6 +30,6 @@
         target_plan=None,
         bundle='x86',
         uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
-        timeout=3600)
+        timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
index 951679b..bab7886 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
@@ -32,6 +32,6 @@
         uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r11-linux_x86-x86.zip',
         login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
         prerequisites=['region_us', 'bluetooth'],
-        timeout=88200)
+        timeout=93600)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsCameraTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsCameraTestCases
index e92a5a2..b1e57aa 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsCameraTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsCameraTestCases
@@ -30,6 +30,6 @@
         bundle='arm',
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=7200)
 
 parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsCameraTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsCameraTestCases
index 9669e40..424a59d 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsCameraTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsCameraTestCases
@@ -30,6 +30,6 @@
         bundle='x86',
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=7200)
 
 parallel_simple(run_TS, machines)