diff --git a/server/cros/tradefed/generate_controlfiles_CTS_P.py b/server/cros/tradefed/generate_controlfiles_CTS_P.py
index a5ebadc..3a26f16 100755
--- a/server/cros/tradefed/generate_controlfiles_CTS_P.py
+++ b/server/cros/tradefed/generate_controlfiles_CTS_P.py
@@ -58,9 +58,7 @@
 CONFIG['CTS_MAX_RETRIES'] = {
     'CtsDeqpTestCases':         15,  # TODO(b/126787654)
     'CtsGraphicsTestCases':      5,  # TODO(b/155056869)
-    'CtsIncidentHostTestCases': 30,  # TODO(b/128695132)
     'CtsSensorTestCases':       30,  # TODO(b/124528412)
-    'CtsUiAutomationTestCases':  9,  # TODO(b/145270500)
 }
 
 # Timeout in hours.
diff --git a/server/cros/tradefed/tradefed_test.py b/server/cros/tradefed/tradefed_test.py
index 0a81e39..6f3c323 100644
--- a/server/cros/tradefed/tradefed_test.py
+++ b/server/cros/tradefed/tradefed_test.py
@@ -54,7 +54,7 @@
     # parameter in control files can override the count, within the
     # _BRANCH_MAX_RETRY limit below.
     _BRANCH_DEFAULT_RETRY = [(0, 5), (1, 10)]  # dev=5, beta=stable=10
-    _BRANCH_MAX_RETRY = [(0, 5), (1, 30),      # dev=5, beta=30, stable=99
+    _BRANCH_MAX_RETRY = [(0, 12), (1, 30),      # dev=12, beta=30, stable=99
         (constants.APPROXIMATE_STABLE_BRANCH_NUMBER, 99)]
     # TODO(kinaba): betty-arcnext
     _BOARD_MAX_RETRY = {'betty': 0, 'zork': 0}
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r12.arm.CtsIncidentHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r12.arm.CtsIncidentHostTestCases
index ced23ce..3e7e0db 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r12.arm.CtsIncidentHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r12.arm.CtsIncidentHostTestCases
@@ -20,7 +20,6 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        max_retry=30,
         tag='9.0_r12.arm.CtsIncidentHostTestCases',
         test_name='cheets_CTS_P.9.0_r12.arm.CtsIncidentHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsIncidentHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r12.arm.CtsUi b/server/site_tests/cheets_CTS_P/control.9.0_r12.arm.CtsUi
index eb0b273..1510766 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r12.arm.CtsUi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r12.arm.CtsUi
@@ -20,7 +20,6 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        max_retry=9,
         tag='9.0_r12.arm.CtsUi',
         test_name='cheets_CTS_P.9.0_r12.arm.CtsUi',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiAutomationTestCases', '--include-filter', 'CtsUiDeviceTestCases', '--include-filter', 'CtsUiRenderingTestCases', '--logcat-on-failure', '--dynamic-config-url='],
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r12.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r12.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
index c6b2b55..f95cb17 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r12.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r12.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
@@ -20,7 +20,7 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        max_retry=30,
+        max_retry=9,
         tag='9.0_r12.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases',
         test_name='cheets_CTS_P.9.0_r12.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFragmentTestCases', '--include-filter', 'CtsFragmentTestCasesSdk26', '--include-filter', 'CtsGestureTestCases', '--include-filter', 'CtsGpuToolsHostTestCases', '--include-filter', 'CtsGraphicsTestCases', '--include-filter', 'CtsHardwareTestCases', '--include-filter', 'CtsHarmfulAppWarningHostTestCases', '--include-filter', 'CtsHiddenApiBlacklistApi27TestCases', '--include-filter', 'CtsHiddenApiBlacklistCurrentApiTestCases', '--include-filter', 'CtsHiddenApiBlacklistDebugClassTestCases', '--include-filter', 'CtsHiddenApiKillswitchDebugClassTestCases', '--include-filter', 'CtsHiddenApiKillswitchWhitelistTestCases', '--include-filter', 'CtsHiddenApiKillswitchWildcardTestCases', '--include-filter', 'CtsHostTzDataTests', '--include-filter', 'CtsHostsideNetworkTests', '--include-filter', 'CtsHostsideNumberBlockingTestCases', '--include-filter', 'CtsHostsideTvTests', '--include-filter', 'CtsHostsideWebViewTests', '--include-filter', 'CtsIcuTestCases', '--include-filter', 'CtsIncidentHostTestCases', '--include-filter', 'CtsInlineMockingTestCases', '--include-filter', 'CtsInputMethodServiceHostTestCases', '--include-filter', 'CtsInputMethodTestCases', '--include-filter', 'CtsIntentSignatureTestCases', '--include-filter', 'CtsJankDeviceTestCases', '--include-filter', 'CtsJdwpSecurityHostTestCases', '--include-filter', 'CtsJdwpTestCases', '--include-filter', 'CtsJniTestCases', '--include-filter', 'CtsJobSchedulerSharedUidTestCases', '--include-filter', 'CtsJobSchedulerTestCases', '--logcat-on-failure'],
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r12.x86.CtsIncidentHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r12.x86.CtsIncidentHostTestCases
index 5d2e495..ca231f8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r12.x86.CtsIncidentHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r12.x86.CtsIncidentHostTestCases
@@ -20,7 +20,6 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        max_retry=30,
         tag='9.0_r12.x86.CtsIncidentHostTestCases',
         test_name='cheets_CTS_P.9.0_r12.x86.CtsIncidentHostTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsIncidentHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r12.x86.CtsUi b/server/site_tests/cheets_CTS_P/control.9.0_r12.x86.CtsUi
