commit ba975f9d067a051a7db77d0e59def5f7fc5ce0ad
author Kazuhiro Inaba <kinaba@google.com> Fri Jan 10 13:25:44 2020 +0900
committer Commit Bot <commit-bot@chromium.org> Fri Jan 10 13:27:48 2020 +0000
tree 7105a0d205b44f11c688a40b7c29a000476d2a8d
parent 1eec67beba104cdf53732b541c867105968379d6

cheets_GTS(_N): Shorter timeouts.

Almost all the modules run within 5 minutes except the ones that involves media.
Inheriting the default 1h timelimit for CTS is not very effective.

BUG=b:147458507
TEST=cheets_GTS.7.0_r3.GtsContacts

Change-Id: I7380a85f9d23d3127c1615d05cdd314d48dbcf82
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/1994845
Tested-by: Kazuhiro Inaba <kinaba@chromium.org>
Auto-Submit: Kazuhiro Inaba <kinaba@chromium.org>
Reviewed-by: Yoshiki Iguchi <yoshiki@chromium.org>
Commit-Queue: Kazuhiro Inaba <kinaba@chromium.org>

server/cros/tradefed/generate_controlfiles_CTS_Instant.py

diff --git a/server/cros/tradefed/generate_controlfiles_CTS_Instant.py b/server/cros/tradefed/generate_controlfiles_CTS_Instant.py
index 52eec8c..631d4c1 100755
--- a/server/cros/tradefed/generate_controlfiles_CTS_Instant.py
+++ b/server/cros/tradefed/generate_controlfiles_CTS_Instant.py
@@ -61,6 +61,7 @@
 
 # TODO(ihf): Update timeouts once P is more stable.
 # Timeout in hours.
+CONFIG['CTS_TIMEOUT_DEFAULT'] = 1.0
 CONFIG['CTS_TIMEOUT'] = {
     _ALL: 5.0,
     _COLLECT: 2.0,

server/cros/tradefed/generate_controlfiles_CTS_N.py

diff --git a/server/cros/tradefed/generate_controlfiles_CTS_N.py b/server/cros/tradefed/generate_controlfiles_CTS_N.py
index 0c454a5..4bf1be5 100755
--- a/server/cros/tradefed/generate_controlfiles_CTS_N.py
+++ b/server/cros/tradefed/generate_controlfiles_CTS_N.py
@@ -66,6 +66,7 @@
 # Times guessed by looking for times > 20m in
 # grep runtime-hint android-cts/testcases/*.config
 # Timeout in hours.
+CONFIG['CTS_TIMEOUT_DEFAULT'] = 1.0
 CONFIG['CTS_TIMEOUT'] = {
     'CtsAppSecurityHostTestCases':      1.5,
     'CtsDeqpTestCases':                 12.0,

server/cros/tradefed/generate_controlfiles_CTS_P.py

diff --git a/server/cros/tradefed/generate_controlfiles_CTS_P.py b/server/cros/tradefed/generate_controlfiles_CTS_P.py
index f4efcdb..a8d4b72 100755
--- a/server/cros/tradefed/generate_controlfiles_CTS_P.py
+++ b/server/cros/tradefed/generate_controlfiles_CTS_P.py
@@ -62,6 +62,7 @@
 }
 
 # Timeout in hours.
+CONFIG['CTS_TIMEOUT_DEFAULT'] = 1.0
 CONFIG['CTS_TIMEOUT'] = {
     'CtsActivityManagerDeviceTestCases': 1.5,
     'CtsAppSecurityHostTestCases':       2.0,

server/cros/tradefed/generate_controlfiles_CTS_Q.py

diff --git a/server/cros/tradefed/generate_controlfiles_CTS_Q.py b/server/cros/tradefed/generate_controlfiles_CTS_Q.py
index e7f7032..6012c88 100755
--- a/server/cros/tradefed/generate_controlfiles_CTS_Q.py
+++ b/server/cros/tradefed/generate_controlfiles_CTS_Q.py
@@ -57,6 +57,7 @@
 }
 
 # Timeout in hours.
+CONFIG['CTS_TIMEOUT_DEFAULT'] = 1.0
 CONFIG['CTS_TIMEOUT'] = {
     'CtsAutoFillServiceTestCases':       2.5,  # TODO(b/134662826)
     'CtsDeqpTestCases':                 30.0,

server/cros/tradefed/generate_controlfiles_GTS.py

diff --git a/server/cros/tradefed/generate_controlfiles_GTS.py b/server/cros/tradefed/generate_controlfiles_GTS.py
index 3aab46a..bb1e422 100755
--- a/server/cros/tradefed/generate_controlfiles_GTS.py
+++ b/server/cros/tradefed/generate_controlfiles_GTS.py
@@ -45,13 +45,14 @@
 CONFIG['CTS_QUAL_RETRIES'] = 9
 CONFIG['CTS_MAX_RETRIES'] = {}
 
-# TODO(ihf): Update timeouts once P is more stable.
 # Timeout in hours.
 # Modules that run very long are encoded here.
+CONFIG['CTS_TIMEOUT_DEFAULT'] = 0.2
 CONFIG['CTS_TIMEOUT'] = {
     'GtsExoPlayerTestCases': 1.5,
-    'GtsMediaTestCases': 8,
-    'GtsOsTestCases': 0.25,
+    'GtsGmscoreHostTestCases': 1.0,
+    'GtsMediaTestCases': 4,
+    'GtsYouTubeTestCases': 1.0,
     _ALL: 24,
     _COLLECT: 0.5,
     _PUBLIC_COLLECT: 0.5,

server/cros/tradefed/generate_controlfiles_GTS_N.py

diff --git a/server/cros/tradefed/generate_controlfiles_GTS_N.py b/server/cros/tradefed/generate_controlfiles_GTS_N.py
index 940da41..526d5ab 100755
--- a/server/cros/tradefed/generate_controlfiles_GTS_N.py
+++ b/server/cros/tradefed/generate_controlfiles_GTS_N.py
@@ -45,13 +45,14 @@
 CONFIG['CTS_QUAL_RETRIES'] = 9
 CONFIG['CTS_MAX_RETRIES'] = {}
 
-# TODO(ihf): Update timeouts once P is more stable.
 # Timeout in hours.
 # Modules that run very long are encoded here.
+CONFIG['CTS_TIMEOUT_DEFAULT'] = 0.2
 CONFIG['CTS_TIMEOUT'] = {
     'GtsExoPlayerTestCases': 1.5,
-    'GtsMediaTestCases': 8,
-    'GtsOsTestCases': 0.25,
+    'GtsGmscoreHostTestCases': 1.0,
+    'GtsMediaTestCases': 4,
+    'GtsYouTubeTestCases': 1.0,
     _ALL: 24,
     _COLLECT: 0.5,
     _PUBLIC_COLLECT: 0.5,

server/cros/tradefed/generate_controlfiles_common.py

diff --git a/server/cros/tradefed/generate_controlfiles_common.py b/server/cros/tradefed/generate_controlfiles_common.py
index dcae5f3..4252d16 100755
--- a/server/cros/tradefed/generate_controlfiles_common.py
+++ b/server/cros/tradefed/generate_controlfiles_common.py
@@ -654,7 +654,8 @@
 
     timeout = 0
     # First module gets 1h (standard), all other half hour extra (heuristic).
-    delta = 3600
+    default_timeout = int(3600 * CONFIG['CTS_TIMEOUT_DEFAULT'])
+    delta = default_timeout
     for module in modules:
         if module in CONFIG['CTS_TIMEOUT']:
             # Modules that run very long are encoded here.
@@ -668,7 +669,7 @@
             timeout += 300
         else:
             timeout += delta
-            delta = 1800
+            delta = default_timeout // 2
     return timeout
 
 

server/site_tests/cheets_GTS/control.7.0_r3.CtsCheckpointTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.CtsCheckpointTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.CtsCheckpointTestCases
index 6a0828b..567ec28 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.CtsCheckpointTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.CtsCheckpointTestCases
@@ -28,6 +28,6 @@
         target_module='CtsCheckpointTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsAccountsHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsAccountsHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsAccountsHostTestCases
index 190fb78..86ed84e 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsAccountsHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsAccountsHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsAccountsHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsAdminTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsAdminTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsAdminTestCases
index b124591..a1c4425 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsAdminTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsAdminTestCases
@@ -29,6 +29,6 @@
         target_module='GtsAdminTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsAfwTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsAfwTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsAfwTestCases
index c316a4d..f7d87e7 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsAfwTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsAfwTestCases
@@ -28,6 +28,6 @@
         target_module='GtsAfwTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsAndroidAutoDeviceTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsAndroidAutoDeviceTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsAndroidAutoDeviceTestCases
index cf853c7..e3b5d58 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsAndroidAutoDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsAndroidAutoDeviceTestCases
@@ -28,6 +28,6 @@
         target_module='GtsAndroidAutoDeviceTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsApp

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsApp b/server/site_tests/cheets_GTS/control.7.0_r3.GtsApp
index e03ac57..f17dae1 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsApp
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsApp
@@ -28,6 +28,6 @@
         target_module='GtsApp',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=5400)
+        timeout=1080)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsArtManagerHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsArtManagerHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsArtManagerHostTestCases
index 615eaa5..5f4769f 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsArtManagerHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsArtManagerHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsArtManagerHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsAssistIntentTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsAssistIntentTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsAssistIntentTestCases
index 3eb6703..7ac4e96 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsAssistIntentTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsAssistIntentTestCases
@@ -28,6 +28,6 @@
         target_module='GtsAssistIntentTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsAssistantHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsAssistantHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsAssistantHostTestCases
index 02a4ae7..b328335 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsAssistantHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsAssistantHostTestCases
@@ -29,6 +29,6 @@
         target_module='GtsAssistantHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsBackup

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsBackup b/server/site_tests/cheets_GTS/control.7.0_r3.GtsBackup
index 69c6ebc..c5ec90f 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsBackup
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsBackup
@@ -28,6 +28,6 @@
         target_module='GtsBackup',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=5400)
+        timeout=1080)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsBootStatsTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsBootStatsTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsBootStatsTestCases
index 9a24fb7..ee89f1c 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsBootStatsTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsBootStatsTestCases
@@ -28,6 +28,6 @@
         target_module='GtsBootStatsTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsCallLogTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsCallLogTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsCallLogTestCases
index 6d0a66a..2d7ce42 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsCallLogTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsCallLogTestCases
@@ -28,6 +28,6 @@
         target_module='GtsCallLogTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsCameraTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsCameraTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsCameraTestCases
index 60f2d0d..89c1ce4 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsCameraTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsCameraTestCases
@@ -28,6 +28,6 @@
         target_module='GtsCameraTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsCastHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsCastHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsCastHostTestCases
index 34a79bc..1d3f2d9 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsCastHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsCastHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsCastHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsContentTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsContentTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsContentTestCases
index b5e6142..f0d3503 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsContentTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsContentTestCases
@@ -28,6 +28,6 @@
         target_module='GtsContentTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsDeviceConfigTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsDeviceConfigTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsDeviceConfigTestCases
index 54aaed8..443d5c3 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsDeviceConfigTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsDeviceConfigTestCases
@@ -28,6 +28,6 @@
         target_module='GtsDeviceConfigTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsDexModuleRegistrationTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsDexModuleRegistrationTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsDexModuleRegistrationTestCases
index 83c6569..36f0588 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsDexModuleRegistrationTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsDexModuleRegistrationTestCases
@@ -28,6 +28,6 @@
         target_module='GtsDexModuleRegistrationTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsDialerDeviceTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsDialerDeviceTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsDialerDeviceTestCases
index 7add071..2c40f0d 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsDialerDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsDialerDeviceTestCases
@@ -28,6 +28,6 @@
         target_module='GtsDialerDeviceTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsDozeDeviceTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsDozeDeviceTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsDozeDeviceTestCases
index 408b440..a4a5732 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsDozeDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsDozeDeviceTestCases
@@ -28,6 +28,6 @@
         target_module='GtsDozeDeviceTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsEdiHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsEdiHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsEdiHostTestCases
index f6123aa..c4e57db 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsEdiHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsEdiHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsEdiHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsFeaturesTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsFeaturesTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsFeaturesTestCases
index 262fef4..3bf8b08 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsFeaturesTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsFeaturesTestCases
@@ -28,6 +28,6 @@
         target_module='GtsFeaturesTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsGameDeviceHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsGameDeviceHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsGameDeviceHostTestCases
index c0dda14..1bb0aa9 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsGameDeviceHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsGameDeviceHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsGameDeviceHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsGraphicsHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsGraphicsHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsGraphicsHostTestCases
index 5127e66..2619dba 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsGraphicsHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsGraphicsHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsGraphicsHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsHomeHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsHomeHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsHomeHostTestCases
index 04e44e7..6aacb07 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsHomeHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsHomeHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsHomeHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsIncident

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsIncident b/server/site_tests/cheets_GTS/control.7.0_r3.GtsIncident
index 39fbe7e..7da0a94 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsIncident
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsIncident
@@ -28,6 +28,6 @@
         target_module='GtsIncident',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=5400)
+        timeout=1080)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsInstallPackagesWhitelistDeviceTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsInstallPackagesWhitelistDeviceTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsInstallPackagesWhitelistDeviceTestCases
index 82306c2..5c5e3d1 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsInstallPackagesWhitelistDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsInstallPackagesWhitelistDeviceTestCases
@@ -28,6 +28,6 @@
         target_module='GtsInstallPackagesWhitelistDeviceTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsInstantAppsHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsInstantAppsHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsInstantAppsHostTestCases
index 4f6ec05..4b695ad 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsInstantAppsHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsInstantAppsHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsInstantAppsHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsLargeApkHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsLargeApkHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsLargeApkHostTestCases
index 0db7644..88f3c6c 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsLargeApkHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsLargeApkHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsLargeApkHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsLauncherHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsLauncherHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsLauncherHostTestCases
index e2a09cd..0b9fbc3 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsLauncherHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsLauncherHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsLauncherHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsLocation

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsLocation b/server/site_tests/cheets_GTS/control.7.0_r3.GtsLocation
index b187ace..b81bca2 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsLocation
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsLocation
@@ -28,6 +28,6 @@
         target_module='GtsLocation',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=5400)
+        timeout=1080)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsMediaTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsMediaTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsMediaTestCases
index 2353261..57820fe 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsMediaTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsMediaTestCases
@@ -28,6 +28,6 @@
         target_module='GtsMediaTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=28800)
+        timeout=14400)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsMemory

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsMemory b/server/site_tests/cheets_GTS/control.7.0_r3.GtsMemory
index 6cc0d4d..49bad96 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsMemory
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsMemory
@@ -29,6 +29,6 @@
         target_module='GtsMemory',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=5400)
+        timeout=1080)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsModuleMetadataTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsModuleMetadataTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsModuleMetadataTestCases
index 1604ca6..0624389 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsModuleMetadataTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsModuleMetadataTestCases
@@ -28,6 +28,6 @@
         target_module='GtsModuleMetadataTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsNet

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsNet b/server/site_tests/cheets_GTS/control.7.0_r3.GtsNet
index 86bfa23..16ebd56 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsNet
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsNet
@@ -29,6 +29,6 @@
         target_module='GtsNet',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=5400)
+        timeout=1080)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsNetwork

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsNetwork b/server/site_tests/cheets_GTS/control.7.0_r3.GtsNetwork
index 548780c..d125848 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsNetwork
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsNetwork
@@ -28,6 +28,6 @@
         target_module='GtsNetwork',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=5400)
+        timeout=1080)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsNmgiarcTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsNmgiarcTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsNmgiarcTestCases
index 6b260e5..38403c7 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsNmgiarcTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsNmgiarcTestCases
@@ -28,6 +28,6 @@
         target_module='GtsNmgiarcTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsNoPermission

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsNoPermission b/server/site_tests/cheets_GTS/control.7.0_r3.GtsNoPermission
index 3a5ae2f..61fa455 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsNoPermission
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsNoPermission
@@ -28,6 +28,6 @@
         target_module='GtsNoPermission',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=5400)
+        timeout=1080)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsNotificationTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsNotificationTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsNotificationTestCases
index 906382a..f4542d7 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsNotificationTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsNotificationTestCases
@@ -28,6 +28,6 @@
         target_module='GtsNotificationTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsOemLockServiceTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsOemLockServiceTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsOemLockServiceTestCases
index 01edc27..2e4ef57 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsOemLockServiceTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsOemLockServiceTestCases
@@ -28,6 +28,6 @@
         target_module='GtsOemLockServiceTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsOsTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsOsTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsOsTestCases
index 07dfaa4..6acc239 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsOsTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsOsTestCases
@@ -29,6 +29,6 @@
         target_module='GtsOsTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=900)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsPackage

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsPackage b/server/site_tests/cheets_GTS/control.7.0_r3.GtsPackage
index 266116d..1516d58 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsPackage
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsPackage
@@ -28,6 +28,6 @@
         target_module='GtsPackage',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=10800)
+        timeout=2160)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsPartnerBookmarksTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsPartnerBookmarksTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsPartnerBookmarksTestCases
index a74a668..7809cd5 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsPartnerBookmarksTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsPartnerBookmarksTestCases
@@ -28,6 +28,6 @@
         target_module='GtsPartnerBookmarksTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsPermissionTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsPermissionTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsPermissionTestCases
index faf21ce..170a7a9 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsPermissionTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsPermissionTestCases
@@ -28,6 +28,6 @@
         target_module='GtsPermissionTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsPlacementTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsPlacementTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsPlacementTestCases
index d78bc0e..5a004c3 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsPlacementTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsPlacementTestCases
@@ -29,6 +29,6 @@
         target_module='GtsPlacementTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsPlay

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsPlay b/server/site_tests/cheets_GTS/control.7.0_r3.GtsPlay
index 12b2d75..444128a 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsPlay
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsPlay
@@ -28,6 +28,6 @@
         target_module='GtsPlay',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=5400)
+        timeout=1080)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsPrintTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsPrintTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsPrintTestCases
index 72fa602..8539c8f 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsPrintTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsPrintTestCases
@@ -28,6 +28,6 @@
         target_module='GtsPrintTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsPrivacyTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsPrivacyTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsPrivacyTestCases
index a8e4ce3..04faabd 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsPrivacyTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsPrivacyTestCases
@@ -29,6 +29,6 @@
         target_module='GtsPrivacyTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsPrivilegedUpdatePreparer

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsPrivilegedUpdatePreparer b/server/site_tests/cheets_GTS/control.7.0_r3.GtsPrivilegedUpdatePreparer
index a351474..de39a04 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsPrivilegedUpdatePreparer
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsPrivilegedUpdatePreparer
@@ -28,6 +28,6 @@
         target_module='GtsPrivilegedUpdatePreparer',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsPropertiesTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsPropertiesTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsPropertiesTestCases
index f769c8b..e94f928 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsPropertiesTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsPropertiesTestCases
@@ -28,6 +28,6 @@
         target_module='GtsPropertiesTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsRegulationComplianceTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsRegulationComplianceTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsRegulationComplianceTestCases
index b510d2a..65d6f1f 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsRegulationComplianceTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsRegulationComplianceTestCases
@@ -28,6 +28,6 @@
         target_module='GtsRegulationComplianceTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsRlzTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsRlzTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsRlzTestCases
index 401cb4f..4cf4681 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsRlzTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsRlzTestCases
@@ -28,6 +28,6 @@
         target_module='GtsRlzTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsSample

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsSample b/server/site_tests/cheets_GTS/control.7.0_r3.GtsSample
index 56952f6..3f040cb 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsSample
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsSample
@@ -28,6 +28,6 @@
         target_module='GtsSample',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=7200)
+        timeout=1440)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsScreenshotHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsScreenshotHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsScreenshotHostTestCases
index 1e03798..3589545 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsScreenshotHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsScreenshotHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsScreenshotHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsSearchHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsSearchHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsSearchHostTestCases
index cfd4a74..7344d82 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsSearchHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsSearchHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsSearchHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsSecurity

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsSecurity b/server/site_tests/cheets_GTS/control.7.0_r3.GtsSecurity
index 0e7606b..60c18ef 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsSecurity
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsSecurity
@@ -28,6 +28,6 @@
         target_module='GtsSecurity',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=5400)
+        timeout=1080)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsSensorHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsSensorHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsSensorHostTestCases
index 2261d17..a4a46b0 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsSensorHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsSensorHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsSensorHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsSettings

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsSettings b/server/site_tests/cheets_GTS/control.7.0_r3.GtsSettings
index 961327d..18e5e44 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsSettings
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsSettings
@@ -28,6 +28,6 @@
         target_module='GtsSettings',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=5400)
+        timeout=1080)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsSetupWizard

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsSetupWizard b/server/site_tests/cheets_GTS/control.7.0_r3.GtsSetupWizard
index 4b35360..fb14bad 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsSetupWizard
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsSetupWizard
@@ -28,6 +28,6 @@
         target_module='GtsSetupWizard',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=5400)
+        timeout=1080)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsSimAppDialogTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsSimAppDialogTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsSimAppDialogTestCases
index d2f6c3f..125a26d 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsSimAppDialogTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsSimAppDialogTestCases
@@ -28,6 +28,6 @@
         target_module='GtsSimAppDialogTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsSmartBatteryDeviceTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsSmartBatteryDeviceTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsSmartBatteryDeviceTestCases
index 498ecdd..dea28c6 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsSmartBatteryDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsSmartBatteryDeviceTestCases
@@ -28,6 +28,6 @@
         target_module='GtsSmartBatteryDeviceTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsSsaidHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsSsaidHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsSsaidHostTestCases
index d05e761..f00847e 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsSsaidHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsSsaidHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsSsaidHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsStagedInstallHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsStagedInstallHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsStagedInstallHostTestCases
index 9a83318..7cc3182 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsStagedInstallHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsStagedInstallHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsStagedInstallHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsStatsdHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsStatsdHostTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsStatsdHostTestCases
index 398cd8e..30013d9 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsStatsdHostTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsStatsdHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsStatsdHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsStorageTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsStorageTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsStorageTestCases
index 32dfce5..6ada8b4 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsStorageTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsStorageTestCases
@@ -28,6 +28,6 @@
         target_module='GtsStorageTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsSupervisionTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsSupervisionTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsSupervisionTestCases
index 082fd4e..88f4136 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsSupervisionTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsSupervisionTestCases
@@ -28,6 +28,6 @@
         target_module='GtsSupervisionTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsSuspendApps

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsSuspendApps b/server/site_tests/cheets_GTS/control.7.0_r3.GtsSuspendApps
index 42e9f0a..70b31cd 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsSuspendApps
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsSuspendApps
@@ -28,6 +28,6 @@
         target_module='GtsSuspendApps',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=5400)