index 49e7638..01379cb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r12.x86.CtsUi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r12.x86.CtsUi
@@ -20,7 +20,6 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        max_retry=9,
         tag='9.0_r12.x86.CtsUi',
         test_name='cheets_CTS_P.9.0_r12.x86.CtsUi',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiAutomationTestCases', '--include-filter', 'CtsUiDeviceTestCases', '--include-filter', 'CtsUiRenderingTestCases', '--logcat-on-failure', '--dynamic-config-url='],
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r12.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r12.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
index 62024d1..fe2e4e7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r12.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r12.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
@@ -20,7 +20,7 @@
         'cheets_CTS_P',
         hosts=host_list,
         iterations=1,
-        max_retry=30,
+        max_retry=9,
         tag='9.0_r12.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases',
         test_name='cheets_CTS_P.9.0_r12.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases',
         run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFragmentTestCases', '--include-filter', 'CtsFragmentTestCasesSdk26', '--include-filter', 'CtsGestureTestCases', '--include-filter', 'CtsGpuToolsHostTestCases', '--include-filter', 'CtsGraphicsTestCases', '--include-filter', 'CtsHardwareTestCases', '--include-filter', 'CtsHarmfulAppWarningHostTestCases', '--include-filter', 'CtsHiddenApiBlacklistApi27TestCases', '--include-filter', 'CtsHiddenApiBlacklistCurrentApiTestCases', '--include-filter', 'CtsHiddenApiBlacklistDebugClassTestCases', '--include-filter', 'CtsHiddenApiKillswitchDebugClassTestCases', '--include-filter', 'CtsHiddenApiKillswitchWhitelistTestCases', '--include-filter', 'CtsHiddenApiKillswitchWildcardTestCases', '--include-filter', 'CtsHostTzDataTests', '--include-filter', 'CtsHostsideNetworkTests', '--include-filter', 'CtsHostsideNumberBlockingTestCases', '--include-filter', 'CtsHostsideTvTests', '--include-filter', 'CtsHostsideWebViewTests', '--include-filter', 'CtsIcuTestCases', '--include-filter', 'CtsIncidentHostTestCases', '--include-filter', 'CtsInlineMockingTestCases', '--include-filter', 'CtsInputMethodServiceHostTestCases', '--include-filter', 'CtsInputMethodTestCases', '--include-filter', 'CtsIntentSignatureTestCases', '--include-filter', 'CtsJankDeviceTestCases', '--include-filter', 'CtsJdwpSecurityHostTestCases', '--include-filter', 'CtsJdwpTestCases', '--include-filter', 'CtsJniTestCases', '--include-filter', 'CtsJobSchedulerSharedUidTestCases', '--include-filter', 'CtsJobSchedulerTestCases', '--logcat-on-failure'],