+        timeout=1080)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsTelecomManagerTests

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsTelecomManagerTests b/server/site_tests/cheets_GTS/control.7.0_r3.GtsTelecomManagerTests
index ad4231c..bc79a95 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsTelecomManagerTests
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsTelecomManagerTests
@@ -28,6 +28,6 @@
         target_module='GtsTelecomManagerTests',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsTelephonyTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsTelephonyTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsTelephonyTestCases
index 8af6ef3..05c76a5 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsTelephonyTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsTelephonyTestCases
@@ -28,6 +28,6 @@
         target_module='GtsTelephonyTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsTestHarnessModeTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsTestHarnessModeTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsTestHarnessModeTestCases
index 62c3920..01996cb 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsTestHarnessModeTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsTestHarnessModeTestCases
@@ -28,6 +28,6 @@
         target_module='GtsTestHarnessModeTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsTetheringTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsTetheringTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsTetheringTestCases
index 3ba5195..ddc59ad 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsTetheringTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsTetheringTestCases
@@ -28,6 +28,6 @@
         target_module='GtsTetheringTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsTv

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsTv b/server/site_tests/cheets_GTS/control.7.0_r3.GtsTv
index 8a5a13a..312c2d9 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsTv
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsTv
@@ -28,6 +28,6 @@
         target_module='GtsTv',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=7200)
+        timeout=1440)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsUnofficialApisUsageTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsUnofficialApisUsageTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsUnofficialApisUsageTestCases
index dc3325e..92e9b91 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsUnofficialApisUsageTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsUnofficialApisUsageTestCases
@@ -28,6 +28,6 @@
         target_module='GtsUnofficialApisUsageTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsUsageStatsTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsUsageStatsTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsUsageStatsTestCases
index 01b0788..18135d2 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsUsageStatsTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsUsageStatsTestCases
@@ -28,6 +28,6 @@
         target_module='GtsUsageStatsTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsViewTestCases

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsViewTestCases b/server/site_tests/cheets_GTS/control.7.0_r3.GtsViewTestCases
index 781f047..b1fb90a 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsViewTestCases
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsViewTestCases
@@ -28,6 +28,6 @@
         target_module='GtsViewTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsWebView

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsWebView b/server/site_tests/cheets_GTS/control.7.0_r3.GtsWebView
index 8e24804..8bc9bf1 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsWebView
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsWebView
@@ -28,6 +28,6 @@
         target_module='GtsWebView',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=5400)
+        timeout=1080)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.7.0_r3.GtsWellbeing

diff --git a/server/site_tests/cheets_GTS/control.7.0_r3.GtsWellbeing b/server/site_tests/cheets_GTS/control.7.0_r3.GtsWellbeing
index 8ead986..5e2216b 100644
--- a/server/site_tests/cheets_GTS/control.7.0_r3.GtsWellbeing
+++ b/server/site_tests/cheets_GTS/control.7.0_r3.GtsWellbeing
@@ -28,6 +28,6 @@
         target_module='GtsWellbeing',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r3-6045416.zip',
-        timeout=7200)
+        timeout=1440)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.CtsCheckpointTestCases

diff --git a/server/site_tests/cheets_GTS/control.CtsCheckpointTestCases b/server/site_tests/cheets_GTS/control.CtsCheckpointTestCases
index ad8d033..25f5ba0 100644
--- a/server/site_tests/cheets_GTS/control.CtsCheckpointTestCases
+++ b/server/site_tests/cheets_GTS/control.CtsCheckpointTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsAccountsHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsAccountsHostTestCases b/server/site_tests/cheets_GTS/control.GtsAccountsHostTestCases
index 18a8274..2388faf 100644
--- a/server/site_tests/cheets_GTS/control.GtsAccountsHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsAccountsHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsAdminTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsAdminTestCases b/server/site_tests/cheets_GTS/control.GtsAdminTestCases
index de01d6d..1ff4e79 100644
--- a/server/site_tests/cheets_GTS/control.GtsAdminTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsAdminTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsAfwTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsAfwTestCases b/server/site_tests/cheets_GTS/control.GtsAfwTestCases
index 3ddf607..fd6cf46 100644
--- a/server/site_tests/cheets_GTS/control.GtsAfwTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsAfwTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsAndroidAutoDeviceTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsAndroidAutoDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsAndroidAutoDeviceTestCases
index 86e9172..a73a5a2 100644
--- a/server/site_tests/cheets_GTS/control.GtsAndroidAutoDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsAndroidAutoDeviceTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsAppBlacklistDeviceTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsAppBlacklistDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsAppBlacklistDeviceTestCases
index 3f63212..488a0c3 100644
--- a/server/site_tests/cheets_GTS/control.GtsAppBlacklistDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsAppBlacklistDeviceTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsAppTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsAppTestCases b/server/site_tests/cheets_GTS/control.GtsAppTestCases
index ae17c13..702b5bc 100644
--- a/server/site_tests/cheets_GTS/control.GtsAppTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsAppTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsArtManagerHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsArtManagerHostTestCases b/server/site_tests/cheets_GTS/control.GtsArtManagerHostTestCases
index 46605c6..8e045ca 100644
--- a/server/site_tests/cheets_GTS/control.GtsArtManagerHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsArtManagerHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsAssistIntentTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsAssistIntentTestCases b/server/site_tests/cheets_GTS/control.GtsAssistIntentTestCases
index 1140959..4258698 100644
--- a/server/site_tests/cheets_GTS/control.GtsAssistIntentTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsAssistIntentTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsAssistantHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsAssistantHostTestCases b/server/site_tests/cheets_GTS/control.GtsAssistantHostTestCases
index 495aa8f..6c6e733 100644
--- a/server/site_tests/cheets_GTS/control.GtsAssistantHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsAssistantHostTestCases
@@ -30,6 +30,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsBackupHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsBackupHostTestCases b/server/site_tests/cheets_GTS/control.GtsBackupHostTestCases
index 8f8501b..6268603 100644
--- a/server/site_tests/cheets_GTS/control.GtsBackupHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsBackupHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsBackupTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsBackupTestCases b/server/site_tests/cheets_GTS/control.GtsBackupTestCases
index 08d99a2..792c69b 100644
--- a/server/site_tests/cheets_GTS/control.GtsBackupTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsBackupTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsBootStatsTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsBootStatsTestCases b/server/site_tests/cheets_GTS/control.GtsBootStatsTestCases
index 3ed91fc..95ddd89 100644
--- a/server/site_tests/cheets_GTS/control.GtsBootStatsTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsBootStatsTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsCallLogTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsCallLogTestCases b/server/site_tests/cheets_GTS/control.GtsCallLogTestCases
index 07f40d4..da67283 100644
--- a/server/site_tests/cheets_GTS/control.GtsCallLogTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsCallLogTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsCameraTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsCameraTestCases b/server/site_tests/cheets_GTS/control.GtsCameraTestCases
index 9b57516..bbedfdf 100644
--- a/server/site_tests/cheets_GTS/control.GtsCameraTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsCameraTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsCastHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsCastHostTestCases b/server/site_tests/cheets_GTS/control.GtsCastHostTestCases
index 3957de6..e95d2c4 100644
--- a/server/site_tests/cheets_GTS/control.GtsCastHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsCastHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsContactsAppDeviceTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsContactsAppDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsContactsAppDeviceTestCases
index 2b67d4c..12f0ae1 100644
--- a/server/site_tests/cheets_GTS/control.GtsContactsAppDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsContactsAppDeviceTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsContactsTest

diff --git a/server/site_tests/cheets_GTS/control.GtsContactsTest b/server/site_tests/cheets_GTS/control.GtsContactsTest
index 4797872..0ee17de 100644
--- a/server/site_tests/cheets_GTS/control.GtsContactsTest
+++ b/server/site_tests/cheets_GTS/control.GtsContactsTest
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsContentTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsContentTestCases b/server/site_tests/cheets_GTS/control.GtsContentTestCases
index 7890554..1261065 100644
--- a/server/site_tests/cheets_GTS/control.GtsContentTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsContentTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsDeviceConfigTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsDeviceConfigTestCases b/server/site_tests/cheets_GTS/control.GtsDeviceConfigTestCases
index 6186b4a..430d2cc 100644
--- a/server/site_tests/cheets_GTS/control.GtsDeviceConfigTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsDeviceConfigTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsDexModuleRegistrationTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsDexModuleRegistrationTestCases b/server/site_tests/cheets_GTS/control.GtsDexModuleRegistrationTestCases
index a5487cb..b2bcf93 100644
--- a/server/site_tests/cheets_GTS/control.GtsDexModuleRegistrationTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsDexModuleRegistrationTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsDialerDeviceTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsDialerDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsDialerDeviceTestCases
index ded383f..307cfcd 100644
--- a/server/site_tests/cheets_GTS/control.GtsDialerDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsDialerDeviceTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsDozeDeviceTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsDozeDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsDozeDeviceTestCases
index b6380b5..d254220 100644
--- a/server/site_tests/cheets_GTS/control.GtsDozeDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsDozeDeviceTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsEdiHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsEdiHostTestCases b/server/site_tests/cheets_GTS/control.GtsEdiHostTestCases
index 163dcfe..cd7410e 100644
--- a/server/site_tests/cheets_GTS/control.GtsEdiHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsEdiHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsFeaturesTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsFeaturesTestCases b/server/site_tests/cheets_GTS/control.GtsFeaturesTestCases
index 31f735f..a021da1 100644
--- a/server/site_tests/cheets_GTS/control.GtsFeaturesTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsFeaturesTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases b/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
index 7feb65e..b9585f8 100644
--- a/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsGameDeviceHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsGraphicsHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsGraphicsHostTestCases b/server/site_tests/cheets_GTS/control.GtsGraphicsHostTestCases
index f65d9aa..7d7b3ae 100644
--- a/server/site_tests/cheets_GTS/control.GtsGraphicsHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsGraphicsHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsHomeHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsHomeHostTestCases b/server/site_tests/cheets_GTS/control.GtsHomeHostTestCases
index 8711605..f07afc7 100644
--- a/server/site_tests/cheets_GTS/control.GtsHomeHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsHomeHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsIncidentConfirmationTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsIncidentConfirmationTestCases b/server/site_tests/cheets_GTS/control.GtsIncidentConfirmationTestCases
index 8bdc0d5..3fb5274 100644
--- a/server/site_tests/cheets_GTS/control.GtsIncidentConfirmationTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsIncidentConfirmationTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsIncidentManagerTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsIncidentManagerTestCases b/server/site_tests/cheets_GTS/control.GtsIncidentManagerTestCases
index 5807630..3f66e7b 100644
--- a/server/site_tests/cheets_GTS/control.GtsIncidentManagerTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsIncidentManagerTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsInstallPackagesWhitelistDeviceTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsInstallPackagesWhitelistDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsInstallPackagesWhitelistDeviceTestCases
index acb7a97..33c35c7 100644
--- a/server/site_tests/cheets_GTS/control.GtsInstallPackagesWhitelistDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsInstallPackagesWhitelistDeviceTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsInstantAppsHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsInstantAppsHostTestCases b/server/site_tests/cheets_GTS/control.GtsInstantAppsHostTestCases
index d21e07a..42eefb8 100644
--- a/server/site_tests/cheets_GTS/control.GtsInstantAppsHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsInstantAppsHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsLargeApkHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsLargeApkHostTestCases b/server/site_tests/cheets_GTS/control.GtsLargeApkHostTestCases
index 7c8f502..06f1b52 100644
--- a/server/site_tests/cheets_GTS/control.GtsLargeApkHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsLargeApkHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsLauncherHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsLauncherHostTestCases b/server/site_tests/cheets_GTS/control.GtsLauncherHostTestCases
index 9d6d1af..7161f4c 100644
--- a/server/site_tests/cheets_GTS/control.GtsLauncherHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsLauncherHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsLocationHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsLocationHostTestCases b/server/site_tests/cheets_GTS/control.GtsLocationHostTestCases
index 170d6d1..ccf6c5f 100644
--- a/server/site_tests/cheets_GTS/control.GtsLocationHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsLocationHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsLocationTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsLocationTestCases b/server/site_tests/cheets_GTS/control.GtsLocationTestCases
index 19ff1dc..0f08a5c 100644
--- a/server/site_tests/cheets_GTS/control.GtsLocationTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsLocationTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsMediaTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsMediaTestCases b/server/site_tests/cheets_GTS/control.GtsMediaTestCases
index a86674d..656c69b 100644
--- a/server/site_tests/cheets_GTS/control.GtsMediaTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsMediaTestCases
@@ -30,6 +30,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=28800)
+        timeout=14400)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsMemoryHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsMemoryHostTestCases b/server/site_tests/cheets_GTS/control.GtsMemoryHostTestCases
index a0f6da0..0285f44 100644
--- a/server/site_tests/cheets_GTS/control.GtsMemoryHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsMemoryHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsMemoryTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsMemoryTestCases b/server/site_tests/cheets_GTS/control.GtsMemoryTestCases
index 13a3d7b..76fe2da 100644
--- a/server/site_tests/cheets_GTS/control.GtsMemoryTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsMemoryTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsModuleMetadataTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsModuleMetadataTestCases b/server/site_tests/cheets_GTS/control.GtsModuleMetadataTestCases
index 5bc8c25..13026c4 100644
--- a/server/site_tests/cheets_GTS/control.GtsModuleMetadataTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsModuleMetadataTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsNetStatsHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsNetStatsHostTestCases b/server/site_tests/cheets_GTS/control.GtsNetStatsHostTestCases
index 70d3a41..a1fb0af 100644
--- a/server/site_tests/cheets_GTS/control.GtsNetStatsHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsNetStatsHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsNetTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsNetTestCases b/server/site_tests/cheets_GTS/control.GtsNetTestCases
index f71953b..34255d3 100644
--- a/server/site_tests/cheets_GTS/control.GtsNetTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsNetTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsNetworkStackHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsNetworkStackHostTestCases b/server/site_tests/cheets_GTS/control.GtsNetworkStackHostTestCases
index f02011d..e0f20a9 100644
--- a/server/site_tests/cheets_GTS/control.GtsNetworkStackHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsNetworkStackHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsNetworkWatchlistTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsNetworkWatchlistTestCases b/server/site_tests/cheets_GTS/control.GtsNetworkWatchlistTestCases
index 1512a79..4cf6489 100644
--- a/server/site_tests/cheets_GTS/control.GtsNetworkWatchlistTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsNetworkWatchlistTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsNmgiarcTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsNmgiarcTestCases b/server/site_tests/cheets_GTS/control.GtsNmgiarcTestCases
index e340cb7..7948b61 100644
--- a/server/site_tests/cheets_GTS/control.GtsNmgiarcTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsNmgiarcTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsNoPermissionTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsNoPermissionTestCases b/server/site_tests/cheets_GTS/control.GtsNoPermissionTestCases
index 895885a..3133a34 100644
--- a/server/site_tests/cheets_GTS/control.GtsNoPermissionTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsNoPermissionTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsNoPermissionTestCases25

diff --git a/server/site_tests/cheets_GTS/control.GtsNoPermissionTestCases25 b/server/site_tests/cheets_GTS/control.GtsNoPermissionTestCases25
index 78aa51f..26d2e3f 100644
--- a/server/site_tests/cheets_GTS/control.GtsNoPermissionTestCases25
+++ b/server/site_tests/cheets_GTS/control.GtsNoPermissionTestCases25
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsNotificationTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsNotificationTestCases b/server/site_tests/cheets_GTS/control.GtsNotificationTestCases
index ecb2604..e14df8e 100644
--- a/server/site_tests/cheets_GTS/control.GtsNotificationTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsNotificationTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsOemLockServiceTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsOemLockServiceTestCases b/server/site_tests/cheets_GTS/control.GtsOemLockServiceTestCases
index d314ebf..5584afe 100644
--- a/server/site_tests/cheets_GTS/control.GtsOemLockServiceTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsOemLockServiceTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsOsTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsOsTestCases b/server/site_tests/cheets_GTS/control.GtsOsTestCases
index 8d819f5..8be2811 100644
--- a/server/site_tests/cheets_GTS/control.GtsOsTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsOsTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=900)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsPackageInstallTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsPackageInstallTestCases b/server/site_tests/cheets_GTS/control.GtsPackageInstallTestCases
index 17272ad..c6ed5e8 100644
--- a/server/site_tests/cheets_GTS/control.GtsPackageInstallTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPackageInstallTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsPackageInstallerTapjackingTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsPackageInstallerTapjackingTestCases b/server/site_tests/cheets_GTS/control.GtsPackageInstallerTapjackingTestCases
index 1d71e5d..e0a21cc 100644
--- a/server/site_tests/cheets_GTS/control.GtsPackageInstallerTapjackingTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPackageInstallerTapjackingTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsPackageManagerHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsPackageManagerHostTestCases b/server/site_tests/cheets_GTS/control.GtsPackageManagerHostTestCases
index 4cf2517..3317ad5 100644
--- a/server/site_tests/cheets_GTS/control.GtsPackageManagerHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPackageManagerHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsPackageNameCertPairsDeviceTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsPackageNameCertPairsDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsPackageNameCertPairsDeviceTestCases
index 2d898fe..f4fdffa 100644
--- a/server/site_tests/cheets_GTS/control.GtsPackageNameCertPairsDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPackageNameCertPairsDeviceTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsPackageUninstallTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsPackageUninstallTestCases b/server/site_tests/cheets_GTS/control.GtsPackageUninstallTestCases
index b239bab..f660b85 100644
--- a/server/site_tests/cheets_GTS/control.GtsPackageUninstallTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPackageUninstallTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsPartnerBookmarksTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsPartnerBookmarksTestCases b/server/site_tests/cheets_GTS/control.GtsPartnerBookmarksTestCases
index d2d69f1..d0665b3 100644
--- a/server/site_tests/cheets_GTS/control.GtsPartnerBookmarksTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPartnerBookmarksTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsPermissionTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsPermissionTestCases b/server/site_tests/cheets_GTS/control.GtsPermissionTestCases
index 21538ce..f6ebe03 100644
--- a/server/site_tests/cheets_GTS/control.GtsPermissionTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPermissionTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsPlacementTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsPlacementTestCases b/server/site_tests/cheets_GTS/control.GtsPlacementTestCases
index f054fab..34d9f03 100644
--- a/server/site_tests/cheets_GTS/control.GtsPlacementTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPlacementTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsPlayAutoInstallTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsPlayAutoInstallTestCases b/server/site_tests/cheets_GTS/control.GtsPlayAutoInstallTestCases
index 21d6388..f2fb6f1 100644
--- a/server/site_tests/cheets_GTS/control.GtsPlayAutoInstallTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPlayAutoInstallTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsPlayStoreHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsPlayStoreHostTestCases b/server/site_tests/cheets_GTS/control.GtsPlayStoreHostTestCases
index 7c45b8f..938c324 100644
--- a/server/site_tests/cheets_GTS/control.GtsPlayStoreHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPlayStoreHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsPrintTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsPrintTestCases b/server/site_tests/cheets_GTS/control.GtsPrintTestCases
index d021817..448bb06 100644
--- a/server/site_tests/cheets_GTS/control.GtsPrintTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPrintTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsPrivacyTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsPrivacyTestCases b/server/site_tests/cheets_GTS/control.GtsPrivacyTestCases
index cbaa2fa..639e952 100644
--- a/server/site_tests/cheets_GTS/control.GtsPrivacyTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPrivacyTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsPrivilegedUpdatePreparer

diff --git a/server/site_tests/cheets_GTS/control.GtsPrivilegedUpdatePreparer b/server/site_tests/cheets_GTS/control.GtsPrivilegedUpdatePreparer
index 848189b..f0f8655 100644
--- a/server/site_tests/cheets_GTS/control.GtsPrivilegedUpdatePreparer
+++ b/server/site_tests/cheets_GTS/control.GtsPrivilegedUpdatePreparer
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsPropertiesTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsPropertiesTestCases b/server/site_tests/cheets_GTS/control.GtsPropertiesTestCases
index 2311155..0a663f9 100644
--- a/server/site_tests/cheets_GTS/control.GtsPropertiesTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPropertiesTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsRegulationComplianceTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsRegulationComplianceTestCases b/server/site_tests/cheets_GTS/control.GtsRegulationComplianceTestCases
index 9321050..0c37999 100644
--- a/server/site_tests/cheets_GTS/control.GtsRegulationComplianceTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsRegulationComplianceTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsRlzTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsRlzTestCases b/server/site_tests/cheets_GTS/control.GtsRlzTestCases
index 6fe7f63..a449e05 100644
--- a/server/site_tests/cheets_GTS/control.GtsRlzTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsRlzTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsSampleDeviceTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsSampleDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsSampleDeviceTestCases
index fafe28a..66af664 100644
--- a/server/site_tests/cheets_GTS/control.GtsSampleDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSampleDeviceTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsSampleDynamicConfigTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsSampleDynamicConfigTestCases b/server/site_tests/cheets_GTS/control.GtsSampleDynamicConfigTestCases
index b0b3764..69906e7 100644
--- a/server/site_tests/cheets_GTS/control.GtsSampleDynamicConfigTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSampleDynamicConfigTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsSampleHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsSampleHostTestCases b/server/site_tests/cheets_GTS/control.GtsSampleHostTestCases
index e847ec7..37b3e85 100644
--- a/server/site_tests/cheets_GTS/control.GtsSampleHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSampleHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsScreenshotHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsScreenshotHostTestCases b/server/site_tests/cheets_GTS/control.GtsScreenshotHostTestCases
index b8288d1..3946464 100644
--- a/server/site_tests/cheets_GTS/control.GtsScreenshotHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsScreenshotHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsSearchHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsSearchHostTestCases b/server/site_tests/cheets_GTS/control.GtsSearchHostTestCases
index d17137a..8b6b8e8 100644
--- a/server/site_tests/cheets_GTS/control.GtsSearchHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSearchHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsSecurityHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsSecurityHostTestCases b/server/site_tests/cheets_GTS/control.GtsSecurityHostTestCases
index 2fe0c8c..ee51cfa 100644
--- a/server/site_tests/cheets_GTS/control.GtsSecurityHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSecurityHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsSecurityTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsSecurityTestCases b/server/site_tests/cheets_GTS/control.GtsSecurityTestCases
index 79d4d2f..bc6ebfd 100644
--- a/server/site_tests/cheets_GTS/control.GtsSecurityTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSecurityTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsSensorHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsSensorHostTestCases b/server/site_tests/cheets_GTS/control.GtsSensorHostTestCases
index 79ed3b5..6606ced 100644
--- a/server/site_tests/cheets_GTS/control.GtsSensorHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSensorHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsSettingsHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsSettingsHostTestCases b/server/site_tests/cheets_GTS/control.GtsSettingsHostTestCases
index 9889c30..070da51 100644
--- a/server/site_tests/cheets_GTS/control.GtsSettingsHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSettingsHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsSettingsTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsSettingsTestCases b/server/site_tests/cheets_GTS/control.GtsSettingsTestCases
index b5953f6..951553b 100644
--- a/server/site_tests/cheets_GTS/control.GtsSettingsTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSettingsTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsSetupWizardHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsSetupWizardHostTestCases b/server/site_tests/cheets_GTS/control.GtsSetupWizardHostTestCases
index fea95aa..f74bfdc 100644
--- a/server/site_tests/cheets_GTS/control.GtsSetupWizardHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSetupWizardHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsSetupWizardNoPermissionTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsSetupWizardNoPermissionTestCases b/server/site_tests/cheets_GTS/control.GtsSetupWizardNoPermissionTestCases
index 658706e..b13d403 100644
--- a/server/site_tests/cheets_GTS/control.GtsSetupWizardNoPermissionTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSetupWizardNoPermissionTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsSimAppDialogTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsSimAppDialogTestCases b/server/site_tests/cheets_GTS/control.GtsSimAppDialogTestCases
index aa0ee7b..a272af3 100644
--- a/server/site_tests/cheets_GTS/control.GtsSimAppDialogTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSimAppDialogTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsSmartBatteryDeviceTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsSmartBatteryDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsSmartBatteryDeviceTestCases
index 9b4fa9e..272758e 100644
--- a/server/site_tests/cheets_GTS/control.GtsSmartBatteryDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSmartBatteryDeviceTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsSsaidHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsSsaidHostTestCases b/server/site_tests/cheets_GTS/control.GtsSsaidHostTestCases
index 5a468c2..7221669 100644
--- a/server/site_tests/cheets_GTS/control.GtsSsaidHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSsaidHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsStagedInstallHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsStagedInstallHostTestCases b/server/site_tests/cheets_GTS/control.GtsStagedInstallHostTestCases
index 3c69998..5c8df32 100644
--- a/server/site_tests/cheets_GTS/control.GtsStagedInstallHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsStagedInstallHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsStatsdHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsStatsdHostTestCases b/server/site_tests/cheets_GTS/control.GtsStatsdHostTestCases
index e1f5e09..e44a597 100644
--- a/server/site_tests/cheets_GTS/control.GtsStatsdHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsStatsdHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsStorageTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsStorageTestCases b/server/site_tests/cheets_GTS/control.GtsStorageTestCases
index f4566c0..c4ae810 100644
--- a/server/site_tests/cheets_GTS/control.GtsStorageTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsStorageTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsSupervisionTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsSupervisionTestCases b/server/site_tests/cheets_GTS/control.GtsSupervisionTestCases
index cfca6f6..ee2b8dc 100644
--- a/server/site_tests/cheets_GTS/control.GtsSupervisionTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSupervisionTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsSuspendAppsPermissionTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsSuspendAppsPermissionTestCases b/server/site_tests/cheets_GTS/control.GtsSuspendAppsPermissionTestCases
index 6e91b69..47d7b0e 100644
--- a/server/site_tests/cheets_GTS/control.GtsSuspendAppsPermissionTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSuspendAppsPermissionTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsSuspendAppsTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsSuspendAppsTestCases b/server/site_tests/cheets_GTS/control.GtsSuspendAppsTestCases
index 053750b..c549e64 100644
--- a/server/site_tests/cheets_GTS/control.GtsSuspendAppsTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSuspendAppsTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsTelecomManagerTests

diff --git a/server/site_tests/cheets_GTS/control.GtsTelecomManagerTests b/server/site_tests/cheets_GTS/control.GtsTelecomManagerTests
index a314b8e..17ab395 100644
--- a/server/site_tests/cheets_GTS/control.GtsTelecomManagerTests
+++ b/server/site_tests/cheets_GTS/control.GtsTelecomManagerTests
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsTelephonyTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsTelephonyTestCases b/server/site_tests/cheets_GTS/control.GtsTelephonyTestCases
index eefb892..9e4ab84 100644
--- a/server/site_tests/cheets_GTS/control.GtsTelephonyTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsTelephonyTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsTestHarnessModeTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsTestHarnessModeTestCases b/server/site_tests/cheets_GTS/control.GtsTestHarnessModeTestCases
index 720e758..cc2ebc8 100644
--- a/server/site_tests/cheets_GTS/control.GtsTestHarnessModeTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsTestHarnessModeTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsTetheringTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsTetheringTestCases b/server/site_tests/cheets_GTS/control.GtsTetheringTestCases
index 25a083b..42e4c6f 100644
--- a/server/site_tests/cheets_GTS/control.GtsTetheringTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsTetheringTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsTvBugReportTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsTvBugReportTestCases b/server/site_tests/cheets_GTS/control.GtsTvBugReportTestCases
index 6691ddb..3ab7d03 100644
--- a/server/site_tests/cheets_GTS/control.GtsTvBugReportTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsTvBugReportTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsTvHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsTvHostTestCases b/server/site_tests/cheets_GTS/control.GtsTvHostTestCases
index f97d2da..cf8c0d7 100644
--- a/server/site_tests/cheets_GTS/control.GtsTvHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsTvHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsTvTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsTvTestCases b/server/site_tests/cheets_GTS/control.GtsTvTestCases
index 7f9f14b..f202aba 100644
--- a/server/site_tests/cheets_GTS/control.GtsTvTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsTvTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsUnofficialApisUsageTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsUnofficialApisUsageTestCases b/server/site_tests/cheets_GTS/control.GtsUnofficialApisUsageTestCases
index 49bf135..03b0421 100644
--- a/server/site_tests/cheets_GTS/control.GtsUnofficialApisUsageTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsUnofficialApisUsageTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsUsageStatsTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsUsageStatsTestCases b/server/site_tests/cheets_GTS/control.GtsUsageStatsTestCases
index 7e1dd3f..e42583d 100644
--- a/server/site_tests/cheets_GTS/control.GtsUsageStatsTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsUsageStatsTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsViewTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsViewTestCases b/server/site_tests/cheets_GTS/control.GtsViewTestCases
index 92795ef..f707737 100644
--- a/server/site_tests/cheets_GTS/control.GtsViewTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsViewTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsWebViewHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsWebViewHostTestCases b/server/site_tests/cheets_GTS/control.GtsWebViewHostTestCases
index 2213149..eabccf4 100644
--- a/server/site_tests/cheets_GTS/control.GtsWebViewHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsWebViewHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsWebViewTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsWebViewTestCases b/server/site_tests/cheets_GTS/control.GtsWebViewTestCases
index 7857ea3..c9ab11d 100644
--- a/server/site_tests/cheets_GTS/control.GtsWebViewTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsWebViewTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsWellbeingHostTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsWellbeingHostTestCases b/server/site_tests/cheets_GTS/control.GtsWellbeingHostTestCases
index cbe442c..c02ec8c 100644
--- a/server/site_tests/cheets_GTS/control.GtsWellbeingHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsWellbeingHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsWellbeingPermissionPolicyTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsWellbeingPermissionPolicyTestCases b/server/site_tests/cheets_GTS/control.GtsWellbeingPermissionPolicyTestCases
index bd0c9fa..06287a0 100644
--- a/server/site_tests/cheets_GTS/control.GtsWellbeingPermissionPolicyTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsWellbeingPermissionPolicyTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS/control.GtsWellbeingTestCases

diff --git a/server/site_tests/cheets_GTS/control.GtsWellbeingTestCases b/server/site_tests/cheets_GTS/control.GtsWellbeingTestCases
index 8841269..32cecc9 100644
--- a/server/site_tests/cheets_GTS/control.GtsWellbeingTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsWellbeingTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAccountsHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAccountsHostTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAccountsHostTestCases
index 419e676..5e0b502 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAccountsHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAccountsHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsAccountsHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAdminTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAdminTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAdminTestCases
index 61d935b..efe73f2 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAdminTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAdminTestCases
@@ -29,6 +29,6 @@
         target_module='GtsAdminTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAfwTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAfwTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAfwTestCases
index 68a9e18..b518131 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAfwTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAfwTestCases
@@ -28,6 +28,6 @@
         target_module='GtsAfwTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAndroidAutoDeviceTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAndroidAutoDeviceTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAndroidAutoDeviceTestCases
index bb85d9f..406f8d7 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAndroidAutoDeviceTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAndroidAutoDeviceTestCases
@@ -28,6 +28,6 @@
         target_module='GtsAndroidAutoDeviceTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAngleHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAngleHostTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAngleHostTestCases
index 74cf4ff..bd1002f 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAngleHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAngleHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsAngleHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsApp

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsApp b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsApp
index dca1321..139f613 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsApp
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsApp
@@ -28,6 +28,6 @@
         target_module='GtsApp',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=5400)
+        timeout=1080)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsArtManagerHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsArtManagerHostTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsArtManagerHostTestCases
index 5ece139..a59af80 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsArtManagerHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsArtManagerHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsArtManagerHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAssistIntentTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAssistIntentTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAssistIntentTestCases
index 195bd84..c894ccb 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAssistIntentTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAssistIntentTestCases
@@ -28,6 +28,6 @@
         target_module='GtsAssistIntentTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAssistantHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAssistantHostTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAssistantHostTestCases
index 7783b8e..7eaf0e6 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAssistantHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsAssistantHostTestCases
@@ -29,6 +29,6 @@
         target_module='GtsAssistantHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsBackup

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsBackup b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsBackup
index 1c0540c..3a8cb93 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsBackup
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsBackup
@@ -28,6 +28,6 @@
         target_module='GtsBackup',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=5400)
+        timeout=1080)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsBootStatsTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsBootStatsTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsBootStatsTestCases
index 3c8051a..4b067d4 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsBootStatsTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsBootStatsTestCases
@@ -28,6 +28,6 @@
         target_module='GtsBootStatsTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsCallLogTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsCallLogTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsCallLogTestCases
index d3f57db..54439d8 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsCallLogTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsCallLogTestCases
@@ -28,6 +28,6 @@
         target_module='GtsCallLogTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsCameraTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsCameraTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsCameraTestCases
index 39294dc..11a567e 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsCameraTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsCameraTestCases
@@ -28,6 +28,6 @@
         target_module='GtsCameraTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsCastHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsCastHostTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsCastHostTestCases
index 3318d31..a5d09d7 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsCastHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsCastHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsCastHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsContentTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsContentTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsContentTestCases
index 40d2f6b..141b622 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsContentTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsContentTestCases
@@ -28,6 +28,6 @@
         target_module='GtsContentTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsDeviceConfigTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsDeviceConfigTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsDeviceConfigTestCases
index ef4c088..399e7fd 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsDeviceConfigTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsDeviceConfigTestCases
@@ -28,6 +28,6 @@
         target_module='GtsDeviceConfigTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsDexModuleRegistrationTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsDexModuleRegistrationTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsDexModuleRegistrationTestCases
index dd3b8ea..bc70b20 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsDexModuleRegistrationTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsDexModuleRegistrationTestCases
@@ -28,6 +28,6 @@
         target_module='GtsDexModuleRegistrationTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsDialerDeviceTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsDialerDeviceTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsDialerDeviceTestCases
index 749f6c1..9bd8a98 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsDialerDeviceTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsDialerDeviceTestCases
@@ -28,6 +28,6 @@
         target_module='GtsDialerDeviceTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsDozeDeviceTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsDozeDeviceTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsDozeDeviceTestCases
index 665184e..3f0b2ea 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsDozeDeviceTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsDozeDeviceTestCases
@@ -28,6 +28,6 @@
         target_module='GtsDozeDeviceTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsEdiHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsEdiHostTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsEdiHostTestCases
index 3ccf0a6..d84ba97 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsEdiHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsEdiHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsEdiHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsFeaturesTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsFeaturesTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsFeaturesTestCases
index 70b4ff4..a6bd212 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsFeaturesTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsFeaturesTestCases
@@ -28,6 +28,6 @@
         target_module='GtsFeaturesTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsGameDeviceHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsGameDeviceHostTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsGameDeviceHostTestCases
index 0929300..e80ae8a 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsGameDeviceHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsGameDeviceHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsGameDeviceHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsGraphicsHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsGraphicsHostTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsGraphicsHostTestCases
index eafd3c9..5196a6f 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsGraphicsHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsGraphicsHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsGraphicsHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsHomeHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsHomeHostTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsHomeHostTestCases
index f200352..563cd3c 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsHomeHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsHomeHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsHomeHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsIncident

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsIncident b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsIncident
index 2fa19a6..23b6098 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsIncident
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsIncident
@@ -28,6 +28,6 @@
         target_module='GtsIncident',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=5400)
+        timeout=1080)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsInstallPackagesWhitelistDeviceTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsInstallPackagesWhitelistDeviceTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsInstallPackagesWhitelistDeviceTestCases
index 573dd43..ea2d533 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsInstallPackagesWhitelistDeviceTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsInstallPackagesWhitelistDeviceTestCases
@@ -28,6 +28,6 @@
         target_module='GtsInstallPackagesWhitelistDeviceTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsInstantAppsHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsInstantAppsHostTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsInstantAppsHostTestCases
index 6bd80b0..f8071d7 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsInstantAppsHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsInstantAppsHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsInstantAppsHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsLargeApkHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsLargeApkHostTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsLargeApkHostTestCases
index 03c7783..8476029 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsLargeApkHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsLargeApkHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsLargeApkHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsLauncherHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsLauncherHostTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsLauncherHostTestCases
index 56b18d9..67a541e 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsLauncherHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsLauncherHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsLauncherHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsLocation

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsLocation b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsLocation
index 7c65920..c57a045 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsLocation
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsLocation
@@ -28,6 +28,6 @@
         target_module='GtsLocation',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=5400)
+        timeout=1080)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsMediaTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsMediaTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsMediaTestCases
index 25d448f..72c008d 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsMediaTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsMediaTestCases
@@ -28,6 +28,6 @@
         target_module='GtsMediaTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=28800)
+        timeout=14400)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsMemory

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsMemory b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsMemory
index 3d0a0cb..16f7575 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsMemory
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsMemory
@@ -29,6 +29,6 @@
         target_module='GtsMemory',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=5400)
+        timeout=1080)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsModuleMetadataTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsModuleMetadataTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsModuleMetadataTestCases
index 0a3a498..8926fdc 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsModuleMetadataTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsModuleMetadataTestCases
@@ -28,6 +28,6 @@
         target_module='GtsModuleMetadataTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsNet

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsNet b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsNet
index 44ba558..43ef8f0 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsNet
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsNet
@@ -29,6 +29,6 @@
         target_module='GtsNet',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=5400)
+        timeout=1080)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsNetwork

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsNetwork b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsNetwork
index ffdd7c6..79789e7 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsNetwork
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsNetwork
@@ -28,6 +28,6 @@
         target_module='GtsNetwork',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=5400)
+        timeout=1080)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsNmgiarcTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsNmgiarcTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsNmgiarcTestCases
index 3810b00..c851ab1 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsNmgiarcTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsNmgiarcTestCases
@@ -28,6 +28,6 @@
         target_module='GtsNmgiarcTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsNoPermission

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsNoPermission b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsNoPermission
index a9462b1..9a5ad05 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsNoPermission
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsNoPermission
@@ -28,6 +28,6 @@
         target_module='GtsNoPermission',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=5400)
+        timeout=1080)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsNotificationTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsNotificationTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsNotificationTestCases
index 274c91f..9a03d6f 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsNotificationTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsNotificationTestCases
@@ -28,6 +28,6 @@
         target_module='GtsNotificationTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsOemLockServiceTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsOemLockServiceTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsOemLockServiceTestCases
index 9db5b4e..034cd18 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsOemLockServiceTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsOemLockServiceTestCases
@@ -28,6 +28,6 @@
         target_module='GtsOemLockServiceTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsOsTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsOsTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsOsTestCases
index 843e0e9..db45681 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsOsTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsOsTestCases
@@ -29,6 +29,6 @@
         target_module='GtsOsTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=900)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPackage

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPackage b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPackage
index dd64f0a..9a17861 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPackage
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPackage
@@ -28,6 +28,6 @@
         target_module='GtsPackage',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=10800)
+        timeout=2160)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPartnerBookmarksTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPartnerBookmarksTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPartnerBookmarksTestCases
index 6b1150f..997e1b5 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPartnerBookmarksTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPartnerBookmarksTestCases
@@ -28,6 +28,6 @@
         target_module='GtsPartnerBookmarksTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPermissionTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPermissionTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPermissionTestCases
index e231000..0adaa6e 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPermissionTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPermissionTestCases
@@ -28,6 +28,6 @@
         target_module='GtsPermissionTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPlacementTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPlacementTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPlacementTestCases
index 7efcf3a..a26ad74 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPlacementTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPlacementTestCases
@@ -29,6 +29,6 @@
         target_module='GtsPlacementTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPlay

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPlay b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPlay
index 528d409..f7f0fef 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPlay
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPlay
@@ -28,6 +28,6 @@
         target_module='GtsPlay',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=5400)
+        timeout=1080)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPrintTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPrintTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPrintTestCases
index 9f94e7a..7dc52a2 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPrintTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPrintTestCases
@@ -28,6 +28,6 @@
         target_module='GtsPrintTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPrivacyTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPrivacyTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPrivacyTestCases
index d1af15a..f4aa2d6 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPrivacyTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPrivacyTestCases
@@ -29,6 +29,6 @@
         target_module='GtsPrivacyTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPrivilegedUpdatePreparer

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPrivilegedUpdatePreparer b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPrivilegedUpdatePreparer
index ea7c10a..7359893 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPrivilegedUpdatePreparer
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPrivilegedUpdatePreparer
@@ -28,6 +28,6 @@
         target_module='GtsPrivilegedUpdatePreparer',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPropertiesTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPropertiesTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPropertiesTestCases
index 2cb29ad..9e93aba 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPropertiesTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsPropertiesTestCases
@@ -28,6 +28,6 @@
         target_module='GtsPropertiesTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsRegulationComplianceTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsRegulationComplianceTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsRegulationComplianceTestCases
index c4f6b1d..766afd7 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsRegulationComplianceTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsRegulationComplianceTestCases
@@ -28,6 +28,6 @@
         target_module='GtsRegulationComplianceTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsRlzTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsRlzTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsRlzTestCases
index 707386c..65cf39d 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsRlzTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsRlzTestCases
@@ -28,6 +28,6 @@
         target_module='GtsRlzTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSample

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSample b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSample
index 1f0c761..2469406 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSample
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSample
@@ -28,6 +28,6 @@
         target_module='GtsSample',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=7200)
+        timeout=1440)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsScreenshotHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsScreenshotHostTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsScreenshotHostTestCases
index d742beb..58d7e3d 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsScreenshotHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsScreenshotHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsScreenshotHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSearchHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSearchHostTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSearchHostTestCases
index fa26ac1..97600ed 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSearchHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSearchHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsSearchHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSecurityHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSecurityHostTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSecurityHostTestCases
index dbee83c..9432701 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSecurityHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSecurityHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsSecurityHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSensorHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSensorHostTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSensorHostTestCases
index b81fee9..36de50f 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSensorHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSensorHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsSensorHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSettings

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSettings b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSettings
index bbb8846..d791c9e 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSettings
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSettings
@@ -28,6 +28,6 @@
         target_module='GtsSettings',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=5400)
+        timeout=1080)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSetupWizard

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSetupWizard b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSetupWizard
index e45b047..3eefe57 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSetupWizard
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSetupWizard
@@ -28,6 +28,6 @@
         target_module='GtsSetupWizard',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=5400)
+        timeout=1080)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSimAppDialogTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSimAppDialogTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSimAppDialogTestCases
index ddf9454..a307476 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSimAppDialogTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSimAppDialogTestCases
@@ -28,6 +28,6 @@
         target_module='GtsSimAppDialogTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSmartBatteryDeviceTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSmartBatteryDeviceTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSmartBatteryDeviceTestCases
index b71e368..d0837fc 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSmartBatteryDeviceTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSmartBatteryDeviceTestCases
@@ -28,6 +28,6 @@
         target_module='GtsSmartBatteryDeviceTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSsaidHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSsaidHostTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSsaidHostTestCases
index a6f3e5c..6c966f0 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSsaidHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSsaidHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsSsaidHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsStatsdHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsStatsdHostTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsStatsdHostTestCases
index e0b024c..dfbc313 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsStatsdHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsStatsdHostTestCases
@@ -28,6 +28,6 @@
         target_module='GtsStatsdHostTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsStorageTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsStorageTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsStorageTestCases
index 17c405b..b003cf9 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsStorageTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsStorageTestCases
@@ -28,6 +28,6 @@
         target_module='GtsStorageTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSupervisionTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSupervisionTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSupervisionTestCases
index c461fdd..d5acc5b 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSupervisionTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSupervisionTestCases
@@ -28,6 +28,6 @@
         target_module='GtsSupervisionTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSuspendApps

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSuspendApps b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSuspendApps
index 21fd47a..056313d 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSuspendApps
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsSuspendApps
@@ -28,6 +28,6 @@
         target_module='GtsSuspendApps',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=5400)
+        timeout=1080)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsTelecomManagerTests

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsTelecomManagerTests b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsTelecomManagerTests
index f5572dc..596bffc 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsTelecomManagerTests
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsTelecomManagerTests
@@ -28,6 +28,6 @@
         target_module='GtsTelecomManagerTests',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsTelephonyTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsTelephonyTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsTelephonyTestCases
index 1ecbe97..6d67190 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsTelephonyTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsTelephonyTestCases
@@ -28,6 +28,6 @@
         target_module='GtsTelephonyTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsTestHarnessModeTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsTestHarnessModeTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsTestHarnessModeTestCases
index d526a10..79bb1a4 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsTestHarnessModeTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsTestHarnessModeTestCases
@@ -28,6 +28,6 @@
         target_module='GtsTestHarnessModeTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsTetheringTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsTetheringTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsTetheringTestCases
index 401dac5..8fdebfd 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsTetheringTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsTetheringTestCases
@@ -28,6 +28,6 @@
         target_module='GtsTetheringTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsTv

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsTv b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsTv
index f40936c..6218206 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsTv
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsTv
@@ -28,6 +28,6 @@
         target_module='GtsTv',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=7200)
+        timeout=1440)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsUnofficialApisUsageTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsUnofficialApisUsageTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsUnofficialApisUsageTestCases
index 554e6b2..6a9a0de 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsUnofficialApisUsageTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsUnofficialApisUsageTestCases
@@ -28,6 +28,6 @@
         target_module='GtsUnofficialApisUsageTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsUsageStatsTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsUsageStatsTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsUsageStatsTestCases
index 13e1044..1873dd8 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsUsageStatsTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsUsageStatsTestCases
@@ -28,6 +28,6 @@
         target_module='GtsUsageStatsTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsViewTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsViewTestCases b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsViewTestCases
index a5af1e3..f2b6273 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsViewTestCases
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsViewTestCases
@@ -28,6 +28,6 @@
         target_module='GtsViewTestCases',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsWebView

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsWebView b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsWebView
index 2d7017e..4b41d45 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsWebView
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsWebView
@@ -28,6 +28,6 @@
         target_module='GtsWebView',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=5400)
+        timeout=1080)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.7.0_r2.GtsWellbeing

diff --git a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsWellbeing b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsWellbeing
index ca4aae1..47cc408 100644
--- a/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsWellbeing
+++ b/server/site_tests/cheets_GTS_N/control.7.0_r2.GtsWellbeing
@@ -28,6 +28,6 @@
         target_module='GtsWellbeing',
         target_plan=None,
         uri='gs://chromeos-arc-images/cts/bundle/android-gts-7_r2-5805161.zip',
-        timeout=5400)
+        timeout=1080)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsAccountsHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsAccountsHostTestCases b/server/site_tests/cheets_GTS_N/control.GtsAccountsHostTestCases
index 8d968a5..7fa15fe 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsAccountsHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsAccountsHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsAdminTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsAdminTestCases b/server/site_tests/cheets_GTS_N/control.GtsAdminTestCases
index d696b80..06e4738 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsAdminTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsAdminTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsAfwTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsAfwTestCases b/server/site_tests/cheets_GTS_N/control.GtsAfwTestCases
index 6503faa..e50ecdf 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsAfwTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsAfwTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsAndroidAutoDeviceTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsAndroidAutoDeviceTestCases b/server/site_tests/cheets_GTS_N/control.GtsAndroidAutoDeviceTestCases
index ec84414..e5c91a9 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsAndroidAutoDeviceTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsAndroidAutoDeviceTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsAngleHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsAngleHostTestCases b/server/site_tests/cheets_GTS_N/control.GtsAngleHostTestCases
index 0ff1619..2db03e9 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsAngleHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsAngleHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsAppBlacklistDeviceTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsAppBlacklistDeviceTestCases b/server/site_tests/cheets_GTS_N/control.GtsAppBlacklistDeviceTestCases
index f24899e..b8d3724 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsAppBlacklistDeviceTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsAppBlacklistDeviceTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsAppTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsAppTestCases b/server/site_tests/cheets_GTS_N/control.GtsAppTestCases
index 53fcb7d..2e32ce1 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsAppTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsAppTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsArtManagerHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsArtManagerHostTestCases b/server/site_tests/cheets_GTS_N/control.GtsArtManagerHostTestCases
index 3d2743a..cae5f5b 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsArtManagerHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsArtManagerHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsAssistIntentTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsAssistIntentTestCases b/server/site_tests/cheets_GTS_N/control.GtsAssistIntentTestCases
index a83526d..2e99217 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsAssistIntentTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsAssistIntentTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsAssistantHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsAssistantHostTestCases b/server/site_tests/cheets_GTS_N/control.GtsAssistantHostTestCases
index 1b80800..1baaaac 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsAssistantHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsAssistantHostTestCases
@@ -30,6 +30,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsBackupHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsBackupHostTestCases b/server/site_tests/cheets_GTS_N/control.GtsBackupHostTestCases
index 11d2cdf..2ebb930 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsBackupHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsBackupHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsBackupTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsBackupTestCases b/server/site_tests/cheets_GTS_N/control.GtsBackupTestCases
index e431f2d..be312d6 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsBackupTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsBackupTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsBootStatsTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsBootStatsTestCases b/server/site_tests/cheets_GTS_N/control.GtsBootStatsTestCases
index 6673873..22b158f 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsBootStatsTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsBootStatsTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsCallLogTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsCallLogTestCases b/server/site_tests/cheets_GTS_N/control.GtsCallLogTestCases
index f6a5030..a44fb7b 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsCallLogTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsCallLogTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsCameraTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsCameraTestCases b/server/site_tests/cheets_GTS_N/control.GtsCameraTestCases
index 3b06fc8..246a3a5 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsCameraTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsCameraTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsCastHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsCastHostTestCases b/server/site_tests/cheets_GTS_N/control.GtsCastHostTestCases
index 9fd19a0..c5aaad9 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsCastHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsCastHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsContactsAppDeviceTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsContactsAppDeviceTestCases b/server/site_tests/cheets_GTS_N/control.GtsContactsAppDeviceTestCases
index 9f9ba53..8f65843 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsContactsAppDeviceTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsContactsAppDeviceTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsContactsTest

diff --git a/server/site_tests/cheets_GTS_N/control.GtsContactsTest b/server/site_tests/cheets_GTS_N/control.GtsContactsTest
index d4005eb..afa01e1 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsContactsTest
+++ b/server/site_tests/cheets_GTS_N/control.GtsContactsTest
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsContentTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsContentTestCases b/server/site_tests/cheets_GTS_N/control.GtsContentTestCases
index 82a2f62..b9a8b7f 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsContentTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsContentTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsDeviceConfigTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsDeviceConfigTestCases b/server/site_tests/cheets_GTS_N/control.GtsDeviceConfigTestCases
index 33ac258..9715596 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsDeviceConfigTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsDeviceConfigTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsDexModuleRegistrationTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsDexModuleRegistrationTestCases b/server/site_tests/cheets_GTS_N/control.GtsDexModuleRegistrationTestCases
index 5a67053..0c22220 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsDexModuleRegistrationTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsDexModuleRegistrationTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsDialerDeviceTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsDialerDeviceTestCases b/server/site_tests/cheets_GTS_N/control.GtsDialerDeviceTestCases
index 9a71f98..7a2c17b 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsDialerDeviceTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsDialerDeviceTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsDozeDeviceTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsDozeDeviceTestCases b/server/site_tests/cheets_GTS_N/control.GtsDozeDeviceTestCases
index 532b066..4cb0ff8 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsDozeDeviceTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsDozeDeviceTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsEdiHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsEdiHostTestCases b/server/site_tests/cheets_GTS_N/control.GtsEdiHostTestCases
index 63c33b1..742c782 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsEdiHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsEdiHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsFeaturesTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsFeaturesTestCases b/server/site_tests/cheets_GTS_N/control.GtsFeaturesTestCases
index ef35162..7b96cba 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsFeaturesTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsFeaturesTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsGameDeviceHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsGameDeviceHostTestCases b/server/site_tests/cheets_GTS_N/control.GtsGameDeviceHostTestCases
index 6c5d4d5..c27ff81 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsGameDeviceHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsGameDeviceHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsGraphicsHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsGraphicsHostTestCases b/server/site_tests/cheets_GTS_N/control.GtsGraphicsHostTestCases
index d3bee1d..ae9b8b6 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsGraphicsHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsGraphicsHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsHomeHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsHomeHostTestCases b/server/site_tests/cheets_GTS_N/control.GtsHomeHostTestCases
index 9606cdc..09100b7 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsHomeHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsHomeHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsIncidentConfirmationTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsIncidentConfirmationTestCases b/server/site_tests/cheets_GTS_N/control.GtsIncidentConfirmationTestCases
index 2877bd8..bdf7f3b 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsIncidentConfirmationTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsIncidentConfirmationTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsIncidentManagerTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsIncidentManagerTestCases b/server/site_tests/cheets_GTS_N/control.GtsIncidentManagerTestCases
index 8acc7de..a035bf0 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsIncidentManagerTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsIncidentManagerTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsInstallPackagesWhitelistDeviceTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsInstallPackagesWhitelistDeviceTestCases b/server/site_tests/cheets_GTS_N/control.GtsInstallPackagesWhitelistDeviceTestCases
index d32d8cb..2e8e6f6 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsInstallPackagesWhitelistDeviceTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsInstallPackagesWhitelistDeviceTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsInstantAppsHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsInstantAppsHostTestCases b/server/site_tests/cheets_GTS_N/control.GtsInstantAppsHostTestCases
index a48df36..31ffd5a 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsInstantAppsHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsInstantAppsHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsLargeApkHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsLargeApkHostTestCases b/server/site_tests/cheets_GTS_N/control.GtsLargeApkHostTestCases
index 0eecaf7..714b0d5 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsLargeApkHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsLargeApkHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsLauncherHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsLauncherHostTestCases b/server/site_tests/cheets_GTS_N/control.GtsLauncherHostTestCases
index 7afa555..9f56920 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsLauncherHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsLauncherHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsLocationHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsLocationHostTestCases b/server/site_tests/cheets_GTS_N/control.GtsLocationHostTestCases
index 61c4cf0..f245a0b 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsLocationHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsLocationHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsLocationTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsLocationTestCases b/server/site_tests/cheets_GTS_N/control.GtsLocationTestCases
index 892721d..7db3ceb 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsLocationTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsLocationTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsMediaTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsMediaTestCases b/server/site_tests/cheets_GTS_N/control.GtsMediaTestCases
index 50f190f..2f53f7b 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsMediaTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsMediaTestCases
@@ -30,6 +30,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=28800)
+        timeout=14400)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsMemoryHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsMemoryHostTestCases b/server/site_tests/cheets_GTS_N/control.GtsMemoryHostTestCases
index 32001a7..16d7b22 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsMemoryHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsMemoryHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsMemoryTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsMemoryTestCases b/server/site_tests/cheets_GTS_N/control.GtsMemoryTestCases
index c3bf61e..af380c3 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsMemoryTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsMemoryTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsModuleMetadataTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsModuleMetadataTestCases b/server/site_tests/cheets_GTS_N/control.GtsModuleMetadataTestCases
index 042f9b1..4c3713c 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsModuleMetadataTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsModuleMetadataTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsNetStatsHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsNetStatsHostTestCases b/server/site_tests/cheets_GTS_N/control.GtsNetStatsHostTestCases
index c3747c7..d427431 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsNetStatsHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsNetStatsHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsNetTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsNetTestCases b/server/site_tests/cheets_GTS_N/control.GtsNetTestCases
index 5423242..438b717 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsNetTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsNetTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsNetworkStackHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsNetworkStackHostTestCases b/server/site_tests/cheets_GTS_N/control.GtsNetworkStackHostTestCases
index 916a4bc..3b70846 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsNetworkStackHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsNetworkStackHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsNetworkWatchlistTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsNetworkWatchlistTestCases b/server/site_tests/cheets_GTS_N/control.GtsNetworkWatchlistTestCases
index 23b6c46..13ed99f 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsNetworkWatchlistTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsNetworkWatchlistTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsNmgiarcTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsNmgiarcTestCases b/server/site_tests/cheets_GTS_N/control.GtsNmgiarcTestCases
index 07527aa..674af47 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsNmgiarcTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsNmgiarcTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsNoPermissionTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsNoPermissionTestCases b/server/site_tests/cheets_GTS_N/control.GtsNoPermissionTestCases
index e89d6ec..cdac981 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsNoPermissionTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsNoPermissionTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsNoPermissionTestCases25

diff --git a/server/site_tests/cheets_GTS_N/control.GtsNoPermissionTestCases25 b/server/site_tests/cheets_GTS_N/control.GtsNoPermissionTestCases25
index c52ecd0..4044ed0 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsNoPermissionTestCases25
+++ b/server/site_tests/cheets_GTS_N/control.GtsNoPermissionTestCases25
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsNotificationTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsNotificationTestCases b/server/site_tests/cheets_GTS_N/control.GtsNotificationTestCases
index 77130fd..acb7cfc 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsNotificationTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsNotificationTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsOemLockServiceTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsOemLockServiceTestCases b/server/site_tests/cheets_GTS_N/control.GtsOemLockServiceTestCases
index bc0e96d..1df08cf 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsOemLockServiceTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsOemLockServiceTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsOsTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsOsTestCases b/server/site_tests/cheets_GTS_N/control.GtsOsTestCases
index 870ac68..32eca71 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsOsTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsOsTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=900)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsPackageInstallTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsPackageInstallTestCases b/server/site_tests/cheets_GTS_N/control.GtsPackageInstallTestCases
index c3950e5..05099da 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsPackageInstallTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsPackageInstallTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsPackageInstallerTapjackingTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsPackageInstallerTapjackingTestCases b/server/site_tests/cheets_GTS_N/control.GtsPackageInstallerTapjackingTestCases
index 5977452..e58ef72 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsPackageInstallerTapjackingTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsPackageInstallerTapjackingTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsPackageManagerHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsPackageManagerHostTestCases b/server/site_tests/cheets_GTS_N/control.GtsPackageManagerHostTestCases
index 48c0e34..b9a3fb9 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsPackageManagerHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsPackageManagerHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsPackageNameCertPairsDeviceTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsPackageNameCertPairsDeviceTestCases b/server/site_tests/cheets_GTS_N/control.GtsPackageNameCertPairsDeviceTestCases
index 071f78c..0381373 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsPackageNameCertPairsDeviceTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsPackageNameCertPairsDeviceTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsPackageUninstallTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsPackageUninstallTestCases b/server/site_tests/cheets_GTS_N/control.GtsPackageUninstallTestCases
index 8773bf6..f805e76 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsPackageUninstallTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsPackageUninstallTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsPartnerBookmarksTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsPartnerBookmarksTestCases b/server/site_tests/cheets_GTS_N/control.GtsPartnerBookmarksTestCases
index 22da20a..39bd19e 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsPartnerBookmarksTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsPartnerBookmarksTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsPermissionTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsPermissionTestCases b/server/site_tests/cheets_GTS_N/control.GtsPermissionTestCases
index aad27b9..8d64f4a 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsPermissionTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsPermissionTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsPlacementTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsPlacementTestCases b/server/site_tests/cheets_GTS_N/control.GtsPlacementTestCases
index 37ff381..f5d8b01 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsPlacementTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsPlacementTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsPlayAutoInstallTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsPlayAutoInstallTestCases b/server/site_tests/cheets_GTS_N/control.GtsPlayAutoInstallTestCases
index dcfb484..c2c097f 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsPlayAutoInstallTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsPlayAutoInstallTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsPlayStoreHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsPlayStoreHostTestCases b/server/site_tests/cheets_GTS_N/control.GtsPlayStoreHostTestCases
index 9b2daef..8d0262a 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsPlayStoreHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsPlayStoreHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsPrintTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsPrintTestCases b/server/site_tests/cheets_GTS_N/control.GtsPrintTestCases
index 28826df..691fb66 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsPrintTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsPrintTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsPrivacyTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsPrivacyTestCases b/server/site_tests/cheets_GTS_N/control.GtsPrivacyTestCases
index f417f0a..f9c7316 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsPrivacyTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsPrivacyTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsPrivilegedUpdatePreparer

diff --git a/server/site_tests/cheets_GTS_N/control.GtsPrivilegedUpdatePreparer b/server/site_tests/cheets_GTS_N/control.GtsPrivilegedUpdatePreparer
index de28b30..8ca742a 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsPrivilegedUpdatePreparer
+++ b/server/site_tests/cheets_GTS_N/control.GtsPrivilegedUpdatePreparer
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsPropertiesTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsPropertiesTestCases b/server/site_tests/cheets_GTS_N/control.GtsPropertiesTestCases
index 60641aa..8bb9aca 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsPropertiesTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsPropertiesTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsRegulationComplianceTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsRegulationComplianceTestCases b/server/site_tests/cheets_GTS_N/control.GtsRegulationComplianceTestCases
index af2fc28..08034d5 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsRegulationComplianceTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsRegulationComplianceTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsRlzTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsRlzTestCases b/server/site_tests/cheets_GTS_N/control.GtsRlzTestCases
index 04a79dd..4504f3a 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsRlzTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsRlzTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsSampleDeviceTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsSampleDeviceTestCases b/server/site_tests/cheets_GTS_N/control.GtsSampleDeviceTestCases
index dc52417..669fde0 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsSampleDeviceTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsSampleDeviceTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsSampleDynamicConfigTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsSampleDynamicConfigTestCases b/server/site_tests/cheets_GTS_N/control.GtsSampleDynamicConfigTestCases
index 1761c85..7f697f6 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsSampleDynamicConfigTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsSampleDynamicConfigTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsSampleHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsSampleHostTestCases b/server/site_tests/cheets_GTS_N/control.GtsSampleHostTestCases
index c6050ff..21bc770 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsSampleHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsSampleHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsScreenshotHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsScreenshotHostTestCases b/server/site_tests/cheets_GTS_N/control.GtsScreenshotHostTestCases
index 69a5fa0..f9016a9 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsScreenshotHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsScreenshotHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsSearchHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsSearchHostTestCases b/server/site_tests/cheets_GTS_N/control.GtsSearchHostTestCases
index 7618f64..2397415 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsSearchHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsSearchHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsSecurityHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsSecurityHostTestCases b/server/site_tests/cheets_GTS_N/control.GtsSecurityHostTestCases
index 96672e0..df96cbc 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsSecurityHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsSecurityHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsSensorHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsSensorHostTestCases b/server/site_tests/cheets_GTS_N/control.GtsSensorHostTestCases
index 7103d34..3d88f2a 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsSensorHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsSensorHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsSettingsHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsSettingsHostTestCases b/server/site_tests/cheets_GTS_N/control.GtsSettingsHostTestCases
index c38bc70..4e6e86b 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsSettingsHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsSettingsHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsSettingsTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsSettingsTestCases b/server/site_tests/cheets_GTS_N/control.GtsSettingsTestCases
index 84640b9..2769c2d 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsSettingsTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsSettingsTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsSetupWizardHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsSetupWizardHostTestCases b/server/site_tests/cheets_GTS_N/control.GtsSetupWizardHostTestCases
index fcbd542..0535831 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsSetupWizardHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsSetupWizardHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsSetupWizardNoPermissionTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsSetupWizardNoPermissionTestCases b/server/site_tests/cheets_GTS_N/control.GtsSetupWizardNoPermissionTestCases
index 7d914f7..3f58f77 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsSetupWizardNoPermissionTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsSetupWizardNoPermissionTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsSimAppDialogTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsSimAppDialogTestCases b/server/site_tests/cheets_GTS_N/control.GtsSimAppDialogTestCases
index b664ca7..208aa59 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsSimAppDialogTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsSimAppDialogTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsSmartBatteryDeviceTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsSmartBatteryDeviceTestCases b/server/site_tests/cheets_GTS_N/control.GtsSmartBatteryDeviceTestCases
index 6a2bf1b..ec3380a 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsSmartBatteryDeviceTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsSmartBatteryDeviceTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsSsaidHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsSsaidHostTestCases b/server/site_tests/cheets_GTS_N/control.GtsSsaidHostTestCases
index eb0a181..8a45b1c 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsSsaidHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsSsaidHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsStatsdHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsStatsdHostTestCases b/server/site_tests/cheets_GTS_N/control.GtsStatsdHostTestCases
index 50a28d4..75ad1a9 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsStatsdHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsStatsdHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsStorageTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsStorageTestCases b/server/site_tests/cheets_GTS_N/control.GtsStorageTestCases
index 829c243..28b297e 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsStorageTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsStorageTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsSupervisionTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsSupervisionTestCases b/server/site_tests/cheets_GTS_N/control.GtsSupervisionTestCases
index 8e084d6..4ea9622 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsSupervisionTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsSupervisionTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsSuspendAppsPermissionTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsSuspendAppsPermissionTestCases b/server/site_tests/cheets_GTS_N/control.GtsSuspendAppsPermissionTestCases
index 3de136d..d6c9dbe 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsSuspendAppsPermissionTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsSuspendAppsPermissionTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsSuspendAppsTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsSuspendAppsTestCases b/server/site_tests/cheets_GTS_N/control.GtsSuspendAppsTestCases
index 5cffaf2..8e7746e 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsSuspendAppsTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsSuspendAppsTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsTelecomManagerTests

diff --git a/server/site_tests/cheets_GTS_N/control.GtsTelecomManagerTests b/server/site_tests/cheets_GTS_N/control.GtsTelecomManagerTests
index c9bfb15..2e8bd02 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsTelecomManagerTests
+++ b/server/site_tests/cheets_GTS_N/control.GtsTelecomManagerTests
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsTelephonyTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsTelephonyTestCases b/server/site_tests/cheets_GTS_N/control.GtsTelephonyTestCases
index 85f0a69..7b4692c 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsTelephonyTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsTelephonyTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsTestHarnessModeTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsTestHarnessModeTestCases b/server/site_tests/cheets_GTS_N/control.GtsTestHarnessModeTestCases
index 55a31a8..a0d8f83 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsTestHarnessModeTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsTestHarnessModeTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsTetheringTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsTetheringTestCases b/server/site_tests/cheets_GTS_N/control.GtsTetheringTestCases
index 4d7c5f0..3d6f30f 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsTetheringTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsTetheringTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsTvBugReportTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsTvBugReportTestCases b/server/site_tests/cheets_GTS_N/control.GtsTvBugReportTestCases
index d7f14bd..1090662 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsTvBugReportTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsTvBugReportTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsTvHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsTvHostTestCases b/server/site_tests/cheets_GTS_N/control.GtsTvHostTestCases
index 936abdb..6bb6a4d 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsTvHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsTvHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsTvTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsTvTestCases b/server/site_tests/cheets_GTS_N/control.GtsTvTestCases
index 4c0b017..0485d4b 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsTvTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsTvTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsUnofficialApisUsageTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsUnofficialApisUsageTestCases b/server/site_tests/cheets_GTS_N/control.GtsUnofficialApisUsageTestCases
index db99cf2..5e9c218 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsUnofficialApisUsageTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsUnofficialApisUsageTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsUsageStatsTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsUsageStatsTestCases b/server/site_tests/cheets_GTS_N/control.GtsUsageStatsTestCases
index 03a4b2b..013c0b0 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsUsageStatsTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsUsageStatsTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsViewTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsViewTestCases b/server/site_tests/cheets_GTS_N/control.GtsViewTestCases
index 086e7a4..f0b1a8f 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsViewTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsViewTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsWebViewHostTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsWebViewHostTestCases b/server/site_tests/cheets_GTS_N/control.GtsWebViewHostTestCases
index a372701..1a9a0ed 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsWebViewHostTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsWebViewHostTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsWebViewTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsWebViewTestCases b/server/site_tests/cheets_GTS_N/control.GtsWebViewTestCases
index 619fed1..39194a9 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsWebViewTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsWebViewTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsWellbeingPermissionPolicyTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsWellbeingPermissionPolicyTestCases b/server/site_tests/cheets_GTS_N/control.GtsWellbeingPermissionPolicyTestCases
index 605492f..82d5209 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsWellbeingPermissionPolicyTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsWellbeingPermissionPolicyTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)

server/site_tests/cheets_GTS_N/control.GtsWellbeingTestCases

diff --git a/server/site_tests/cheets_GTS_N/control.GtsWellbeingTestCases b/server/site_tests/cheets_GTS_N/control.GtsWellbeingTestCases
index 9b5995c..1c37c46 100644
--- a/server/site_tests/cheets_GTS_N/control.GtsWellbeingTestCases
+++ b/server/site_tests/cheets_GTS_N/control.GtsWellbeingTestCases
@@ -29,6 +29,6 @@
         target_plan=None,
         retry_manual_tests=True,
         warn_on_test_retry=False,
-        timeout=3600)
+        timeout=720)
 
 parallel_simple(run_TS, machines)