diff --git a/server/site_tests/cheets_CTS_Instant/control.9.0_r17.arm.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases b/server/site_tests/cheets_CTS_Instant/control.9.0_r17.arm.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases
index 0f0590f..944ae01 100644
--- a/server/site_tests/cheets_CTS_Instant/control.9.0_r17.arm.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.9.0_r17.arm.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAccessibilityServiceTestCases, CtsAccessibilityTestCases, CtsAccountManagerTestCases, CtsAnimationTestCases, CtsAppSecurityHostTestCases, CtsAppWidgetTestCases, CtsAutoFillServiceTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.9.0_r17.arm.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases b/server/site_tests/cheets_CTS_Instant/control.9.0_r17.arm.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases
index 8b4a0b3..e601d09 100644
--- a/server/site_tests/cheets_CTS_Instant/control.9.0_r17.arm.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.9.0_r17.arm.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsBackgroundRestrictionsTestCases, CtsCameraTestCases, CtsColorModeTestCases, CtsDatabaseTestCases, CtsDisplayTestCases, CtsDpiTestCases, CtsDreamsTestCases, CtsEdiHostTestCases, CtsExternalSourcesTestCases, CtsFileSystemTestCases, CtsFragmentTestCases, CtsFragmentTestCasesSdk26, CtsGestureTestCases, CtsHostsideWebViewTests, CtsInputMethodServiceHostTestCases, CtsInputMethodTestCases, CtsLocation2TestCases, CtsLocationTestCases, CtsMediaHostTestCases, CtsMediaTestCases, CtsMultiUserTestCases, CtsOsHostTestCases, CtsPdfTestCases, CtsPermission2TestCases, CtsPermissionTestCases, CtsPreference2TestCases, CtsPreferenceTestCases, CtsPrintTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.9.0_r17.arm.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases b/server/site_tests/cheets_CTS_Instant/control.9.0_r17.arm.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases
index 70babc0..5483be9 100644
--- a/server/site_tests/cheets_CTS_Instant/control.9.0_r17.arm.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.9.0_r17.arm.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSampleDeviceTestCases, CtsSampleHostTestCases, CtsSystemUiTestCases, CtsTextTestCases, CtsToastTestCases, CtsUiAutomationTestCases, CtsUiDeviceTestCases, CtsUidIsolationTestCases, CtsUsageStatsTestCases, CtsUsbTests, CtsViewTestCases, CtsWidgetTestCases, CtsWindowManagerDeviceTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.9.0_r17.arm.tradefed-run-collect-tests-only-internal b/server/site_tests/cheets_CTS_Instant/control.9.0_r17.arm.tradefed-run-collect-tests-only-internal
index be4944d..ec4be4e 100644
--- a/server/site_tests/cheets_CTS_Instant/control.9.0_r17.arm.tradefed-run-collect-tests-only-internal
+++ b/server/site_tests/cheets_CTS_Instant/control.9.0_r17.arm.tradefed-run-collect-tests-only-internal
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LENGTHY'
 MAX_RESULT_SIZE_KB = 1024000
+PY_VERSION = 3
 DOC = 'Run all of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.9.0_r17.x86.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases b/server/site_tests/cheets_CTS_Instant/control.9.0_r17.x86.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases
index dafafc2..1dbb1ff 100644
--- a/server/site_tests/cheets_CTS_Instant/control.9.0_r17.x86.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.9.0_r17.x86.all.CtsAccessibilityServiceTestCases_-_CtsAutoFillServiceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAccessibilityServiceTestCases, CtsAccessibilityTestCases, CtsAccountManagerTestCases, CtsAnimationTestCases, CtsAppSecurityHostTestCases, CtsAppWidgetTestCases, CtsAutoFillServiceTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.9.0_r17.x86.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases b/server/site_tests/cheets_CTS_Instant/control.9.0_r17.x86.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases
index e23ceb1..3ec651f 100644
--- a/server/site_tests/cheets_CTS_Instant/control.9.0_r17.x86.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.9.0_r17.x86.all.CtsBackgroundRestrictionsTestCases_-_CtsPrintTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsBackgroundRestrictionsTestCases, CtsCameraTestCases, CtsColorModeTestCases, CtsDatabaseTestCases, CtsDisplayTestCases, CtsDpiTestCases, CtsDreamsTestCases, CtsEdiHostTestCases, CtsExternalSourcesTestCases, CtsFileSystemTestCases, CtsFragmentTestCases, CtsFragmentTestCasesSdk26, CtsGestureTestCases, CtsHostsideWebViewTests, CtsInputMethodServiceHostTestCases, CtsInputMethodTestCases, CtsLocation2TestCases, CtsLocationTestCases, CtsMediaHostTestCases, CtsMediaTestCases, CtsMultiUserTestCases, CtsOsHostTestCases, CtsPdfTestCases, CtsPermission2TestCases, CtsPermissionTestCases, CtsPreference2TestCases, CtsPreferenceTestCases, CtsPrintTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.9.0_r17.x86.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases b/server/site_tests/cheets_CTS_Instant/control.9.0_r17.x86.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases
index 555c734..3fd9006 100644
--- a/server/site_tests/cheets_CTS_Instant/control.9.0_r17.x86.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.9.0_r17.x86.all.CtsSampleDeviceTestCases_-_CtsWindowManagerDeviceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSampleDeviceTestCases, CtsSampleHostTestCases, CtsSystemUiTestCases, CtsTextTestCases, CtsToastTestCases, CtsUiAutomationTestCases, CtsUiDeviceTestCases, CtsUidIsolationTestCases, CtsUsageStatsTestCases, CtsUsbTests, CtsViewTestCases, CtsWidgetTestCases, CtsWindowManagerDeviceTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.9.0_r17.x86.tradefed-run-collect-tests-only-internal b/server/site_tests/cheets_CTS_Instant/control.9.0_r17.x86.tradefed-run-collect-tests-only-internal
index 70a4d6c..a8b2547 100644
--- a/server/site_tests/cheets_CTS_Instant/control.9.0_r17.x86.tradefed-run-collect-tests-only-internal
+++ b/server/site_tests/cheets_CTS_Instant/control.9.0_r17.x86.tradefed-run-collect-tests-only-internal
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LENGTHY'
 MAX_RESULT_SIZE_KB = 1024000
+PY_VERSION = 3
 DOC = 'Run all of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccessibilityServiceTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccessibilityServiceTestCases
index 5d60f15..215cd90 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccessibilityServiceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccessibilityServiceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAccessibilityServiceTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccessibilityTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccessibilityTestCases
index 2567978..bd142dc 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccessibilityTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccessibilityTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAccessibilityTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccountManagerTestCases
index d6fed05..8e40093 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccountManagerTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAccountManagerTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAnimationTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAnimationTestCases
index cfd8526..1dc9752 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAnimationTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAnimationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAnimationTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAppSecurityHostTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAppSecurityHostTestCases
index 1655c7e..afc0a1d 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAppSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAppSecurityHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAppSecurityHostTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAppWidgetTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAppWidgetTestCases
index 84d1097..64d14e4 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAppWidgetTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAppWidgetTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAppWidgetTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAutoFillServiceTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAutoFillServiceTestCases
index c272773..6e100d0 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAutoFillServiceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAutoFillServiceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAutoFillServiceTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsBackgroundRestrictionsTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsBackgroundRestrictionsTestCases
index 4dfe1c7..1255322 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsBackgroundRestrictionsTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsBackgroundRestrictionsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsBackgroundRestrictionsTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsCameraTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsCameraTestCases
index 9e86b1b..0eb082b 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsCameraTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsCameraTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsCameraTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsColorModeTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsColorModeTestCases
index 6b786a0..0bfc1f2 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsColorModeTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsColorModeTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsColorModeTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsDatabaseTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsDatabaseTestCases
index d0614d8..2d7cab2 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsDatabaseTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDatabaseTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsDisplayTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsDisplayTestCases
index 3149951..0d1df50 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsDisplayTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsDisplayTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDisplayTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsDpiTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsDpiTestCases
index c7ac3c0..f284c54 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsDpiTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsDpiTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDpiTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsDreamsTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsDreamsTestCases
index 0cd1f18..05ad4f3 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsDreamsTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsDreamsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDreamsTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsEdiHostTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsEdiHostTestCases
index 13c611a..5f8e4d4 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsEdiHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsEdiHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsEdiHostTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsExternalSourcesTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsExternalSourcesTestCases
index a2879db..d08b72a 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsExternalSourcesTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsExternalSourcesTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsExternalSourcesTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsFileSystemTestCases
index 544fee7..7e27872 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsFileSystemTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsFileSystemTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsFragmentTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsFragmentTestCases
index 94b10fe..4b69867 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsFragmentTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsFragmentTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsFragmentTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsFragmentTestCasesSdk26 b/server/site_tests/cheets_CTS_Instant/control.arm.CtsFragmentTestCasesSdk26
index 478b1d2..082c13a 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsFragmentTestCasesSdk26
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsFragmentTestCasesSdk26
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsFragmentTestCasesSdk26 of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsGestureTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsGestureTestCases
index a03f24f..a800ece 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsGestureTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsGestureTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsGestureTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsHostsideWebViewTests b/server/site_tests/cheets_CTS_Instant/control.arm.CtsHostsideWebViewTests
index 9f3f799..bcacc44 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsHostsideWebViewTests
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsHostsideWebViewTests
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHostsideWebViewTests of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsInputMethodServiceHostTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsInputMethodServiceHostTestCases
index bc41e45..4ea6cac 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsInputMethodServiceHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsInputMethodServiceHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsInputMethodServiceHostTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsInputMethodTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsInputMethodTestCases
index 1942fbc..ecefc21 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsInputMethodTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsInputMethodTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsInputMethodTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsLocation2TestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsLocation2TestCases
index ec4cfe5..c096e3d 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsLocation2TestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsLocation2TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLocation2TestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsLocationTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsLocationTestCases
index 568c9b1..7256507 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsLocationTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsLocationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLocationTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsMediaHostTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsMediaHostTestCases
index bfe79d9..c80baf0 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsMediaHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaHostTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsMediaTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsMediaTestCases
index 67c14b9..040e4e3 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsMediaTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsMediaTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsMediaTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsMultiUserTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsMultiUserTestCases
index 7e359e6..3658257 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsMultiUserTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsMultiUserTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMultiUserTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsOsHostTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsOsHostTestCases
index eda978a..c0f7c84 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsOsHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsOsHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsOsHostTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPdfTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPdfTestCases
index 6ea9530..d9091db 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPdfTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPdfTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPdfTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPermission2TestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPermission2TestCases
index 4362408..83c62b5 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPermission2TestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPermission2TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPermission2TestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPermissionTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPermissionTestCases
index 4ac9d2b..2b387e0 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPermissionTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPermissionTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPermissionTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPreference2TestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPreference2TestCases
index 9b26f21..bd95daa 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPreference2TestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPreference2TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPreference2TestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPreferenceTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPreferenceTestCases
index af9e901..1ff725c 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPreferenceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPreferenceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPreferenceTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPrintTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPrintTestCases
index 4fa08cf..e6d63ff 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPrintTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPrintTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsSampleDeviceTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsSampleDeviceTestCases
index fc4a372..0931420 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsSampleDeviceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsSampleDeviceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSampleDeviceTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsSampleHostTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsSampleHostTestCases
index cc43d5c..39acdff 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsSampleHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsSampleHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSampleHostTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsSystemUiTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsSystemUiTestCases
index 244370f..77dd5ac 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsSystemUiTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsSystemUiTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSystemUiTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsTextTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsTextTestCases
index 45c133e..7b2cf10 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsTextTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsTextTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTextTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsToastTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsToastTestCases
index 9be4f71..b359fdb 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsToastTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsToastTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsToastTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUiAutomationTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsUiAutomationTestCases
index ee110dd..cb8b808 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUiAutomationTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsUiAutomationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUiAutomationTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUiDeviceTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsUiDeviceTestCases
index e5ab62d..39075ed 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUiDeviceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsUiDeviceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUiDeviceTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUidIsolationTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsUidIsolationTestCases
index cea02b8..be319a9 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUidIsolationTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsUidIsolationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUidIsolationTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUsageStatsTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsUsageStatsTestCases
index 4f521db..852599d 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUsageStatsTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsUsageStatsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUsageStatsTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUsbTests b/server/site_tests/cheets_CTS_Instant/control.arm.CtsUsbTests
index 6cc3422..9cf1a51 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUsbTests
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsUsbTests
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUsbTests of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsViewTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsViewTestCases
index d1f85ee..0929ee7 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsViewTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsViewTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsWidgetTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsWidgetTestCases
index 695dcbc..c439554 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsWidgetTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsWidgetTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsWindowManagerDeviceTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsWindowManagerDeviceTestCases
index cc074fd..6eae056 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsWindowManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsWindowManagerDeviceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsWindowManagerDeviceTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.tradefed-run-collect-tests-only b/server/site_tests/cheets_CTS_Instant/control.arm.tradefed-run-collect-tests-only
index 1115e9d..31e2dc1 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.tradefed-run-collect-tests-only
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.tradefed-run-collect-tests-only
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 1024000
+PY_VERSION = 3
 PRIORITY = 70
 DOC = 'Run all of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccessibilityServiceTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccessibilityServiceTestCases
index 15aa04d..c11a160 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccessibilityServiceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccessibilityServiceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAccessibilityServiceTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccessibilityTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccessibilityTestCases
index 4387a90..6bf3eed 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccessibilityTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccessibilityTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAccessibilityTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccountManagerTestCases
index dd28e5f..7c5f0ab 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccountManagerTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAccountManagerTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAnimationTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAnimationTestCases
index fb3798a..57da227 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAnimationTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAnimationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAnimationTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAppSecurityHostTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAppSecurityHostTestCases
index 7306996..5bf026a 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAppSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAppSecurityHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAppSecurityHostTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAppWidgetTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAppWidgetTestCases
index 09efd22..2d279a5 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAppWidgetTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAppWidgetTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAppWidgetTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAutoFillServiceTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAutoFillServiceTestCases
index 92c380a..68f9837 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAutoFillServiceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAutoFillServiceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAutoFillServiceTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsBackgroundRestrictionsTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsBackgroundRestrictionsTestCases
index 5740ecb..b59bfa4 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsBackgroundRestrictionsTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsBackgroundRestrictionsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsBackgroundRestrictionsTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsCameraTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsCameraTestCases
index a930586..0d75e2f 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsCameraTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsCameraTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsCameraTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsColorModeTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsColorModeTestCases
index c8348ee..17b44f4 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsColorModeTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsColorModeTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsColorModeTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsDatabaseTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsDatabaseTestCases
index 84e7208..f6cc6cd 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsDatabaseTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDatabaseTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsDisplayTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsDisplayTestCases
index ea77fa7..c65b426 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsDisplayTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsDisplayTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDisplayTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsDpiTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsDpiTestCases
index 9de3213..1d91be6 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsDpiTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsDpiTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDpiTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsDreamsTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsDreamsTestCases
index 4b9fcd8..067598f 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsDreamsTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsDreamsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDreamsTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsEdiHostTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsEdiHostTestCases
index b048e3b..c4df4bc 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsEdiHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsEdiHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsEdiHostTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsExternalSourcesTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsExternalSourcesTestCases
index 0f6bdfe..a93a1df 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsExternalSourcesTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsExternalSourcesTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsExternalSourcesTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsFileSystemTestCases
index 8fd2d66..ebaaf8e 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsFileSystemTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsFileSystemTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsFragmentTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsFragmentTestCases
index 9f7fae4..b05ee32 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsFragmentTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsFragmentTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsFragmentTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsFragmentTestCasesSdk26 b/server/site_tests/cheets_CTS_Instant/control.x86.CtsFragmentTestCasesSdk26
index 23aa4dd..fce903a 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsFragmentTestCasesSdk26
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsFragmentTestCasesSdk26
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsFragmentTestCasesSdk26 of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsGestureTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsGestureTestCases
index e6f98f6..52a0d3e 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsGestureTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsGestureTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsGestureTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsHostsideWebViewTests b/server/site_tests/cheets_CTS_Instant/control.x86.CtsHostsideWebViewTests
index 98aad37..4e687e3 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsHostsideWebViewTests
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsHostsideWebViewTests
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHostsideWebViewTests of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsInputMethodServiceHostTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsInputMethodServiceHostTestCases
index 493e82e..cd93306 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsInputMethodServiceHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsInputMethodServiceHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsInputMethodServiceHostTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsInputMethodTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsInputMethodTestCases
index 434865f..2ea22bc 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsInputMethodTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsInputMethodTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsInputMethodTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsLocation2TestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsLocation2TestCases
index 8fad361..133225f 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsLocation2TestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsLocation2TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLocation2TestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsLocationTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsLocationTestCases
index 6bf1752..77713e9 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsLocationTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsLocationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLocationTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsMediaHostTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsMediaHostTestCases
index 77e12c9..304ffa3 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsMediaHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaHostTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsMediaTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsMediaTestCases
index 33a94cf..a760834 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsMediaTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsMediaTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsMediaTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsMultiUserTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsMultiUserTestCases
index c6887ff..396d0c9 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsMultiUserTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsMultiUserTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMultiUserTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsOsHostTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsOsHostTestCases
index 950ecf2..ce2d956 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsOsHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsOsHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsOsHostTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPdfTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPdfTestCases
index 1f06eea..f58c51b 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPdfTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPdfTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPdfTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPermission2TestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPermission2TestCases
index 20c5557..2e41c84 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPermission2TestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPermission2TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPermission2TestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPermissionTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPermissionTestCases
index 4e7dc96..d9ef19f 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPermissionTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPermissionTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPermissionTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPreference2TestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPreference2TestCases
index a509e96..57aa068 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPreference2TestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPreference2TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPreference2TestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPreferenceTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPreferenceTestCases
index c029cee..fe3918a 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPreferenceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPreferenceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPreferenceTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPrintTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPrintTestCases
index 26550ab..0ace363 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPrintTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPrintTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsSampleDeviceTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsSampleDeviceTestCases
index db0a01b..fb270b3 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsSampleDeviceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsSampleDeviceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSampleDeviceTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsSampleHostTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsSampleHostTestCases
index 4528e60..492d0d2 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsSampleHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsSampleHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSampleHostTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsSystemUiTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsSystemUiTestCases
index f284987..bbe1209 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsSystemUiTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsSystemUiTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSystemUiTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsTextTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsTextTestCases
index 627a7b2..c4a0a8c 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsTextTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsTextTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTextTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsToastTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsToastTestCases
index 4c40559..38b7831 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsToastTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsToastTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsToastTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUiAutomationTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsUiAutomationTestCases
index b74331e..5d9a1d5 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUiAutomationTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsUiAutomationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUiAutomationTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUiDeviceTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsUiDeviceTestCases
index b66421e..9e0409d 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUiDeviceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsUiDeviceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUiDeviceTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUidIsolationTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsUidIsolationTestCases
index df98c1a..193d5de 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUidIsolationTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsUidIsolationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUidIsolationTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUsageStatsTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsUsageStatsTestCases
index a03bedd..d631a98 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUsageStatsTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsUsageStatsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUsageStatsTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUsbTests b/server/site_tests/cheets_CTS_Instant/control.x86.CtsUsbTests
index 0938dc3..2e5f9b0 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUsbTests
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsUsbTests
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUsbTests of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsViewTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsViewTestCases
index b478d12..15d35f5 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsViewTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsViewTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsWidgetTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsWidgetTestCases
index a0fbe29..8691483 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsWidgetTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsWidgetTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsWindowManagerDeviceTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsWindowManagerDeviceTestCases
index 2482c62..c7d4492 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsWindowManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsWindowManagerDeviceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsWindowManagerDeviceTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.tradefed-run-collect-tests-only b/server/site_tests/cheets_CTS_Instant/control.x86.tradefed-run-collect-tests-only
index c1397c6..4439d73 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.tradefed-run-collect-tests-only
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.tradefed-run-collect-tests-only
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 1024000
+PY_VERSION = 3
 PRIORITY = 70
 DOC = 'Run all of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_dev.arm.waivers b/server/site_tests/cheets_CTS_P/control.9.0_dev.arm.waivers
index 5fcb9d2..5d1a45f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_dev.arm.waivers
+++ b/server/site_tests/cheets_CTS_P/control.9.0_dev.arm.waivers
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run waived tests of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_dev.x86.waivers b/server/site_tests/cheets_CTS_P/control.9.0_dev.x86.waivers
index 47ec072..cdcb8c9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_dev.x86.waivers
+++ b/server/site_tests/cheets_CTS_P/control.9.0_dev.x86.waivers
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run waived tests of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAbiOverrideHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAbiOverrideHostTestCases
index 8b03ac3..d5bc368 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAbiOverrideHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAbiOverrideHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAbiOverrideHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAccelerationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAccelerationTestCases
index 7307f96..042dc51 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAccelerationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAccelerationTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAccessibility b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAccessibility
index b99848f..a427b3b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAccessibility
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAccessibility
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAccessibilityServiceTestCases, CtsAccessibilityTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAccountManagerTestCases
index d4404df..dce4baf 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAccountManagerTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAccountManagerTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsActivityManagerDevice b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsActivityManagerDevice
index 6908c6c..e93570b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsActivityManagerDevice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsActivityManagerDevice
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsActivityManagerDeviceSdk25TestCases, CtsActivityManagerDeviceTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAdmin b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAdmin
index c1af631..e4940b8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAdmin
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAdmin
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAdminPackageInstallerTestCases, CtsAdminTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAlarm b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAlarm
index b3eea2d..38fc0bb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAlarm
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAlarm
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAlarmClockTestCases, CtsAlarmManagerTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAndroid b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAndroid
index a38a23b..6273f13 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAndroid
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAndroid
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAndroidAppTestCases, CtsAndroidTestBase27ApiSignatureTestCases, CtsAndroidTestMockCurrentApiSignatureTestCases, CtsAndroidTestRunnerCurrentApiSignatureTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAnimationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAnimationTestCases
index 9c77d71..c554c38 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAnimationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAnimationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAnimationTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsApacheHttpLegacy b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsApacheHttpLegacy
index 09c632e..a2c62ae 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsApacheHttpLegacy
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsApacheHttpLegacy
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsApacheHttpLegacy27ApiSignatureTestCases, CtsApacheHttpLegacyCurrentApiSignatureTestCases, CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsApp b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsApp
index 7e02e02..27f09bb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsApp
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsApp
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAppComponentFactoryTestCases, CtsAppSecurityHostTestCases, CtsAppTestCases, CtsAppUsageHostTestCases, CtsAppWidgetTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAppTestCases.feature.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAppTestCases.feature.ctshardware
index d642bd6..f68a2fa 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAppTestCases.feature.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAppTestCases.feature.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAppTestCases.feature of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAslrMallocTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAslrMallocTestCases
index 107ee63..6ce8761 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAslrMallocTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAslrMallocTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAslrMallocTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAssistTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAssistTestCases
index 002abf4..137e68f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAssistTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAssistTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAssistTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAtraceHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAtraceHostTestCases
index 545366f..cac524c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAtraceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAtraceHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAtraceHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAutoFillServiceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAutoFillServiceTestCases
index 1699680..724933f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAutoFillServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAutoFillServiceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAutoFillServiceTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBackgroundRestrictionsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBackgroundRestrictionsTestCases
index 15eeaf5..5126cc4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBackgroundRestrictionsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBackgroundRestrictionsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsBackgroundRestrictionsTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBackup b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBackup
index 72d99ae..5a38b18 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBackup
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBackup
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsBackupHostTestCases, CtsBackupTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBatterySavingTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBatterySavingTestCases
index f07087f..8a4f567 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBatterySavingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBatterySavingTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsBatterySavingTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBionicTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBionicTestCases
index 21df919..6ece3e6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBionicTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBionicTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsBionicTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBluetoothTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBluetoothTestCases
index 93fce89..b80a897 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBluetoothTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBluetoothTestCases
@@ -14,6 +14,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsBluetoothTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 # For local debugging, if your test setup doesn't have servo, REMOVE these
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBootStatsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBootStatsTestCases
index d91571e..0327155 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBootStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsBootStatsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsBootStatsTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCalendarcommon2TestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCalendarcommon2TestCases
index f29e1d6..744530e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCalendarcommon2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCalendarcommon2TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCalendarcommon2TestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCamera b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCamera
index cc0d4af..441598e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCamera
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCamera
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCameraApi25TestCases, CtsCameraTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.ctshardware
index 215879c..6a020a5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCameraTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.back b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.back
index e05f933..599459d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.back
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.back
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCameraTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.front b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.front
index 5c1cf81..d736de7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.front
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.front
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCameraTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCarTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCarTestCases
index 344812d..26a8398 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCarTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCarTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCarTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCarrierApiTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCarrierApiTestCases
index 58d5fcd..11356d9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCarrierApiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCarrierApiTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCarrierApiTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsColorModeTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsColorModeTestCases
index 26de434..70d570b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsColorModeTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsColorModeTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsColorModeTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCompilationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCompilationTestCases
index 3f43550..eef96ba 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCompilationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCompilationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCompilationTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsContactsProviderWipe b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsContactsProviderWipe
index 766c758..929b989 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsContactsProviderWipe
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsContactsProviderWipe
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsContactsProviderWipe of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsContentTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsContentTestCases
index d379473..cbe008a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsContentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsContentTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsContentTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCppToolsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCppToolsTestCases
index 2c89d33..4d17c20 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCppToolsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCppToolsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCppToolsTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCurrentApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCurrentApiSignatureTestCases
index b26e973..835d5b1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCurrentApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCurrentApiSignatureTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCurrentApiSignatureTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDatabaseTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDatabaseTestCases
index 57dddf0..2488ac3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDatabaseTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDatabaseTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDebugTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDebugTestCases
index dc7842d..c0bf0ed 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDebugTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDebugTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.32 b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.32
index 6b14883..6c27eb5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.32
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 1024000
+PY_VERSION = 3
 DOC = 'Run module CtsDeqpTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.64 b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.64
index 6813320..983be44 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.64
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 1024000
+PY_VERSION = 3
 DOC = 'Run module CtsDeqpTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-EGL b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-EGL
index 4082103..681e200 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-EGL
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-EGL
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDeqpTestCases.dEQP-EGL of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES2 b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES2
index faa277c..8901a48 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES2
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES2
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDeqpTestCases.dEQP-GLES2 of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3 b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3
index 67d97d9..680bcd5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDeqpTestCases.dEQP-GLES3 of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
index a194afe..6a0f60a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES31 b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES31
index 1c55db0..bf1f778 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES31
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES31
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDeqpTestCases.dEQP-GLES31 of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-VK b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-VK
index c6d9600..33b38a0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-VK
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-VK
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDevice b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDevice
index 2f97255..b9af2ab 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDevice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDevice
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDeviceIdleHostTestCases, CtsDevicePolicyManagerTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDexMetadataHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDexMetadataHostTestCases
index 0430ec7..2ce2b2b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDexMetadataHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDexMetadataHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDexMetadataHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDisplayTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDisplayTestCases
index 9454d6c..29a4da2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDisplayTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDisplayTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDisplayTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDpi b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDpi
index 739e0b0..c5368e8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDpi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDpi
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDpiTestCases, CtsDpiTestCases2 of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDreamsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDreamsTestCases
index d6cc533..186605b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDreamsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDreamsTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDrmTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDrmTestCases
index 30ce057..54ce560 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDrmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDrmTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDrmTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDumpsysHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDumpsysHostTestCases
index 87be7d2..dbe5458 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDumpsysHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDumpsysHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDumpsysHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDynamicLinkerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDynamicLinkerTestCases
index 10bedc4..df986ea 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDynamicLinkerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDynamicLinkerTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDynamicLinkerTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsEdiHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsEdiHostTestCases
index 0052fe4..29f1739 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsEdiHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsEdiHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsEdiHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsEffectTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsEffectTestCases
index 19e0eee..0129283 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsEffectTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsEffectTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsEffectTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsExternalS b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsExternalS
index 16b123f..1271b5e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsExternalS
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsExternalS
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsExternalServiceTestCases, CtsExternalSourcesTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsFileSystemTestCases
index 19fbb42..68cac47 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsFileSystemTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsFileSystemTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsFragment b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsFragment
index a2c7a77..833e41e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsFragment
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsFragment
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsFragmentTestCases, CtsFragmentTestCasesSdk26 of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsGestureTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsGestureTestCases
index ff05b39..2dc8853 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsGestureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsGestureTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsGestureTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsGpuToolsHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsGpuToolsHostTestCases
index ff261f7..2ce0207 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsGpuToolsHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsGpuToolsHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsGpuToolsHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsGraphicsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsGraphicsTestCases
index e7ca414..6a34b01 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsGraphicsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsGraphicsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsGraphicsTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHardwareTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHardwareTestCases
index fe0c920..6a1531a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHardwareTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHardwareTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHardwareTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHarmfulAppWarningHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHarmfulAppWarningHostTestCases
index d2e9cac..e2be9ae 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHarmfulAppWarningHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHarmfulAppWarningHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHarmfulAppWarningHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHiddenApi b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHiddenApi
index 0653d62..96a2061 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHiddenApi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHiddenApi
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHiddenApiBlacklistApi27TestCases, CtsHiddenApiBlacklistCurrentApiTestCases, CtsHiddenApiBlacklistDebugClassTestCases, CtsHiddenApiKillswitchDebugClassTestCases, CtsHiddenApiKillswitchWhitelistTestCases, CtsHiddenApiKillswitchWildcardTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHostTzDataTests b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHostTzDataTests
index 8139d2a..2bb11e9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHostTzDataTests
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHostTzDataTests
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHostTzDataTests of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHostside b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHostside
index 90de9a4..2bfce53 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHostside
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsHostside
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHostsideNetworkTests, CtsHostsideNumberBlockingTestCases, CtsHostsideTvTests, CtsHostsideWebViewTests of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsIcuTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsIcuTestCases
index 0ff743d..2de86be 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsIcuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsIcuTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsIcuTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsIncidentHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsIncidentHostTestCases
index 0e75fda..e39cc33 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsIncidentHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsIncidentHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsIncidentHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsInlineMockingTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsInlineMockingTestCases
index 0b59500..07c51b8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsInlineMockingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsInlineMockingTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsInlineMockingTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsInputMethod b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsInputMethod
index 94543b4..8ec0ea3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsInputMethod
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsInputMethod
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsInputMethodServiceHostTestCases, CtsInputMethodTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsIntentSignatureTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsIntentSignatureTestCases
index 5885b77..e3f42f3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsIntentSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsIntentSignatureTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsIntentSignatureTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJankDeviceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJankDeviceTestCases
index 561a4ae..fcd8658 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJankDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJankDeviceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJankDeviceTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJdwp b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJdwp
index 0525e1f..e401b0a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJdwp
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJdwp
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJdwpSecurityHostTestCases, CtsJdwpTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJniTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJniTestCases
index c0bf40b..63b8578 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJniTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJniTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJniTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJobScheduler b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJobScheduler
index 7ccba27..171a264 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJobScheduler
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJobScheduler
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJobSchedulerSharedUidTestCases, CtsJobSchedulerTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJvmti b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJvmti
index ae09bd9..a0bc031 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJvmti
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsJvmti
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiAttachingHostTestCases, CtsJvmtiAttachingTestCases, CtsJvmtiRedefineClassesHostTestCases, CtsJvmtiRunTest1900HostTestCases, CtsJvmtiRunTest1901HostTestCases, CtsJvmtiRunTest1902HostTestCases, CtsJvmtiRunTest1903HostTestCases, CtsJvmtiRunTest1904HostTestCases, CtsJvmtiRunTest1906HostTestCases, CtsJvmtiRunTest1907HostTestCases, CtsJvmtiRunTest1908HostTestCases, CtsJvmtiRunTest1909HostTestCases, CtsJvmtiRunTest1910HostTestCases, CtsJvmtiRunTest1911HostTestCases, CtsJvmtiRunTest1912HostTestCases, CtsJvmtiRunTest1913HostTestCases, CtsJvmtiRunTest1914HostTestCases, CtsJvmtiRunTest1915HostTestCases, CtsJvmtiRunTest1916HostTestCases, CtsJvmtiRunTest1917HostTestCases, CtsJvmtiRunTest1920HostTestCases, CtsJvmtiRunTest1921HostTestCases, CtsJvmtiRunTest1922HostTestCases, CtsJvmtiRunTest1923HostTestCases, CtsJvmtiRunTest1924HostTestCases, CtsJvmtiRunTest1925HostTestCases, CtsJvmtiRunTest1926HostTestCases, CtsJvmtiRunTest1927HostTestCases, CtsJvmtiRunTest1928HostTestCases, CtsJvmtiRunTest1930HostTestCases, CtsJvmtiRunTest1931HostTestCases, CtsJvmtiRunTest1932HostTestCases, CtsJvmtiRunTest1933HostTestCases, CtsJvmtiRunTest1934HostTestCases, CtsJvmtiRunTest1936HostTestCases, CtsJvmtiRunTest1937HostTestCases, CtsJvmtiRunTest1939HostTestCases, CtsJvmtiRunTest1941HostTestCases, CtsJvmtiRunTest1942HostTestCases, CtsJvmtiRunTest1943HostTestCases, CtsJvmtiRunTest902HostTestCases, CtsJvmtiRunTest903HostTestCases, CtsJvmtiRunTest904HostTestCases, CtsJvmtiRunTest905HostTestCases, CtsJvmtiRunTest906HostTestCases, CtsJvmtiRunTest907HostTestCases, CtsJvmtiRunTest908HostTestCases, CtsJvmtiRunTest910HostTestCases, CtsJvmtiRunTest911HostTestCases, CtsJvmtiRunTest912HostTestCases, CtsJvmtiRunTest913HostTestCases, CtsJvmtiRunTest914HostTestCases, CtsJvmtiRunTest915HostTestCases, CtsJvmtiRunTest917HostTestCases, CtsJvmtiRunTest918HostTestCases, CtsJvmtiRunTest919HostTestCases, CtsJvmtiRunTest920HostTestCases, CtsJvmtiRunTest922HostTestCases, CtsJvmtiRunTest923HostTestCases, CtsJvmtiRunTest924HostTestCases, CtsJvmtiRunTest926HostTestCases, CtsJvmtiRunTest927HostTestCases, CtsJvmtiRunTest928HostTestCases, CtsJvmtiRunTest930HostTestCases, CtsJvmtiRunTest931HostTestCases, CtsJvmtiRunTest932HostTestCases, CtsJvmtiRunTest940HostTestCases, CtsJvmtiRunTest942HostTestCases, CtsJvmtiRunTest944HostTestCases, CtsJvmtiRunTest945HostTestCases, CtsJvmtiRunTest947HostTestCases, CtsJvmtiRunTest951HostTestCases, CtsJvmtiRunTest982HostTestCases, CtsJvmtiRunTest983HostTestCases, CtsJvmtiRunTest984HostTestCases, CtsJvmtiRunTest985HostTestCases, CtsJvmtiRunTest986HostTestCases, CtsJvmtiRunTest988HostTestCases, CtsJvmtiRunTest989HostTestCases, CtsJvmtiRunTest990HostTestCases, CtsJvmtiRunTest991HostTestCases, CtsJvmtiRunTest992HostTestCases, CtsJvmtiRunTest993HostTestCases, CtsJvmtiRunTest994HostTestCases, CtsJvmtiRunTest995HostTestCases, CtsJvmtiRunTest996HostTestCases, CtsJvmtiRunTest997HostTestCases, CtsJvmtiTaggingHostTestCases, CtsJvmtiTrackingHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsKernelConfigTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsKernelConfigTestCases
index 259a3d3..6e9e80d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsKernelConfigTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsKernelConfigTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsKernelConfigTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsKeystoreTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsKeystoreTestCases
index 26f566a..e2af91b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsKeystoreTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsKeystoreTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsKeystoreTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLeanbackJankTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLeanbackJankTestCases
index b23245d..7680b5d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLeanbackJankTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLeanbackJankTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLeanbackJankTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLegacyNotificationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLegacyNotificationTestCases
index a7fd8bd..56ec255 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLegacyNotificationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLegacyNotificationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLegacyNotificationTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLibcore b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLibcore
index 34f2a3a..e71f20e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLibcore
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLibcore
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLibcoreFileIOTestCases, CtsLibcoreJsr166TestCases, CtsLibcoreLegacy22TestCases, CtsLibcoreOjTestCases, CtsLibcoreOkHttpTestCases, CtsLibcoreTestCases, CtsLibcoreWycheproofBCTestCases, CtsLibcoreWycheproofConscryptTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLiblogTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLiblogTestCases
index a3b5bce..ec354b2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLiblogTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLiblogTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLiblogTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLocation b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLocation
index df04bb0..b5e3656 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLocation
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLocation
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLocation2TestCases, CtsLocationTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLogdTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLogdTestCases
index 65f4c30..a667db5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLogdTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsLogdTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLogdTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaBitstreamsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaBitstreamsTestCases
index a9e58f4..bb448bb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaBitstreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaBitstreamsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaBitstreamsTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaHostTestCases
index 5fe1c3e..8d216a2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaStressTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaStressTestCases
index a985c1f..821ec2b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaStressTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaStressTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaStressTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaStressTestCases.camera.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaStressTestCases.camera.ctshardware
index 7d5cbb9..793d2ac 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaStressTestCases.camera.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaStressTestCases.camera.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaStressTestCases.camera of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.32 b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.32
index 34f3cb6..f9af723 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.32
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.64 b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.64
index d0d0259..e508ced 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.64
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.DecodeAccuracyTest b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.DecodeAccuracyTest
index a15e9f6..dcb4011 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.DecodeAccuracyTest
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.DecodeAccuracyTest
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaTestCases.DecodeAccuracyTest of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.DecodeAccuracyTest.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.DecodeAccuracyTest.ctshardware
index e79a19c..08645b7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.DecodeAccuracyTest.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.DecodeAccuracyTest.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaTestCases.DecodeAccuracyTest of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest
index 8cb2b70..0fa18cf 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaTestCases.VideoDecoderPerfAndEncoderTest of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware
index ac8f54d..1593412 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaTestCases.VideoDecoderPerfAndEncoderTest of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.audio b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.audio
index 5971c5e..81e261a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.audio
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.audio
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaTestCases.audio of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.ctshardware
index 93d2b57..e703c58 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.other b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.other
index fa33c5d..eae7ff6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.other
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.other
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaTestCases.other of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.other.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.other.ctshardware
index 996faa0..74f07e7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.other.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.other.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaTestCases.other of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMidiTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMidiTestCases
index 7bd0b21..8abe764 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMidiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMidiTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMidiTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMocking b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMocking
index 58f130e..0b9023c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMocking
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMocking
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMockingDebuggableTestCases, CtsMockingTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMonkeyTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMonkeyTestCases
index ad980d2..3c20c01 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMonkeyTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMonkeyTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMonkeyTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMultiUser b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMultiUser
index cf9f46f..c596edb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMultiUser
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMultiUser
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMultiUserHostTestCases, CtsMultiUserTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNNAPITestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNNAPITestCases
index 4a589fd..f2cbf47 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNNAPITestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNNAPITestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNNAPITestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNative b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNative
index 3bcb6f0..c901246 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNative
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNative
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNativeHardwareTestCases, CtsNativeMediaAAudioTestCases, CtsNativeMediaSlTestCases, CtsNativeMediaXaTestCases, CtsNativeNetTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNativeMediaAAudioTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNativeMediaAAudioTestCases.ctshardware
index aa10572..913fd2d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNativeMediaAAudioTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNativeMediaAAudioTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNativeMediaAAudioTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNdefTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNdefTestCases
index d5062ee..fa1a0f7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNdefTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNdefTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNdefTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNet b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNet
index e0084c4..480c1f3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNet
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNet
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetSecConfigAttributeTestCases, CtsNetSecConfigBasicDebugDisabledTestCases, CtsNetSecConfigBasicDebugEnabledTestCases, CtsNetSecConfigBasicDomainConfigTestCases, CtsNetSecConfigCleartextTrafficTestCases, CtsNetSecConfigDownloadManagerTestCases, CtsNetSecConfigInvalidPinTestCases, CtsNetSecConfigNestedDomainConfigTestCases, CtsNetSecConfigPrePCleartextTrafficTestCases, CtsNetSecConfigResourcesSrcTestCases, CtsNetSecPolicyUsesCleartextTrafficFalseTestCases, CtsNetSecPolicyUsesCleartextTrafficTrueTestCases, CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases, CtsNetTestCases, CtsNetTestCasesLegacyApi22, CtsNetTestCasesLegacyPermission22 of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNetTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNetTestCases.ctshardware
index d08e2d9..cfadf38 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNetTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNetTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsOmapiTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsOmapiTestCases
index b8f2bcc..bbe9097 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsOmapiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsOmapiTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsOmapiTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsOpenG b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsOpenG
index e950c2c..0296945 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsOpenG
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsOpenG
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsOpenGLTestCases, CtsOpenGlPerf2TestCases, CtsOpenGlPerfTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsOs b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsOs
index 4d95a34..cc40bf6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsOs
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsOs
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsOsHostTestCases, CtsOsTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPdfTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPdfTestCases
index d55cc64..78e9141 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPdfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPdfTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPdfTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPerfettoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPerfettoTestCases
index 2a89849..6d45b14 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPerfettoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPerfettoTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPerfettoTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPerfettoTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPerfettoTestCases.ctshardware
index c8018c3..d7f9c2a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPerfettoTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPerfettoTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPerfettoTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPermission b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPermission
index 86baa32..ea5d453 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPermission
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPermission
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPermission2TestCases, CtsPermissionTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPermissionTestCases.camera.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPermissionTestCases.camera.ctshardware
index 3dd66ba..9711e95 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPermissionTestCases.camera.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPermissionTestCases.camera.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPermissionTestCases.camera of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPreference b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPreference
index 6c7cb18..fce5fcf 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPreference
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPreference
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPreference2TestCases, CtsPreferenceTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPrintTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPrintTestCases
index 2bcb33b..5274696 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPrintTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPrintTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsProtoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsProtoTestCases
index 703cd0c..5fe0961 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsProtoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsProtoTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsProtoTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsProviderTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsProviderTestCases
index 7c3a8fd..a566f20 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsProviderTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsProviderTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsProviderTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsRenderscript b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsRenderscript
index 75ac5e3..62ac0f3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsRenderscript
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsRenderscript
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsRenderscriptLegacyTestCases, CtsRenderscriptTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsRs b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsRs
index c67ec40..b502066 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsRs
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsRs
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsRsBlasTestCases, CtsRsCppTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSample b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSample
index 66fbead..822933f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSample
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSample
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSampleDeviceTestCases, CtsSampleHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSaxTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSaxTestCases
index 05ba0e6..14bfd04 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSaxTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSaxTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSaxTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSeccompHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSeccompHostTestCases
index 515ccfe..34fe001 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSeccompHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSeccompHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSeccompHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSecureElementAccessControl b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSecureElementAccessControl
index c139669..45e354d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSecureElementAccessControl
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSecureElementAccessControl
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSecureElementAccessControlTestCases1, CtsSecureElementAccessControlTestCases2, CtsSecureElementAccessControlTestCases3 of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSecurity b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSecurity
index a83bcf8..cf45d40 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSecurity
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSecurity
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSecurityBulletinHostTestCases, CtsSecurityHostTestCases, CtsSecurityTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSelinuxTargetSdk b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSelinuxTargetSdk
index c82d286..2ff088f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSelinuxTargetSdk
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSelinuxTargetSdk
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSelinuxTargetSdk25TestCases, CtsSelinuxTargetSdk27TestCases, CtsSelinuxTargetSdkCurrentTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSensorTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSensorTestCases
index 3643b44..556a035 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSensorTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSensorTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSensorTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSensorTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSensorTestCases.ctshardware
index af92c59..60c7d41 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSensorTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSensorTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSensorTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsShortcut b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsShortcut
index ff30fbd..cbb5d08 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsShortcut
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsShortcut
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsShortcutHostTestCases, CtsShortcutManagerTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSimRestrictedApisTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSimRestrictedApisTestCases
index 25c09be..49146a8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSimRestrictedApisTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSimRestrictedApisTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSimRestrictedApisTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSimpleCpuTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSimpleCpuTestCases
index 751fb20..6a24d2e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSimpleCpuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSimpleCpuTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSimpleCpuTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSimpleperfTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSimpleperfTestCases
index 2061e94..0781570 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSimpleperfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSimpleperfTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSimpleperfTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSkQPTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSkQPTestCases
index 0f7bf4b..37688d7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSkQPTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSkQPTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSkQPTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSliceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSliceTestCases
index 92591c5..3de97ac 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSliceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSliceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSliceTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSpeechTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSpeechTestCases
index bf0812f..45355ba 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSpeechTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSpeechTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSpeechTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsStatsdHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsStatsdHostTestCases
index 9dcaf9f..d542034 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsStatsdHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsStatsdHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsStatsdHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSustainedPerformanceHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSustainedPerformanceHostTestCases
index b7a71e5..5adf2af 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSustainedPerformanceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSustainedPerformanceHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSustainedPerformanceHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSustainedPerformanceHostTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSustainedPerformanceHostTestCases.ctshardware
index a008a63..964ddc4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSustainedPerformanceHostTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSustainedPerformanceHostTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSustainedPerformanceHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSync b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSync
index 45ec895..20c2004 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSync
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSync
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSyncAccountAccessOtherCertTestCases, CtsSyncContentHostTestCases, CtsSyncManagerTestsCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSystem b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSystem
index 40d67a8..13d28fc 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSystem
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSystem
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSystemApiAnnotationTestCases, CtsSystemApiSignatureTestCases, CtsSystemIntentTestCases, CtsSystemUiHostTestCases, CtsSystemUiTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTelecom b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTelecom
index 901e371..fc3986a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTelecom
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTelecom
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTelecomTestCases, CtsTelecomTestCases2, CtsTelecomTestCases3 of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTelephony b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTelephony
index 2e0dbfc..8bbeea2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTelephony
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTelephony
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTelephony2TestCases, CtsTelephonyTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTextTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTextTestCases
index f7a4ed4..2d46195 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTextTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTextTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTextTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTheme b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTheme
index 675136d..0c752a7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTheme
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTheme
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsThemeDeviceTestCases, CtsThemeHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsToast b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsToast
index cb1226e..c06c61a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsToast
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsToast
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsToastLegacyTestCases, CtsToastTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTransitionTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTransitionTestCases
index aa8e6ea..d2236a2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTransitionTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTransitionTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTransitionTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTrustedVoiceHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTrustedVoiceHostTestCases
index 9e3bb17..ecdcfda 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTrustedVoiceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTrustedVoiceHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTrustedVoiceHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTv b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTv
index 77b21d0..dd01119 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTv
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsTv
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTvProviderTestCases, CtsTvTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUi b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUi
index ceba2ff..d1737cf 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUi
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUiAutomationTestCases, CtsUiDeviceTestCases, CtsUiRenderingTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUidIsolationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUidIsolationTestCases
index 28cd466..609bf1b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUidIsolationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUidIsolationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUidIsolationTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUsageStatsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUsageStatsTestCases
index ed87112..39176f2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUsageStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUsageStatsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUsageStatsTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUsageStatsTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUsageStatsTestCases.ctshardware
index dc8a1a0..ae25fbd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUsageStatsTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUsageStatsTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUsageStatsTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUsbTests b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUsbTests
index 76d5f14..f0a9df4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUsbTests
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUsbTests
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUsbTests of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUtilTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUtilTestCases
index aee5470..43995e5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUtilTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUtilTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUtilTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVideoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVideoTestCases
index 0d49d55..94ba8de 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVideoTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsVideoTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsViewTestCases.32 b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsViewTestCases.32
index 02bcea6..4db2e8b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsViewTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsViewTestCases.32
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsViewTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsViewTestCases.64 b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsViewTestCases.64
index 3b660c8..a9f50a2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsViewTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsViewTestCases.64
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsViewTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsViewTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsViewTestCases.ctshardware
index 37f1362..b8d27a6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsViewTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsViewTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsViewTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVmTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVmTestCases
index 80a6ede..3451d8f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVmTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsVmTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVoice b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVoice
index 8a23192..5e9d085 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVoice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVoice
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsVoiceInteractionTestCases, CtsVoiceSettingsTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVrTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVrTestCases
index 0c3179a..b6249c7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVrTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsVrTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsVrTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWebkitTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWebkitTestCases
index cbab00a..0c2f3d0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWebkitTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWebkitTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsWebkitTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWidgetTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWidgetTestCases
index 616bbeb..8a2b27c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWidgetTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsWidgetTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWindowManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWindowManagerDeviceTestCases
index fae72c6..81cfffc 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWindowManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWindowManagerDeviceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsWindowManagerDeviceTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWrap b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWrap
index e6523b8..73cfc5c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWrap
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsWrap
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsWrapNoWrapTestCases, CtsWrapWrapDebugMallocDebugTestCases, CtsWrapWrapDebugTestCases, CtsWrapWrapNoDebugTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
index 7d84cb2..7636f92 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAbiOverrideHostTestCases, CtsAccelerationTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
index 58d1acd..3252a6a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAccessibilityServiceTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
index 0b6aca2..df89ea7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAccessibilityTestCases, CtsAccountManagerTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
index ba27ebe..df4c5b2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsActivityManagerDeviceSdk25TestCases, CtsActivityManagerDeviceTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
index 814b235..84137a3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAdminPackageInstallerTestCases, CtsAdminTestCases, CtsAlarmClockTestCases, CtsAlarmManagerTestCases, CtsAndroidAppTestCases, CtsAndroidTestBase27ApiSignatureTestCases, CtsAndroidTestMockCurrentApiSignatureTestCases, CtsAndroidTestRunnerCurrentApiSignatureTestCases, CtsAnimationTestCases, CtsApacheHttpLegacy27ApiSignatureTestCases, CtsApacheHttpLegacyCurrentApiSignatureTestCases, CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases, CtsAppComponentFactoryTestCases, CtsAppSecurityHostTestCases, CtsAppTestCases, CtsAppUsageHostTestCases, CtsAppWidgetTestCases, CtsAslrMallocTestCases, CtsAssistTestCases, CtsAtraceHostTestCases, CtsAutoFillServiceTestCases, CtsBackgroundRestrictionsTestCases, CtsBackupHostTestCases, CtsBackupTestCases, CtsBatterySavingTestCases, CtsBionicTestCases, CtsBluetoothTestCases, CtsBootStatsTestCases, CtsCalendarcommon2TestCases, CtsCameraApi25TestCases, CtsCameraTestCases, CtsCarTestCases, CtsCarrierApiTestCases, CtsColorModeTestCases, CtsCompilationTestCases, CtsContactsProviderWipe, CtsContentTestCases, CtsCppToolsTestCases, CtsCurrentApiSignatureTestCases, CtsDatabaseTestCases, CtsDebugTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32 b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
index eddf00d..237ae7e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 1024000
+PY_VERSION = 3
 DOC = 'Run module CtsDeqpTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64 b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
index 7a903da..621254b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 1024000
+PY_VERSION = 3
 DOC = 'Run module CtsDeqpTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
index c74db8b..352d294 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDeviceIdleHostTestCases, CtsDevicePolicyManagerTestCases, CtsDexMetadataHostTestCases, CtsDisplayTestCases, CtsDpiTestCases, CtsDpiTestCases2, CtsDreamsTestCases, CtsDrmTestCases, CtsDumpsysHostTestCases, CtsDynamicLinkerTestCases, CtsEdiHostTestCases, CtsEffectTestCases, CtsExternalServiceTestCases, CtsExternalSourcesTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
index e3521b0..6bbe168 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsFileSystemTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
index dbb3409..a67613c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsFragmentTestCases, CtsFragmentTestCasesSdk26, CtsGestureTestCases, CtsGpuToolsHostTestCases, CtsGraphicsTestCases, CtsHardwareTestCases, CtsHarmfulAppWarningHostTestCases, CtsHiddenApiBlacklistApi27TestCases, CtsHiddenApiBlacklistCurrentApiTestCases, CtsHiddenApiBlacklistDebugClassTestCases, CtsHiddenApiKillswitchDebugClassTestCases, CtsHiddenApiKillswitchWhitelistTestCases, CtsHiddenApiKillswitchWildcardTestCases, CtsHostTzDataTests, CtsHostsideNetworkTests, CtsHostsideNumberBlockingTestCases, CtsHostsideTvTests, CtsHostsideWebViewTests, CtsIcuTestCases, CtsIncidentHostTestCases, CtsInlineMockingTestCases, CtsInputMethodServiceHostTestCases, CtsInputMethodTestCases, CtsIntentSignatureTestCases, CtsJankDeviceTestCases, CtsJdwpSecurityHostTestCases, CtsJdwpTestCases, CtsJniTestCases, CtsJobSchedulerSharedUidTestCases, CtsJobSchedulerTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
index 05292b2..5d10e94 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiAttachingHostTestCases, CtsJvmtiAttachingTestCases, CtsJvmtiRedefineClassesHostTestCases, CtsJvmtiRunTest1900HostTestCases, CtsJvmtiRunTest1901HostTestCases, CtsJvmtiRunTest1902HostTestCases, CtsJvmtiRunTest1903HostTestCases, CtsJvmtiRunTest1904HostTestCases, CtsJvmtiRunTest1906HostTestCases, CtsJvmtiRunTest1907HostTestCases, CtsJvmtiRunTest1908HostTestCases, CtsJvmtiRunTest1909HostTestCases, CtsJvmtiRunTest1910HostTestCases, CtsJvmtiRunTest1911HostTestCases, CtsJvmtiRunTest1912HostTestCases, CtsJvmtiRunTest1913HostTestCases, CtsJvmtiRunTest1914HostTestCases, CtsJvmtiRunTest1915HostTestCases, CtsJvmtiRunTest1916HostTestCases, CtsJvmtiRunTest1917HostTestCases, CtsJvmtiRunTest1920HostTestCases, CtsJvmtiRunTest1921HostTestCases, CtsJvmtiRunTest1922HostTestCases, CtsJvmtiRunTest1923HostTestCases, CtsJvmtiRunTest1924HostTestCases, CtsJvmtiRunTest1925HostTestCases, CtsJvmtiRunTest1926HostTestCases, CtsJvmtiRunTest1927HostTestCases, CtsJvmtiRunTest1928HostTestCases, CtsJvmtiRunTest1930HostTestCases, CtsJvmtiRunTest1931HostTestCases, CtsJvmtiRunTest1932HostTestCases, CtsJvmtiRunTest1933HostTestCases, CtsJvmtiRunTest1934HostTestCases, CtsJvmtiRunTest1936HostTestCases, CtsJvmtiRunTest1937HostTestCases, CtsJvmtiRunTest1939HostTestCases, CtsJvmtiRunTest1941HostTestCases, CtsJvmtiRunTest1942HostTestCases, CtsJvmtiRunTest1943HostTestCases, CtsJvmtiRunTest902HostTestCases, CtsJvmtiRunTest903HostTestCases, CtsJvmtiRunTest904HostTestCases, CtsJvmtiRunTest905HostTestCases, CtsJvmtiRunTest906HostTestCases, CtsJvmtiRunTest907HostTestCases, CtsJvmtiRunTest908HostTestCases, CtsJvmtiRunTest910HostTestCases, CtsJvmtiRunTest911HostTestCases, CtsJvmtiRunTest912HostTestCases, CtsJvmtiRunTest913HostTestCases, CtsJvmtiRunTest914HostTestCases, CtsJvmtiRunTest915HostTestCases, CtsJvmtiRunTest917HostTestCases, CtsJvmtiRunTest918HostTestCases, CtsJvmtiRunTest919HostTestCases, CtsJvmtiRunTest920HostTestCases, CtsJvmtiRunTest922HostTestCases, CtsJvmtiRunTest923HostTestCases, CtsJvmtiRunTest924HostTestCases, CtsJvmtiRunTest926HostTestCases, CtsJvmtiRunTest927HostTestCases, CtsJvmtiRunTest928HostTestCases, CtsJvmtiRunTest930HostTestCases, CtsJvmtiRunTest931HostTestCases, CtsJvmtiRunTest932HostTestCases, CtsJvmtiRunTest940HostTestCases, CtsJvmtiRunTest942HostTestCases, CtsJvmtiRunTest944HostTestCases, CtsJvmtiRunTest945HostTestCases, CtsJvmtiRunTest947HostTestCases, CtsJvmtiRunTest951HostTestCases, CtsJvmtiRunTest982HostTestCases, CtsJvmtiRunTest983HostTestCases, CtsJvmtiRunTest984HostTestCases, CtsJvmtiRunTest985HostTestCases, CtsJvmtiRunTest986HostTestCases, CtsJvmtiRunTest988HostTestCases, CtsJvmtiRunTest989HostTestCases, CtsJvmtiRunTest990HostTestCases, CtsJvmtiRunTest991HostTestCases, CtsJvmtiRunTest992HostTestCases, CtsJvmtiRunTest993HostTestCases, CtsJvmtiRunTest994HostTestCases, CtsJvmtiRunTest995HostTestCases, CtsJvmtiRunTest996HostTestCases, CtsJvmtiRunTest997HostTestCases, CtsJvmtiTaggingHostTestCases, CtsJvmtiTrackingHostTestCases, CtsKernelConfigTestCases, CtsKeystoreTestCases, CtsLeanbackJankTestCases, CtsLegacyNotificationTestCases, CtsLibcoreFileIOTestCases, CtsLibcoreJsr166TestCases, CtsLibcoreLegacy22TestCases, CtsLibcoreOjTestCases, CtsLibcoreOkHttpTestCases, CtsLibcoreTestCases, CtsLibcoreWycheproofBCTestCases, CtsLibcoreWycheproofConscryptTestCases, CtsLiblogTestCases, CtsLocation2TestCases, CtsLocationTestCases, CtsLogdTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases
index 2ab1d03..2d6c66c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaBitstreamsTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
index 87374d5..5c4fbcd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases
index f6795e4..419f2d9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaStressTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.32 b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.32
index cbc1ae0..380ea15 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.32
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.64 b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.64
index aedddd4..7d05741 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMediaTestCases_-_CtsMediaTestCases.64
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
index f271252..b73f403 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMidiTestCases, CtsMockingDebuggableTestCases, CtsMockingTestCases, CtsMonkeyTestCases, CtsMultiUserHostTestCases, CtsMultiUserTestCases, CtsNNAPITestCases, CtsNativeHardwareTestCases, CtsNativeMediaAAudioTestCases, CtsNativeMediaSlTestCases, CtsNativeMediaXaTestCases, CtsNativeNetTestCases, CtsNdefTestCases, CtsNetSecConfigAttributeTestCases, CtsNetSecConfigBasicDebugDisabledTestCases, CtsNetSecConfigBasicDebugEnabledTestCases, CtsNetSecConfigBasicDomainConfigTestCases, CtsNetSecConfigCleartextTrafficTestCases, CtsNetSecConfigDownloadManagerTestCases, CtsNetSecConfigInvalidPinTestCases, CtsNetSecConfigNestedDomainConfigTestCases, CtsNetSecConfigPrePCleartextTrafficTestCases, CtsNetSecConfigResourcesSrcTestCases, CtsNetSecPolicyUsesCleartextTrafficFalseTestCases, CtsNetSecPolicyUsesCleartextTrafficTrueTestCases, CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases, CtsNetTestCases, CtsNetTestCasesLegacyApi22, CtsNetTestCasesLegacyPermission22, CtsOmapiTestCases, CtsOpenGLTestCases, CtsOpenGlPerf2TestCases, CtsOpenGlPerfTestCases, CtsOsHostTestCases, CtsOsTestCases, CtsPdfTestCases, CtsPerfettoTestCases, CtsPermission2TestCases, CtsPermissionTestCases, CtsPreference2TestCases, CtsPreferenceTestCases, CtsPrintTestCases, CtsProtoTestCases, CtsProviderTestCases, CtsRenderscriptLegacyTestCases, CtsRenderscriptTestCases, CtsRsBlasTestCases, CtsRsCppTestCases, CtsSampleDeviceTestCases, CtsSampleHostTestCases, CtsSaxTestCases, CtsSeccompHostTestCases, CtsSecureElementAccessControlTestCases1, CtsSecureElementAccessControlTestCases2, CtsSecureElementAccessControlTestCases3, CtsSecurityBulletinHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
index aea457b..31f5ce7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSecurityHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
index 1dac13c..c5e4594 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSecurityTestCases, CtsSelinuxTargetSdk25TestCases, CtsSelinuxTargetSdk27TestCases, CtsSelinuxTargetSdkCurrentTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsSensorTestCases_-_CtsSensorTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsSensorTestCases_-_CtsSensorTestCases
index 89cf21c..ebf1141 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsSensorTestCases_-_CtsSensorTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsSensorTestCases_-_CtsSensorTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSensorTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
index 777e941..a2f3cf4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsShortcutHostTestCases, CtsShortcutManagerTestCases, CtsSimRestrictedApisTestCases, CtsSimpleCpuTestCases, CtsSimpleperfTestCases, CtsSkQPTestCases, CtsSliceTestCases, CtsSpeechTestCases, CtsStatsdHostTestCases, CtsSustainedPerformanceHostTestCases, CtsSyncAccountAccessOtherCertTestCases, CtsSyncContentHostTestCases, CtsSyncManagerTestsCases, CtsSystemApiAnnotationTestCases, CtsSystemApiSignatureTestCases, CtsSystemIntentTestCases, CtsSystemUiHostTestCases, CtsSystemUiTestCases, CtsTelecomTestCases, CtsTelecomTestCases2, CtsTelecomTestCases3, CtsTelephony2TestCases, CtsTelephonyTestCases, CtsTextTestCases, CtsThemeDeviceTestCases, CtsThemeHostTestCases, CtsToastLegacyTestCases, CtsToastTestCases, CtsTransitionTestCases, CtsTrustedVoiceHostTestCases, CtsTvProviderTestCases, CtsTvTestCases, CtsUiAutomationTestCases, CtsUiDeviceTestCases, CtsUiRenderingTestCases, CtsUidIsolationTestCases, CtsUsageStatsTestCases, CtsUsbTests, CtsUtilTestCases, CtsVideoTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsViewTestCases_-_CtsViewTestCases.32 b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsViewTestCases_-_CtsViewTestCases.32
index 4c1e5ca..3907277 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsViewTestCases_-_CtsViewTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsViewTestCases_-_CtsViewTestCases.32
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsViewTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsViewTestCases_-_CtsViewTestCases.64 b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsViewTestCases_-_CtsViewTestCases.64
index 6cab472..13326f9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsViewTestCases_-_CtsViewTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsViewTestCases_-_CtsViewTestCases.64
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsViewTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsVmTestCases_-_vm-tests-tf b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsVmTestCases_-_vm-tests-tf
index 2db620b..e1bf6cb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsVmTestCases_-_vm-tests-tf
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.all.CtsVmTestCases_-_vm-tests-tf
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsVmTestCases, CtsVoiceInteractionTestCases, CtsVoiceSettingsTestCases, CtsVrTestCases, CtsWebkitTestCases, CtsWidgetTestCases, CtsWindowManagerDeviceTestCases, CtsWrapNoWrapTestCases, CtsWrapWrapDebugMallocDebugTestCases, CtsWrapWrapDebugTestCases, CtsWrapWrapNoDebugTestCases, cts-system-all.api, signed-CtsSecureElementAccessControlTestCases1, signed-CtsSecureElementAccessControlTestCases2, signed-CtsSecureElementAccessControlTestCases3, vm-tests-tf of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.cts-system-all.api b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.cts-system-all.api
index f7dff21..f25f313 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.cts-system-all.api
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.cts-system-all.api
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module cts-system-all.api of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.signed-CtsSecureElementAccessControl b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.signed-CtsSecureElementAccessControl
index a7980d0..bd34fd8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.signed-CtsSecureElementAccessControl
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.signed-CtsSecureElementAccessControl
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module signed-CtsSecureElementAccessControlTestCases1, signed-CtsSecureElementAccessControlTestCases2, signed-CtsSecureElementAccessControlTestCases3 of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.tradefed-run-collect-tests-only-hardware-internal b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.tradefed-run-collect-tests-only-hardware-internal
index 3e98304..a0c59fa 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.tradefed-run-collect-tests-only-hardware-internal
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.tradefed-run-collect-tests-only-hardware-internal
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module tradefed-run-collect-tests-only-hardware-internal of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.tradefed-run-collect-tests-only-internal b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.tradefed-run-collect-tests-only-internal
index 4065d01..4e84dd8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.tradefed-run-collect-tests-only-internal
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.tradefed-run-collect-tests-only-internal
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LENGTHY'
 MAX_RESULT_SIZE_KB = 1024000
+PY_VERSION = 3
 DOC = 'Run all of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.vm-tests-tf b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.vm-tests-tf
index 11beb1f..0515142 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.vm-tests-tf
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.vm-tests-tf
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module vm-tests-tf of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.wm-presubmit b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.wm-presubmit
index 5c494f4..2e322e0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.wm-presubmit
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.wm-presubmit
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module wm-presubmit of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAbiOverrideHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAbiOverrideHostTestCases
index 885de8f..85e040a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAbiOverrideHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAbiOverrideHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAbiOverrideHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAccelerationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAccelerationTestCases
index c8223b3..c41165f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAccelerationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAccelerationTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAccessibility b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAccessibility
index a77efbf..a8d9ad9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAccessibility
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAccessibility
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAccessibilityServiceTestCases, CtsAccessibilityTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAccountManagerTestCases
index 7e4e509..77fbb4a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAccountManagerTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAccountManagerTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsActivityManagerDevice b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsActivityManagerDevice
index eebe81f..21927cf 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsActivityManagerDevice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsActivityManagerDevice
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsActivityManagerDeviceSdk25TestCases, CtsActivityManagerDeviceTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAdmin b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAdmin
index 8259393..2076074 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAdmin
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAdmin
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAdminPackageInstallerTestCases, CtsAdminTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAlarm b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAlarm
index 0abdb82..c56d15a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAlarm
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAlarm
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAlarmClockTestCases, CtsAlarmManagerTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAndroid b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAndroid
index 5629574..95688c0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAndroid
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAndroid
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAndroidAppTestCases, CtsAndroidTestBase27ApiSignatureTestCases, CtsAndroidTestMockCurrentApiSignatureTestCases, CtsAndroidTestRunnerCurrentApiSignatureTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAnimationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAnimationTestCases
index 528f81f..b5eb66e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAnimationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAnimationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAnimationTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsApacheHttpLegacy b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsApacheHttpLegacy
index d8d33f5..58d8b39 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsApacheHttpLegacy
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsApacheHttpLegacy
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsApacheHttpLegacy27ApiSignatureTestCases, CtsApacheHttpLegacyCurrentApiSignatureTestCases, CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsApp b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsApp
index c096f15..5946567 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsApp
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsApp
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAppComponentFactoryTestCases, CtsAppSecurityHostTestCases, CtsAppTestCases, CtsAppUsageHostTestCases, CtsAppWidgetTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAppTestCases.feature.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAppTestCases.feature.ctshardware
index 3285fdf..793cf0c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAppTestCases.feature.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAppTestCases.feature.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAppTestCases.feature of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAslrMallocTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAslrMallocTestCases
index 44be920..23ee1a2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAslrMallocTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAslrMallocTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAslrMallocTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAssistTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAssistTestCases
index 5643582..da03227 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAssistTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAssistTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAssistTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAtraceHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAtraceHostTestCases
index 245f0b6..2b6a628f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAtraceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAtraceHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAtraceHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAutoFillServiceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAutoFillServiceTestCases
index d560616..2ec284d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAutoFillServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAutoFillServiceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAutoFillServiceTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBackgroundRestrictionsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBackgroundRestrictionsTestCases
index 2f85fdb..4a9a325 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBackgroundRestrictionsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBackgroundRestrictionsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsBackgroundRestrictionsTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBackup b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBackup
index 6b13b9f..9831a55 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBackup
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBackup
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsBackupHostTestCases, CtsBackupTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBatterySavingTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBatterySavingTestCases
index 5dcb0ff..0510244 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBatterySavingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBatterySavingTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsBatterySavingTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBionicTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBionicTestCases
index 6da58b2..aceb208 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBionicTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBionicTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsBionicTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBluetoothTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBluetoothTestCases
index aa3d1b3..2fe946d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBluetoothTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBluetoothTestCases
@@ -14,6 +14,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsBluetoothTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 # For local debugging, if your test setup doesn't have servo, REMOVE these
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBootStatsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBootStatsTestCases
index 4d2781b..540101a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBootStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsBootStatsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsBootStatsTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCalendarcommon2TestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCalendarcommon2TestCases
index d6b7185..85b915c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCalendarcommon2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCalendarcommon2TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCalendarcommon2TestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCamera b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCamera
index 257c799..1d213f6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCamera
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCamera
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCameraApi25TestCases, CtsCameraTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.ctshardware
index 739e3d2..b139ffc 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCameraTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.back b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.back
index 950f66e..a5dd69a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.back
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.back
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCameraTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.front b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.front
index 9dc877e..332d953 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.front
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.front
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCameraTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCarTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCarTestCases
index 1864e06..d6efd41 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCarTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCarTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCarTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCarrierApiTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCarrierApiTestCases
index 14eb504..ede7f50 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCarrierApiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCarrierApiTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCarrierApiTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsColorModeTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsColorModeTestCases
index da26ade..472cee5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsColorModeTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsColorModeTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsColorModeTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCompilationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCompilationTestCases
index 8741a89..1927357 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCompilationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCompilationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCompilationTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsContactsProviderWipe b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsContactsProviderWipe
index 7ba720b..68e4330 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsContactsProviderWipe
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsContactsProviderWipe
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsContactsProviderWipe of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsContentTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsContentTestCases
index a67465d..c42c780 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsContentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsContentTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsContentTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCppToolsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCppToolsTestCases
index 974ec1e..3f0e07d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCppToolsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCppToolsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCppToolsTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCurrentApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCurrentApiSignatureTestCases
index 4aef8ac..cd3992f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCurrentApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCurrentApiSignatureTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCurrentApiSignatureTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDatabaseTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDatabaseTestCases
index 505bff5..eeea31c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDatabaseTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDatabaseTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDebugTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDebugTestCases
index 3a6a42f..302e40e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDebugTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDebugTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.32 b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.32
index 1d800f3..26ad15b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.32
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 1024000
+PY_VERSION = 3
 DOC = 'Run module CtsDeqpTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.64 b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.64
index f24e884..6f562dd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.64
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 1024000
+PY_VERSION = 3
 DOC = 'Run module CtsDeqpTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-EGL b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-EGL
index 05a4b74..eb8a2ae 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-EGL
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-EGL
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDeqpTestCases.dEQP-EGL of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES2 b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES2
index 04eefd0..cf906e3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES2
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES2
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDeqpTestCases.dEQP-GLES2 of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3 b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3
index 3fd3912..6dc47f9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDeqpTestCases.dEQP-GLES3 of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
index b617e3b..8b7e361 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES31 b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES31
index b6ae233..4d31640 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES31
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES31
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDeqpTestCases.dEQP-GLES31 of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-VK b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-VK
index 2b01b68..32280db 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-VK
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-VK
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDevice b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDevice
index c19ad60..000ec4f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDevice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDevice
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDeviceIdleHostTestCases, CtsDevicePolicyManagerTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDexMetadataHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDexMetadataHostTestCases
index 933c823..0610a59 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDexMetadataHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDexMetadataHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDexMetadataHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDisplayTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDisplayTestCases
index 1a12cf8..b79c10b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDisplayTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDisplayTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDisplayTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDpi b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDpi
index b4a80a9..7cb1026 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDpi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDpi
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDpiTestCases, CtsDpiTestCases2 of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDreamsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDreamsTestCases
index be10117..cc8aa2a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDreamsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDreamsTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDrmTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDrmTestCases
index b20e495..683f8f4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDrmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDrmTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDrmTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDumpsysHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDumpsysHostTestCases
index 15837ff..f07198d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDumpsysHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDumpsysHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDumpsysHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDynamicLinkerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDynamicLinkerTestCases
index 5253543..ec66617 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDynamicLinkerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDynamicLinkerTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDynamicLinkerTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsEdiHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsEdiHostTestCases
index fc6617f..125fb00 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsEdiHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsEdiHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsEdiHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsEffectTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsEffectTestCases
index abaaecf..cd5e7bb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsEffectTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsEffectTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsEffectTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsExternalS b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsExternalS
index 0af5665..2a9f080 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsExternalS
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsExternalS
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsExternalServiceTestCases, CtsExternalSourcesTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsFileSystemTestCases
index d39aa7b..4898a77 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsFileSystemTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsFileSystemTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsFragment b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsFragment
index 226856f..a57b3f3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsFragment
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsFragment
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsFragmentTestCases, CtsFragmentTestCasesSdk26 of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsGestureTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsGestureTestCases
index 8784460..7bcfc22 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsGestureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsGestureTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsGestureTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsGpuToolsHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsGpuToolsHostTestCases
index 46509f9..cc33a29 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsGpuToolsHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsGpuToolsHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsGpuToolsHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsGraphicsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsGraphicsTestCases
index a9779b0..9188d70 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsGraphicsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsGraphicsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsGraphicsTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHardwareTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHardwareTestCases
index 7103612..1aedbba 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHardwareTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHardwareTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHardwareTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHarmfulAppWarningHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHarmfulAppWarningHostTestCases
index 6bf7827..9fa6de0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHarmfulAppWarningHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHarmfulAppWarningHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHarmfulAppWarningHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHiddenApi b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHiddenApi
index 7767a89..89639f7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHiddenApi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHiddenApi
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHiddenApiBlacklistApi27TestCases, CtsHiddenApiBlacklistCurrentApiTestCases, CtsHiddenApiBlacklistDebugClassTestCases, CtsHiddenApiKillswitchDebugClassTestCases, CtsHiddenApiKillswitchWhitelistTestCases, CtsHiddenApiKillswitchWildcardTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHostTzDataTests b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHostTzDataTests
index ebbe7d1..09ea273 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHostTzDataTests
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHostTzDataTests
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHostTzDataTests of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHostside b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHostside
index fe2002a..3f324b1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHostside
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsHostside
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHostsideNetworkTests, CtsHostsideNumberBlockingTestCases, CtsHostsideTvTests, CtsHostsideWebViewTests of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsIcuTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsIcuTestCases
index 349fcc0..6e33fcd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsIcuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsIcuTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsIcuTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsIncidentHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsIncidentHostTestCases
index bb8c416..ca65be0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsIncidentHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsIncidentHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsIncidentHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsInlineMockingTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsInlineMockingTestCases
index f09e083..92660a7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsInlineMockingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsInlineMockingTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsInlineMockingTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsInputMethod b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsInputMethod
index 0f1c5bc..e02575e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsInputMethod
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsInputMethod
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsInputMethodServiceHostTestCases, CtsInputMethodTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsIntentSignatureTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsIntentSignatureTestCases
index 3d72faa..837d77d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsIntentSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsIntentSignatureTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsIntentSignatureTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJankDeviceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJankDeviceTestCases
index 68a4f77..10462bb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJankDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJankDeviceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJankDeviceTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJdwp b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJdwp
index 07503c4..0c9e979 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJdwp
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJdwp
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJdwpSecurityHostTestCases, CtsJdwpTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJniTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJniTestCases
index 236b222..824a3c1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJniTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJniTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJniTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJobScheduler b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJobScheduler
index d7ba26a..be974bb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJobScheduler
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJobScheduler
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJobSchedulerSharedUidTestCases, CtsJobSchedulerTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJvmti b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJvmti
index 2101310..6103107 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJvmti
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsJvmti
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiAttachingHostTestCases, CtsJvmtiAttachingTestCases, CtsJvmtiRedefineClassesHostTestCases, CtsJvmtiRunTest1900HostTestCases, CtsJvmtiRunTest1901HostTestCases, CtsJvmtiRunTest1902HostTestCases, CtsJvmtiRunTest1903HostTestCases, CtsJvmtiRunTest1904HostTestCases, CtsJvmtiRunTest1906HostTestCases, CtsJvmtiRunTest1907HostTestCases, CtsJvmtiRunTest1908HostTestCases, CtsJvmtiRunTest1909HostTestCases, CtsJvmtiRunTest1910HostTestCases, CtsJvmtiRunTest1911HostTestCases, CtsJvmtiRunTest1912HostTestCases, CtsJvmtiRunTest1913HostTestCases, CtsJvmtiRunTest1914HostTestCases, CtsJvmtiRunTest1915HostTestCases, CtsJvmtiRunTest1916HostTestCases, CtsJvmtiRunTest1917HostTestCases, CtsJvmtiRunTest1920HostTestCases, CtsJvmtiRunTest1921HostTestCases, CtsJvmtiRunTest1922HostTestCases, CtsJvmtiRunTest1923HostTestCases, CtsJvmtiRunTest1924HostTestCases, CtsJvmtiRunTest1925HostTestCases, CtsJvmtiRunTest1926HostTestCases, CtsJvmtiRunTest1927HostTestCases, CtsJvmtiRunTest1928HostTestCases, CtsJvmtiRunTest1930HostTestCases, CtsJvmtiRunTest1931HostTestCases, CtsJvmtiRunTest1932HostTestCases, CtsJvmtiRunTest1933HostTestCases, CtsJvmtiRunTest1934HostTestCases, CtsJvmtiRunTest1936HostTestCases, CtsJvmtiRunTest1937HostTestCases, CtsJvmtiRunTest1939HostTestCases, CtsJvmtiRunTest1941HostTestCases, CtsJvmtiRunTest1942HostTestCases, CtsJvmtiRunTest1943HostTestCases, CtsJvmtiRunTest902HostTestCases, CtsJvmtiRunTest903HostTestCases, CtsJvmtiRunTest904HostTestCases, CtsJvmtiRunTest905HostTestCases, CtsJvmtiRunTest906HostTestCases, CtsJvmtiRunTest907HostTestCases, CtsJvmtiRunTest908HostTestCases, CtsJvmtiRunTest910HostTestCases, CtsJvmtiRunTest911HostTestCases, CtsJvmtiRunTest912HostTestCases, CtsJvmtiRunTest913HostTestCases, CtsJvmtiRunTest914HostTestCases, CtsJvmtiRunTest915HostTestCases, CtsJvmtiRunTest917HostTestCases, CtsJvmtiRunTest918HostTestCases, CtsJvmtiRunTest919HostTestCases, CtsJvmtiRunTest920HostTestCases, CtsJvmtiRunTest922HostTestCases, CtsJvmtiRunTest923HostTestCases, CtsJvmtiRunTest924HostTestCases, CtsJvmtiRunTest926HostTestCases, CtsJvmtiRunTest927HostTestCases, CtsJvmtiRunTest928HostTestCases, CtsJvmtiRunTest930HostTestCases, CtsJvmtiRunTest931HostTestCases, CtsJvmtiRunTest932HostTestCases, CtsJvmtiRunTest940HostTestCases, CtsJvmtiRunTest942HostTestCases, CtsJvmtiRunTest944HostTestCases, CtsJvmtiRunTest945HostTestCases, CtsJvmtiRunTest947HostTestCases, CtsJvmtiRunTest951HostTestCases, CtsJvmtiRunTest982HostTestCases, CtsJvmtiRunTest983HostTestCases, CtsJvmtiRunTest984HostTestCases, CtsJvmtiRunTest985HostTestCases, CtsJvmtiRunTest986HostTestCases, CtsJvmtiRunTest988HostTestCases, CtsJvmtiRunTest989HostTestCases, CtsJvmtiRunTest990HostTestCases, CtsJvmtiRunTest991HostTestCases, CtsJvmtiRunTest992HostTestCases, CtsJvmtiRunTest993HostTestCases, CtsJvmtiRunTest994HostTestCases, CtsJvmtiRunTest995HostTestCases, CtsJvmtiRunTest996HostTestCases, CtsJvmtiRunTest997HostTestCases, CtsJvmtiTaggingHostTestCases, CtsJvmtiTrackingHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsKernelConfigTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsKernelConfigTestCases
index 9531eb2..1e6a94c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsKernelConfigTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsKernelConfigTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsKernelConfigTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsKeystoreTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsKeystoreTestCases
index 8b8897e..06d1c32 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsKeystoreTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsKeystoreTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsKeystoreTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLeanbackJankTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLeanbackJankTestCases
index 1f5392d..d59d218 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLeanbackJankTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLeanbackJankTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLeanbackJankTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLegacyNotificationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLegacyNotificationTestCases
index 94a1a0e..e2814f9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLegacyNotificationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLegacyNotificationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLegacyNotificationTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLibcore b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLibcore
index 5cb2fd5..b3284b0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLibcore
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLibcore
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLibcoreFileIOTestCases, CtsLibcoreJsr166TestCases, CtsLibcoreLegacy22TestCases, CtsLibcoreOjTestCases, CtsLibcoreOkHttpTestCases, CtsLibcoreTestCases, CtsLibcoreWycheproofBCTestCases, CtsLibcoreWycheproofConscryptTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLiblogTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLiblogTestCases
index f78a076..14b2667 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLiblogTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLiblogTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLiblogTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLocation b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLocation
index 1f7e25b..8867067 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLocation
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLocation
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLocation2TestCases, CtsLocationTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLogdTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLogdTestCases
index f4e7672..96ae523 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLogdTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsLogdTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLogdTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaBitstreamsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaBitstreamsTestCases
index f3fa86c..4d3a639 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaBitstreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaBitstreamsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaBitstreamsTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaHostTestCases
index 70211a8..5898d26 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaStressTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaStressTestCases
index 9eca698..54c9ebe 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaStressTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaStressTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaStressTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaStressTestCases.camera.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaStressTestCases.camera.ctshardware
index bed28f5..ed9f2db 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaStressTestCases.camera.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaStressTestCases.camera.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaStressTestCases.camera of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.32 b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.32
index 7eec338..f9d4a2a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.32
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.64 b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.64
index df01ae4..f649338 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.64
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.DecodeAccuracyTest b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.DecodeAccuracyTest
index 3efee45..293799f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.DecodeAccuracyTest
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.DecodeAccuracyTest
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaTestCases.DecodeAccuracyTest of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.DecodeAccuracyTest.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.DecodeAccuracyTest.ctshardware
index 9c569f0..da11485 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.DecodeAccuracyTest.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.DecodeAccuracyTest.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaTestCases.DecodeAccuracyTest of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest
index 4f06940..e4b8088 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaTestCases.VideoDecoderPerfAndEncoderTest of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware
index a95157f..e5b338b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaTestCases.VideoDecoderPerfAndEncoderTest of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.audio b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.audio
index 65d4c19..ff342a4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.audio
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.audio
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaTestCases.audio of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.ctshardware
index b0bb7b7..d0083f0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.other b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.other
index 7e23e24..a3ac271 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.other
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.other
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaTestCases.other of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.other.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.other.ctshardware
index 97be740..78e934c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.other.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.other.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaTestCases.other of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMidiTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMidiTestCases
index 21e2a63..2c8f548 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMidiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMidiTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMidiTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMocking b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMocking
index 693f6b3..76ce800 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMocking
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMocking
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMockingDebuggableTestCases, CtsMockingTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMonkeyTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMonkeyTestCases
index bff77da..88fe62e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMonkeyTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMonkeyTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMonkeyTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMultiUser b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMultiUser
index 69a7abb..30f74fa 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMultiUser
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMultiUser
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMultiUserHostTestCases, CtsMultiUserTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNNAPITestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNNAPITestCases
index 0ff9e91..b5a9035 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNNAPITestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNNAPITestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNNAPITestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNative b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNative
index 54555d7..b579c9e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNative
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNative
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNativeHardwareTestCases, CtsNativeMediaAAudioTestCases, CtsNativeMediaSlTestCases, CtsNativeMediaXaTestCases, CtsNativeNetTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNativeMediaAAudioTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNativeMediaAAudioTestCases.ctshardware
index 702be8b..7f0b4e6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNativeMediaAAudioTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNativeMediaAAudioTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNativeMediaAAudioTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNdefTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNdefTestCases
index 9b8ae91..22c13b8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNdefTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNdefTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNdefTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNet b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNet
index 712a4d7..d1cd06a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNet
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNet
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetSecConfigAttributeTestCases, CtsNetSecConfigBasicDebugDisabledTestCases, CtsNetSecConfigBasicDebugEnabledTestCases, CtsNetSecConfigBasicDomainConfigTestCases, CtsNetSecConfigCleartextTrafficTestCases, CtsNetSecConfigDownloadManagerTestCases, CtsNetSecConfigInvalidPinTestCases, CtsNetSecConfigNestedDomainConfigTestCases, CtsNetSecConfigPrePCleartextTrafficTestCases, CtsNetSecConfigResourcesSrcTestCases, CtsNetSecPolicyUsesCleartextTrafficFalseTestCases, CtsNetSecPolicyUsesCleartextTrafficTrueTestCases, CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases, CtsNetTestCases, CtsNetTestCasesLegacyApi22, CtsNetTestCasesLegacyPermission22 of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNetTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNetTestCases.ctshardware
index 3281358..0821256 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNetTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNetTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsOmapiTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsOmapiTestCases
index a8b81bb..9b4c3e4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsOmapiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsOmapiTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsOmapiTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsOpenG b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsOpenG
index 4aa4135..0d15737 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsOpenG
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsOpenG
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsOpenGLTestCases, CtsOpenGlPerf2TestCases, CtsOpenGlPerfTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsOs b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsOs
index 606bc2e..5ae2bf1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsOs
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsOs
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsOsHostTestCases, CtsOsTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPdfTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPdfTestCases
index 4e2bc94..c6eb4dc 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPdfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPdfTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPdfTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPerfettoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPerfettoTestCases
index 6b08660..e8b2c0f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPerfettoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPerfettoTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPerfettoTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPerfettoTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPerfettoTestCases.ctshardware
index cb4b5d8..dab7836 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPerfettoTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPerfettoTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPerfettoTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPermission b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPermission
index 36669db..b4b7926 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPermission
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPermission
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPermission2TestCases, CtsPermissionTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPermissionTestCases.camera.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPermissionTestCases.camera.ctshardware
index 809d235..cf7b926 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPermissionTestCases.camera.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPermissionTestCases.camera.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPermissionTestCases.camera of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPreference b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPreference
index cdb9aff..5fc6f8a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPreference
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPreference
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPreference2TestCases, CtsPreferenceTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPrintTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPrintTestCases
index 1fc89d2..afb253d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPrintTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPrintTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsProtoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsProtoTestCases
index eb4601e..7fe0fe8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsProtoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsProtoTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsProtoTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsProviderTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsProviderTestCases
index 1cad2b8..5e79cf9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsProviderTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsProviderTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsProviderTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsRenderscript b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsRenderscript
index 6ad7491..e97ff1c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsRenderscript
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsRenderscript
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsRenderscriptLegacyTestCases, CtsRenderscriptTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsRs b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsRs
index db4ed51..d5cee33 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsRs
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsRs
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsRsBlasTestCases, CtsRsCppTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSample b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSample
index b4d504cd..379682e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSample
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSample
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSampleDeviceTestCases, CtsSampleHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSaxTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSaxTestCases
index e766334..b69000c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSaxTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSaxTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSaxTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSeccompHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSeccompHostTestCases
index 2a0e135..6fe4bf5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSeccompHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSeccompHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSeccompHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSecureElementAccessControl b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSecureElementAccessControl
index b824eb0..6c77a93 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSecureElementAccessControl
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSecureElementAccessControl
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSecureElementAccessControlTestCases1, CtsSecureElementAccessControlTestCases2, CtsSecureElementAccessControlTestCases3 of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSecurity b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSecurity
index 6af1cc3..d6dfb37 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSecurity
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSecurity
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSecurityBulletinHostTestCases, CtsSecurityHostTestCases, CtsSecurityTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSelinuxTargetSdk b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSelinuxTargetSdk
index 0581384..a138de9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSelinuxTargetSdk
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSelinuxTargetSdk
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSelinuxTargetSdk25TestCases, CtsSelinuxTargetSdk27TestCases, CtsSelinuxTargetSdkCurrentTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSensorTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSensorTestCases
index 6951496..2f1c86d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSensorTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSensorTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSensorTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSensorTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSensorTestCases.ctshardware
index 48077d5..7f2c7dc 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSensorTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSensorTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSensorTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsShortcut b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsShortcut
index 6dd0630..3e9d6bf 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsShortcut
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsShortcut
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsShortcutHostTestCases, CtsShortcutManagerTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSimRestrictedApisTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSimRestrictedApisTestCases
index 1fcd4be..995305b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSimRestrictedApisTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSimRestrictedApisTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSimRestrictedApisTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSimpleCpuTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSimpleCpuTestCases
index c924a96..c89a043 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSimpleCpuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSimpleCpuTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSimpleCpuTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSimpleperfTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSimpleperfTestCases
index 6ddf50d..f99eafd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSimpleperfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSimpleperfTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSimpleperfTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSkQPTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSkQPTestCases
index 3a43cb3..e9327de 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSkQPTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSkQPTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSkQPTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSliceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSliceTestCases
index 2b17595..945029d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSliceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSliceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSliceTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSpeechTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSpeechTestCases
index 432c99c..500a2fd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSpeechTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSpeechTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSpeechTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsStatsdHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsStatsdHostTestCases
index 047baad..7d0d941 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsStatsdHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsStatsdHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsStatsdHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSustainedPerformanceHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSustainedPerformanceHostTestCases
index 288a025..2a39d43 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSustainedPerformanceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSustainedPerformanceHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSustainedPerformanceHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSustainedPerformanceHostTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSustainedPerformanceHostTestCases.ctshardware
index 2dde4d8..a8e23da 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSustainedPerformanceHostTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSustainedPerformanceHostTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSustainedPerformanceHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSync b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSync
index c6fb4f9..1d41152 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSync
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSync
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSyncAccountAccessOtherCertTestCases, CtsSyncContentHostTestCases, CtsSyncManagerTestsCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSystem b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSystem
index 7ccefa5..c00a322 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSystem
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSystem
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSystemApiAnnotationTestCases, CtsSystemApiSignatureTestCases, CtsSystemIntentTestCases, CtsSystemUiHostTestCases, CtsSystemUiTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTelecom b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTelecom
index b49bf88..4b0e030 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTelecom
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTelecom
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTelecomTestCases, CtsTelecomTestCases2, CtsTelecomTestCases3 of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTelephony b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTelephony
index 6439e27..59c13ff 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTelephony
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTelephony
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTelephony2TestCases, CtsTelephonyTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTextTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTextTestCases
index d7e47ef..e2ed1f2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTextTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTextTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTextTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTheme b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTheme
index 73a050c..2f37fc2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTheme
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTheme
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsThemeDeviceTestCases, CtsThemeHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsToast b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsToast
index 7aeb52b..e6bd376 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsToast
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsToast
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsToastLegacyTestCases, CtsToastTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTransitionTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTransitionTestCases
index 3df719d..9d4862b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTransitionTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTransitionTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTransitionTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTrustedVoiceHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTrustedVoiceHostTestCases
index d118298..b09d641 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTrustedVoiceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTrustedVoiceHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTrustedVoiceHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTv b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTv
index ae0443a..aa0de74 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTv
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsTv
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTvProviderTestCases, CtsTvTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUi b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUi
index a3ed4e8..4ea833a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUi
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUiAutomationTestCases, CtsUiDeviceTestCases, CtsUiRenderingTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUidIsolationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUidIsolationTestCases
index 04a0d40..219df2d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUidIsolationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUidIsolationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUidIsolationTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUsageStatsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUsageStatsTestCases
index d9d29a8..ed9a413 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUsageStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUsageStatsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUsageStatsTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUsageStatsTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUsageStatsTestCases.ctshardware
index ffa1d73..1808076 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUsageStatsTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUsageStatsTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUsageStatsTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUsbTests b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUsbTests
index 480b904..5ece5e0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUsbTests
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUsbTests
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUsbTests of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUtilTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUtilTestCases
index 2a8f536..69bd155 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUtilTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUtilTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUtilTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVideoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVideoTestCases
index a94c704..5806ce6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVideoTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsVideoTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsViewTestCases.32 b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsViewTestCases.32
index eab3107..1885c8c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsViewTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsViewTestCases.32
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsViewTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsViewTestCases.64 b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsViewTestCases.64
index 49761ea..829429e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsViewTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsViewTestCases.64
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsViewTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsViewTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsViewTestCases.ctshardware
index 3633744..9e5380a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsViewTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsViewTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsViewTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVmTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVmTestCases
index 29ac856..daaf1e9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVmTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsVmTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVoice b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVoice
index 53baf8e..b6e7d73 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVoice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVoice
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsVoiceInteractionTestCases, CtsVoiceSettingsTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVrTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVrTestCases
index 46aada3..e7d1429 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVrTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsVrTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsVrTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWebkitTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWebkitTestCases
index f8551f3..a71ba6e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWebkitTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWebkitTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsWebkitTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWidgetTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWidgetTestCases
index 0ad1d0e..b58b3c3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWidgetTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsWidgetTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWindowManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWindowManagerDeviceTestCases
index adf4c39..adb380b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWindowManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWindowManagerDeviceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsWindowManagerDeviceTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWrap b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWrap
index be4b4bd..b4b2693 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWrap
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsWrap
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsWrapNoWrapTestCases, CtsWrapWrapDebugMallocDebugTestCases, CtsWrapWrapDebugTestCases, CtsWrapWrapNoDebugTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
index e7ff66f..378f0bd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAbiOverrideHostTestCases, CtsAccelerationTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
index f58c7aa..8071655 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAccessibilityServiceTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
index d96775a..e752dce 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAccessibilityTestCases, CtsAccountManagerTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
index d3d384f..f00906e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsActivityManagerDeviceSdk25TestCases, CtsActivityManagerDeviceTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
index cf1419f..97d5615 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAdminPackageInstallerTestCases, CtsAdminTestCases, CtsAlarmClockTestCases, CtsAlarmManagerTestCases, CtsAndroidAppTestCases, CtsAndroidTestBase27ApiSignatureTestCases, CtsAndroidTestMockCurrentApiSignatureTestCases, CtsAndroidTestRunnerCurrentApiSignatureTestCases, CtsAnimationTestCases, CtsApacheHttpLegacy27ApiSignatureTestCases, CtsApacheHttpLegacyCurrentApiSignatureTestCases, CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases, CtsAppComponentFactoryTestCases, CtsAppSecurityHostTestCases, CtsAppTestCases, CtsAppUsageHostTestCases, CtsAppWidgetTestCases, CtsAslrMallocTestCases, CtsAssistTestCases, CtsAtraceHostTestCases, CtsAutoFillServiceTestCases, CtsBackgroundRestrictionsTestCases, CtsBackupHostTestCases, CtsBackupTestCases, CtsBatterySavingTestCases, CtsBionicTestCases, CtsBluetoothTestCases, CtsBootStatsTestCases, CtsCalendarcommon2TestCases, CtsCameraApi25TestCases, CtsCameraTestCases, CtsCarTestCases, CtsCarrierApiTestCases, CtsColorModeTestCases, CtsCompilationTestCases, CtsContactsProviderWipe, CtsContentTestCases, CtsCppToolsTestCases, CtsCurrentApiSignatureTestCases, CtsDatabaseTestCases, CtsDebugTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32 b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
index 6f981f1..14c6889 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 1024000
+PY_VERSION = 3
 DOC = 'Run module CtsDeqpTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64 b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
index fd35c31..e48ad11 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 1024000
+PY_VERSION = 3
 DOC = 'Run module CtsDeqpTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
index d6c899f..57715a8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDeviceIdleHostTestCases, CtsDevicePolicyManagerTestCases, CtsDexMetadataHostTestCases, CtsDisplayTestCases, CtsDpiTestCases, CtsDpiTestCases2, CtsDreamsTestCases, CtsDrmTestCases, CtsDumpsysHostTestCases, CtsDynamicLinkerTestCases, CtsEdiHostTestCases, CtsEffectTestCases, CtsExternalServiceTestCases, CtsExternalSourcesTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
index b2d8553..61dcfac 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsFileSystemTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
index 0ed7006..8371fc4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsFragmentTestCases_-_CtsJobSchedulerTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsFragmentTestCases, CtsFragmentTestCasesSdk26, CtsGestureTestCases, CtsGpuToolsHostTestCases, CtsGraphicsTestCases, CtsHardwareTestCases, CtsHarmfulAppWarningHostTestCases, CtsHiddenApiBlacklistApi27TestCases, CtsHiddenApiBlacklistCurrentApiTestCases, CtsHiddenApiBlacklistDebugClassTestCases, CtsHiddenApiKillswitchDebugClassTestCases, CtsHiddenApiKillswitchWhitelistTestCases, CtsHiddenApiKillswitchWildcardTestCases, CtsHostTzDataTests, CtsHostsideNetworkTests, CtsHostsideNumberBlockingTestCases, CtsHostsideTvTests, CtsHostsideWebViewTests, CtsIcuTestCases, CtsIncidentHostTestCases, CtsInlineMockingTestCases, CtsInputMethodServiceHostTestCases, CtsInputMethodTestCases, CtsIntentSignatureTestCases, CtsJankDeviceTestCases, CtsJdwpSecurityHostTestCases, CtsJdwpTestCases, CtsJniTestCases, CtsJobSchedulerSharedUidTestCases, CtsJobSchedulerTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
index c0eb21e..e54a18f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiAttachingHostTestCases, CtsJvmtiAttachingTestCases, CtsJvmtiRedefineClassesHostTestCases, CtsJvmtiRunTest1900HostTestCases, CtsJvmtiRunTest1901HostTestCases, CtsJvmtiRunTest1902HostTestCases, CtsJvmtiRunTest1903HostTestCases, CtsJvmtiRunTest1904HostTestCases, CtsJvmtiRunTest1906HostTestCases, CtsJvmtiRunTest1907HostTestCases, CtsJvmtiRunTest1908HostTestCases, CtsJvmtiRunTest1909HostTestCases, CtsJvmtiRunTest1910HostTestCases, CtsJvmtiRunTest1911HostTestCases, CtsJvmtiRunTest1912HostTestCases, CtsJvmtiRunTest1913HostTestCases, CtsJvmtiRunTest1914HostTestCases, CtsJvmtiRunTest1915HostTestCases, CtsJvmtiRunTest1916HostTestCases, CtsJvmtiRunTest1917HostTestCases, CtsJvmtiRunTest1920HostTestCases, CtsJvmtiRunTest1921HostTestCases, CtsJvmtiRunTest1922HostTestCases, CtsJvmtiRunTest1923HostTestCases, CtsJvmtiRunTest1924HostTestCases, CtsJvmtiRunTest1925HostTestCases, CtsJvmtiRunTest1926HostTestCases, CtsJvmtiRunTest1927HostTestCases, CtsJvmtiRunTest1928HostTestCases, CtsJvmtiRunTest1930HostTestCases, CtsJvmtiRunTest1931HostTestCases, CtsJvmtiRunTest1932HostTestCases, CtsJvmtiRunTest1933HostTestCases, CtsJvmtiRunTest1934HostTestCases, CtsJvmtiRunTest1936HostTestCases, CtsJvmtiRunTest1937HostTestCases, CtsJvmtiRunTest1939HostTestCases, CtsJvmtiRunTest1941HostTestCases, CtsJvmtiRunTest1942HostTestCases, CtsJvmtiRunTest1943HostTestCases, CtsJvmtiRunTest902HostTestCases, CtsJvmtiRunTest903HostTestCases, CtsJvmtiRunTest904HostTestCases, CtsJvmtiRunTest905HostTestCases, CtsJvmtiRunTest906HostTestCases, CtsJvmtiRunTest907HostTestCases, CtsJvmtiRunTest908HostTestCases, CtsJvmtiRunTest910HostTestCases, CtsJvmtiRunTest911HostTestCases, CtsJvmtiRunTest912HostTestCases, CtsJvmtiRunTest913HostTestCases, CtsJvmtiRunTest914HostTestCases, CtsJvmtiRunTest915HostTestCases, CtsJvmtiRunTest917HostTestCases, CtsJvmtiRunTest918HostTestCases, CtsJvmtiRunTest919HostTestCases, CtsJvmtiRunTest920HostTestCases, CtsJvmtiRunTest922HostTestCases, CtsJvmtiRunTest923HostTestCases, CtsJvmtiRunTest924HostTestCases, CtsJvmtiRunTest926HostTestCases, CtsJvmtiRunTest927HostTestCases, CtsJvmtiRunTest928HostTestCases, CtsJvmtiRunTest930HostTestCases, CtsJvmtiRunTest931HostTestCases, CtsJvmtiRunTest932HostTestCases, CtsJvmtiRunTest940HostTestCases, CtsJvmtiRunTest942HostTestCases, CtsJvmtiRunTest944HostTestCases, CtsJvmtiRunTest945HostTestCases, CtsJvmtiRunTest947HostTestCases, CtsJvmtiRunTest951HostTestCases, CtsJvmtiRunTest982HostTestCases, CtsJvmtiRunTest983HostTestCases, CtsJvmtiRunTest984HostTestCases, CtsJvmtiRunTest985HostTestCases, CtsJvmtiRunTest986HostTestCases, CtsJvmtiRunTest988HostTestCases, CtsJvmtiRunTest989HostTestCases, CtsJvmtiRunTest990HostTestCases, CtsJvmtiRunTest991HostTestCases, CtsJvmtiRunTest992HostTestCases, CtsJvmtiRunTest993HostTestCases, CtsJvmtiRunTest994HostTestCases, CtsJvmtiRunTest995HostTestCases, CtsJvmtiRunTest996HostTestCases, CtsJvmtiRunTest997HostTestCases, CtsJvmtiTaggingHostTestCases, CtsJvmtiTrackingHostTestCases, CtsKernelConfigTestCases, CtsKeystoreTestCases, CtsLeanbackJankTestCases, CtsLegacyNotificationTestCases, CtsLibcoreFileIOTestCases, CtsLibcoreJsr166TestCases, CtsLibcoreLegacy22TestCases, CtsLibcoreOjTestCases, CtsLibcoreOkHttpTestCases, CtsLibcoreTestCases, CtsLibcoreWycheproofBCTestCases, CtsLibcoreWycheproofConscryptTestCases, CtsLiblogTestCases, CtsLocation2TestCases, CtsLocationTestCases, CtsLogdTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases
index 1c4c4c6..f4810a6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaBitstreamsTestCases_-_CtsMediaBitstreamsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaBitstreamsTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
index 468cbac..ada8846 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases
index 41f6c6f..685b3dd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaStressTestCases_-_CtsMediaStressTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaStressTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.32 b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.32
index 5a607bb..7dfe923 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.32
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.64 b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.64
index 754409a..6f9cc3c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMediaTestCases_-_CtsMediaTestCases.64
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
index 47a55c1..7159b77 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMidiTestCases, CtsMockingDebuggableTestCases, CtsMockingTestCases, CtsMonkeyTestCases, CtsMultiUserHostTestCases, CtsMultiUserTestCases, CtsNNAPITestCases, CtsNativeHardwareTestCases, CtsNativeMediaAAudioTestCases, CtsNativeMediaSlTestCases, CtsNativeMediaXaTestCases, CtsNativeNetTestCases, CtsNdefTestCases, CtsNetSecConfigAttributeTestCases, CtsNetSecConfigBasicDebugDisabledTestCases, CtsNetSecConfigBasicDebugEnabledTestCases, CtsNetSecConfigBasicDomainConfigTestCases, CtsNetSecConfigCleartextTrafficTestCases, CtsNetSecConfigDownloadManagerTestCases, CtsNetSecConfigInvalidPinTestCases, CtsNetSecConfigNestedDomainConfigTestCases, CtsNetSecConfigPrePCleartextTrafficTestCases, CtsNetSecConfigResourcesSrcTestCases, CtsNetSecPolicyUsesCleartextTrafficFalseTestCases, CtsNetSecPolicyUsesCleartextTrafficTrueTestCases, CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases, CtsNetTestCases, CtsNetTestCasesLegacyApi22, CtsNetTestCasesLegacyPermission22, CtsOmapiTestCases, CtsOpenGLTestCases, CtsOpenGlPerf2TestCases, CtsOpenGlPerfTestCases, CtsOsHostTestCases, CtsOsTestCases, CtsPdfTestCases, CtsPerfettoTestCases, CtsPermission2TestCases, CtsPermissionTestCases, CtsPreference2TestCases, CtsPreferenceTestCases, CtsPrintTestCases, CtsProtoTestCases, CtsProviderTestCases, CtsRenderscriptLegacyTestCases, CtsRenderscriptTestCases, CtsRsBlasTestCases, CtsRsCppTestCases, CtsSampleDeviceTestCases, CtsSampleHostTestCases, CtsSaxTestCases, CtsSeccompHostTestCases, CtsSecureElementAccessControlTestCases1, CtsSecureElementAccessControlTestCases2, CtsSecureElementAccessControlTestCases3, CtsSecurityBulletinHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
index ebed8af..0511461 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSecurityHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
index 80456a6..2d82aae 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSecurityTestCases, CtsSelinuxTargetSdk25TestCases, CtsSelinuxTargetSdk27TestCases, CtsSelinuxTargetSdkCurrentTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsSensorTestCases_-_CtsSensorTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsSensorTestCases_-_CtsSensorTestCases
index 28b024e..576820a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsSensorTestCases_-_CtsSensorTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsSensorTestCases_-_CtsSensorTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSensorTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
index fd6d47d..5836c07 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsShortcutHostTestCases, CtsShortcutManagerTestCases, CtsSimRestrictedApisTestCases, CtsSimpleCpuTestCases, CtsSimpleperfTestCases, CtsSkQPTestCases, CtsSliceTestCases, CtsSpeechTestCases, CtsStatsdHostTestCases, CtsSustainedPerformanceHostTestCases, CtsSyncAccountAccessOtherCertTestCases, CtsSyncContentHostTestCases, CtsSyncManagerTestsCases, CtsSystemApiAnnotationTestCases, CtsSystemApiSignatureTestCases, CtsSystemIntentTestCases, CtsSystemUiHostTestCases, CtsSystemUiTestCases, CtsTelecomTestCases, CtsTelecomTestCases2, CtsTelecomTestCases3, CtsTelephony2TestCases, CtsTelephonyTestCases, CtsTextTestCases, CtsThemeDeviceTestCases, CtsThemeHostTestCases, CtsToastLegacyTestCases, CtsToastTestCases, CtsTransitionTestCases, CtsTrustedVoiceHostTestCases, CtsTvProviderTestCases, CtsTvTestCases, CtsUiAutomationTestCases, CtsUiDeviceTestCases, CtsUiRenderingTestCases, CtsUidIsolationTestCases, CtsUsageStatsTestCases, CtsUsbTests, CtsUtilTestCases, CtsVideoTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsViewTestCases_-_CtsViewTestCases.32 b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsViewTestCases_-_CtsViewTestCases.32
index b9ea248..4406f3a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsViewTestCases_-_CtsViewTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsViewTestCases_-_CtsViewTestCases.32
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsViewTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsViewTestCases_-_CtsViewTestCases.64 b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsViewTestCases_-_CtsViewTestCases.64
index ecc3a7d..c9e22fb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsViewTestCases_-_CtsViewTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsViewTestCases_-_CtsViewTestCases.64
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsViewTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsVmTestCases_-_vm-tests-tf b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsVmTestCases_-_vm-tests-tf
index c1da742..6171771 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsVmTestCases_-_vm-tests-tf
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.all.CtsVmTestCases_-_vm-tests-tf
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsVmTestCases, CtsVoiceInteractionTestCases, CtsVoiceSettingsTestCases, CtsVrTestCases, CtsWebkitTestCases, CtsWidgetTestCases, CtsWindowManagerDeviceTestCases, CtsWrapNoWrapTestCases, CtsWrapWrapDebugMallocDebugTestCases, CtsWrapWrapDebugTestCases, CtsWrapWrapNoDebugTestCases, cts-system-all.api, signed-CtsSecureElementAccessControlTestCases1, signed-CtsSecureElementAccessControlTestCases2, signed-CtsSecureElementAccessControlTestCases3, vm-tests-tf of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.cts-system-all.api b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.cts-system-all.api
index bcc1637..841fb1e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.cts-system-all.api
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.cts-system-all.api
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module cts-system-all.api of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.signed-CtsSecureElementAccessControl b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.signed-CtsSecureElementAccessControl
index 08056de..9b7797c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.signed-CtsSecureElementAccessControl
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.signed-CtsSecureElementAccessControl
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module signed-CtsSecureElementAccessControlTestCases1, signed-CtsSecureElementAccessControlTestCases2, signed-CtsSecureElementAccessControlTestCases3 of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.tradefed-run-collect-tests-only-hardware-internal b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.tradefed-run-collect-tests-only-hardware-internal
index c0d8862..d58e930 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.tradefed-run-collect-tests-only-hardware-internal
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.tradefed-run-collect-tests-only-hardware-internal
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module tradefed-run-collect-tests-only-hardware-internal of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.tradefed-run-collect-tests-only-internal b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.tradefed-run-collect-tests-only-internal
index b3f5a59..debd66e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.tradefed-run-collect-tests-only-internal
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.tradefed-run-collect-tests-only-internal
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LENGTHY'
 MAX_RESULT_SIZE_KB = 1024000
+PY_VERSION = 3
 DOC = 'Run all of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.vm-tests-tf b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.vm-tests-tf
index 9009e09..ed67e5c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.vm-tests-tf
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.vm-tests-tf
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module vm-tests-tf of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.wm-presubmit b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.wm-presubmit
index 72c9b1c..0e1a93d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.wm-presubmit
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.wm-presubmit
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module wm-presubmit of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAbiOverrideHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAbiOverrideHostTestCases
index 6b992d7..4630987 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAbiOverrideHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAbiOverrideHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAbiOverrideHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAccelerationTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAccelerationTestCases
index 356a62e..8e5891d 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAccelerationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAccelerationTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAccessibilityServiceTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAccessibilityServiceTestCases
index 7768b2d..bef5ea7 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAccessibilityServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAccessibilityServiceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAccessibilityServiceTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAccessibilityTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAccessibilityTestCases
index 6a50ded..f7e264a 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAccessibilityTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAccessibilityTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAccessibilityTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAccountManagerTestCases
index 778d513..79b1a01 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAccountManagerTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAccountManagerTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsActivityManagerDeviceSdk25TestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsActivityManagerDeviceSdk25TestCases
index b5c8dd8..282ef7c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsActivityManagerDeviceSdk25TestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsActivityManagerDeviceSdk25TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsActivityManagerDeviceSdk25TestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsActivityManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsActivityManagerDeviceTestCases
index 93b3bb5..6b99a85 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsActivityManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsActivityManagerDeviceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsActivityManagerDeviceTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAdminPackageInstallerTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAdminPackageInstallerTestCases
index 9d020cc..89d0e98 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAdminPackageInstallerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAdminPackageInstallerTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAdminPackageInstallerTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAdminTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAdminTestCases
index 1491e09..466d402 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAdminTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAdminTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAdminTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAlarmClockTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAlarmClockTestCases
index 74230bc..aef039c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAlarmClockTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAlarmClockTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAlarmClockTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAlarmManagerTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAlarmManagerTestCases
index 17b7e22..974f04a 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAlarmManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAlarmManagerTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAlarmManagerTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidAppTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidAppTestCases
index 965d638..342dd2b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidAppTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidAppTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAndroidAppTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidTestBase27ApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidTestBase27ApiSignatureTestCases
index e2bc5f2..690d31b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidTestBase27ApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidTestBase27ApiSignatureTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAndroidTestBase27ApiSignatureTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidTestMockCurrentApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidTestMockCurrentApiSignatureTestCases
index 23a754d..9b8c4ee 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidTestMockCurrentApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidTestMockCurrentApiSignatureTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAndroidTestMockCurrentApiSignatureTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidTestRunnerCurrentApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidTestRunnerCurrentApiSignatureTestCases
index cdb4c34..432c94f 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidTestRunnerCurrentApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidTestRunnerCurrentApiSignatureTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAndroidTestRunnerCurrentApiSignatureTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAnimationTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAnimationTestCases
index 9c32026..8b1d3b0 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAnimationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAnimationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAnimationTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsApacheHttpLegacy27ApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsApacheHttpLegacy27ApiSignatureTestCases
index 095981d..21d29d8 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsApacheHttpLegacy27ApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsApacheHttpLegacy27ApiSignatureTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsApacheHttpLegacy27ApiSignatureTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsApacheHttpLegacyCurrentApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsApacheHttpLegacyCurrentApiSignatureTestCases
index 8e74b1b..03665a1 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsApacheHttpLegacyCurrentApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsApacheHttpLegacyCurrentApiSignatureTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsApacheHttpLegacyCurrentApiSignatureTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases
index 8db3b7c..bd532f2 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAppComponentFactoryTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAppComponentFactoryTestCases
index 20c0a7b..e139369 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAppComponentFactoryTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAppComponentFactoryTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAppComponentFactoryTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAppSecurityHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAppSecurityHostTestCases
index 65b02b1..baf07c6 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAppSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAppSecurityHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAppSecurityHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAppTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAppTestCases
index 3a1c5cd..0902f42 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAppTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAppTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAppTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAppTestCases.feature.ctshardware b/server/site_tests/cheets_CTS_P/control.arm.CtsAppTestCases.feature.ctshardware
index a1c3459..b9e4c9b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAppTestCases.feature.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAppTestCases.feature.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAppTestCases.feature of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAppUsageHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAppUsageHostTestCases
index 83a5b7f..919333e 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAppUsageHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAppUsageHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAppUsageHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAppWidgetTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAppWidgetTestCases
index 25d9aed..067bfa5 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAppWidgetTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAppWidgetTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAppWidgetTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAslrMallocTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAslrMallocTestCases
index b20da75..9103a1c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAslrMallocTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAslrMallocTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAslrMallocTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAssistTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAssistTestCases
index e4ef1d1..b50e26f 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAssistTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAssistTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAssistTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAtraceHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAtraceHostTestCases
index 2bafeac..bc77a75 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAtraceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAtraceHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAtraceHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAutoFillServiceTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAutoFillServiceTestCases
index b06cd47..53931d2 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAutoFillServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAutoFillServiceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAutoFillServiceTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsBackgroundRestrictionsTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsBackgroundRestrictionsTestCases
index 3cc5620..68956d8 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsBackgroundRestrictionsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsBackgroundRestrictionsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsBackgroundRestrictionsTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsBackupHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsBackupHostTestCases
index e5b40c6..7013988 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsBackupHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsBackupHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsBackupHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsBackupTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsBackupTestCases
index b3ea2d6..f1e0283 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsBackupTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsBackupTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsBackupTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsBatterySavingTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsBatterySavingTestCases
index d30100c..313f62d 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsBatterySavingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsBatterySavingTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsBatterySavingTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsBionicTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsBionicTestCases
index 0ab3d9f..855be6e 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsBionicTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsBionicTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsBionicTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsBluetoothTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsBluetoothTestCases
index c1f69dd..75b8635 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsBluetoothTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsBluetoothTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsBluetoothTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsBootStatsTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsBootStatsTestCases
index cbb0a7b..d07a5c6 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsBootStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsBootStatsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsBootStatsTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsCalendarcommon2TestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsCalendarcommon2TestCases
index 0996ae4..0894dc2 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsCalendarcommon2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsCalendarcommon2TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCalendarcommon2TestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsCameraApi25TestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsCameraApi25TestCases
index 6e7e553..5765c33 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsCameraApi25TestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsCameraApi25TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCameraApi25TestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsCameraTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsCameraTestCases
index 3229a41..a57606b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsCameraTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsCameraTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsCameraTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsCameraTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.arm.CtsCameraTestCases.ctshardware
index 6571bf3..747a264 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsCameraTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsCameraTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsCameraTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsCarTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsCarTestCases
index 2552b87..a906048 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsCarTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsCarTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCarTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsCarrierApiTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsCarrierApiTestCases
index 4aef96d..dd4ed9e 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsCarrierApiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsCarrierApiTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCarrierApiTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsColorModeTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsColorModeTestCases
index 9082e7b..0cd5a56 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsColorModeTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsColorModeTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsColorModeTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsCompilationTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsCompilationTestCases
index a292514..ef9a287 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsCompilationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsCompilationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCompilationTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsContactsProviderWipe b/server/site_tests/cheets_CTS_P/control.arm.CtsContactsProviderWipe
index 3bb01c8..3808284 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsContactsProviderWipe
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsContactsProviderWipe
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsContactsProviderWipe of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsContentTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsContentTestCases
index b828df4..a867ec2 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsContentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsContentTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsContentTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsCppToolsTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsCppToolsTestCases
index c96a6d7..e9f1fac 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsCppToolsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsCppToolsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCppToolsTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsCurrentApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsCurrentApiSignatureTestCases
index 7767d31..cd56edc 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsCurrentApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsCurrentApiSignatureTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCurrentApiSignatureTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDatabaseTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsDatabaseTestCases
index 7da56f0..365bfc1 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDatabaseTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDatabaseTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDebugTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsDebugTestCases
index 71958eb..fe20ce2 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDebugTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDebugTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases
index 80fc2ab..b4b7218 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 1024000
+PY_VERSION = 3
 PRIORITY = 70
 DOC = 'Run module CtsDeqpTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-EGL b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-EGL
index 655729c..c64c806 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-EGL
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-EGL
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-EGL of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-GLES2 b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-GLES2
index 69795ec..9d381d9 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-GLES2
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-GLES2
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-GLES2 of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-GLES3 b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-GLES3
index 5c3bb44..1dfa280 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-GLES3
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-GLES3
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-GLES3 of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
index 0c143d9..9a93e33 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-GLES31 b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-GLES31
index e6a81e9..81ac75a 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-GLES31
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-GLES31
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-GLES31 of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.api b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.api
index 477f827..06bade9 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.api
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.api
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.api of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.binding_model b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.binding_model
index 30f1ab1..1c2532b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.binding_model
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.binding_model
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.binding_model of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.clipping b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.clipping
index 2c4b042..6990b80 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.clipping
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.clipping
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.clipping of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.compute b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.compute
index 1b1117a..90a7104 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.compute
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.compute
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.compute of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.device_group b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.device_group
index f3a3f69..6cd1481 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.device_group
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.device_group
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.device_group of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.draw b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.draw
index 96c5394..c47fc71 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.draw
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.draw
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.draw of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.dynamic_state b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.dynamic_state
index ce605ad..f0a35dc 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.dynamic_state
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.dynamic_state
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.dynamic_state of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.fragment_operations b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.fragment_operations
index c090f18..a453a6a 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.fragment_operations
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.fragment_operations
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.fragment_operations of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.geometry b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.geometry
index e8c1d31..ece880f 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.geometry
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.geometry
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.geometry of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.glsl b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.glsl
index 6123aa5..cadcbc4 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.glsl
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.glsl
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.glsl of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.image b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.image
index bbdf821..b99a5da 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.image
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.image
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.image of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.info b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.info
index 6b48d29..84302fe 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.info
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.info
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.info of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.memory b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.memory
index 2486ffe..442e975 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.memory
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.memory
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.memory of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.multiview b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.multiview
index 42f5c05..7bb392e 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.multiview
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.multiview
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.multiview of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.pipeline b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.pipeline
index 30b7d5c..1685e43 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.pipeline
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.pipeline
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.pipeline of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.protected_memory b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.protected_memory
index 24a2a57..f462ec5 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.protected_memory
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.protected_memory
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.protected_memory of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.query_pool b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.query_pool
index 3b47cd4..d305be7 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.query_pool
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.query_pool
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.query_pool of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.rasterization b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.rasterization
index f97c3a4..0d264c1 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.rasterization
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.rasterization
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.rasterization of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.renderpass b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.renderpass
index cd1c76f..c94d4c1 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.renderpass
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.renderpass
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.renderpass of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.renderpass2 b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.renderpass2
index c54bf3c..1be68ae 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.renderpass2
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.renderpass2
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.renderpass2 of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.robustness b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.robustness
index 2f6b496..8227961 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.robustness
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.robustness
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.robustness of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.sparse_resources b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.sparse_resources
index 6f1c1fa..71c21db 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.sparse_resources
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.sparse_resources
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.sparse_resources of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.spirv_assembly b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.spirv_assembly
index 4999a67..c15b874 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.spirv_assembly
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.spirv_assembly
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.spirv_assembly of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.ssbo b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.ssbo
index 8e8f8f1..814aa05 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.ssbo
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.ssbo
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.ssbo of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.subgroups b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.subgroups
index 132a127..e6d9904 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.subgroups
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.subgroups
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.subgroups of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.subgroups.arithmetic b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.subgroups.arithmetic
index f89f41c..0305a53 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.subgroups.arithmetic
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.subgroups.arithmetic
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.subgroups.arithmetic of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.subgroups.b b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.subgroups.b
index 40c362d..adea6f8 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.subgroups.b
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.subgroups.b
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.subgroups.b of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.subgroups.clustered b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.subgroups.clustered
index f50d403..6cdf95b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.subgroups.clustered
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.subgroups.clustered
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.subgroups.clustered of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.subgroups.quad b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.subgroups.quad
index 89f48d6..b662240 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.subgroups.quad
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.subgroups.quad
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.subgroups.quad of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.subgroups.s b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.subgroups.s
index 4535b2a..8c7ccaf 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.subgroups.s
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.subgroups.s
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.subgroups.s of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.subgroups.vote b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.subgroups.vote
index 21d9d7c..48e2ff4 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.subgroups.vote
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.subgroups.vote
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.subgroups.vote of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.synchronization b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.synchronization
index 2c37b02..e9e2586 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.synchronization
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.synchronization
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.synchronization of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.tessellation b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.tessellation
index 7521140..e6fa173 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.tessellation
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.tessellation
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.tessellation of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.texture b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.texture
index 742bd14..a5a8b44 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.texture
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.texture
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.texture of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.ubo b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.ubo
index e6625da..795dc9a 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.ubo
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.ubo
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.ubo of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.wsi b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.wsi
index 8aa3a6f..f15033c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.wsi
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.wsi
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.wsi of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.ycbcr b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.ycbcr
index e7c1dee..2e130b7 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.ycbcr
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-VK.ycbcr
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.ycbcr of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeviceIdleHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsDeviceIdleHostTestCases
index bf869fe..1e1ce2f 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeviceIdleHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeviceIdleHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDeviceIdleHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDevicePolicyManagerTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsDevicePolicyManagerTestCases
index 0fcc5e6..a386e6c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDevicePolicyManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDevicePolicyManagerTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDevicePolicyManagerTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDexMetadataHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsDexMetadataHostTestCases
index 5d4ec2a..7ab6b21 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDexMetadataHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDexMetadataHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDexMetadataHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDisplayTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsDisplayTestCases
index 440d745..fdd2dae 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDisplayTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDisplayTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDisplayTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDpiTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsDpiTestCases
index c96369b..2f72370 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDpiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDpiTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDpiTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDpiTestCases2 b/server/site_tests/cheets_CTS_P/control.arm.CtsDpiTestCases2
index f29db06..fb64e24 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDpiTestCases2
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDpiTestCases2
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDpiTestCases2 of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDreamsTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsDreamsTestCases
index 3565ae6..83bc087 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDreamsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDreamsTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDrmTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsDrmTestCases
index b0f3982..9302883 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDrmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDrmTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDrmTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDumpsysHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsDumpsysHostTestCases
index 67fe73e..8f76e59 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDumpsysHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDumpsysHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDumpsysHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDynamicLinkerTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsDynamicLinkerTestCases
index 017426c..c285af2 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDynamicLinkerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDynamicLinkerTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDynamicLinkerTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsEdiHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsEdiHostTestCases
index 9b51623..af975c2 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsEdiHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsEdiHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsEdiHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsEffectTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsEffectTestCases
index 01f21b1..cd01d4f 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsEffectTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsEffectTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsEffectTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsExternalServiceTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsExternalServiceTestCases
index 2a562b8..6d6f2d1 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsExternalServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsExternalServiceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsExternalServiceTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsExternalSourcesTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsExternalSourcesTestCases
index e639dd2..402007a 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsExternalSourcesTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsExternalSourcesTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsExternalSourcesTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsFileSystemTestCases
index 6fcd7a9..59ee18a 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsFileSystemTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsFileSystemTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsFragmentTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsFragmentTestCases
index 320aaf2..5572140 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsFragmentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsFragmentTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsFragmentTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsFragmentTestCasesSdk26 b/server/site_tests/cheets_CTS_P/control.arm.CtsFragmentTestCasesSdk26
index a3f884e..50fcd7a 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsFragmentTestCasesSdk26
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsFragmentTestCasesSdk26
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsFragmentTestCasesSdk26 of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsGestureTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsGestureTestCases
index 7521233..e2c35a0 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsGestureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsGestureTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsGestureTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsGpuToolsHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsGpuToolsHostTestCases
index 0255cd5..9b99fc8 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsGpuToolsHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsGpuToolsHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsGpuToolsHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsGraphicsTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsGraphicsTestCases
index 25144f6..cd8c280 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsGraphicsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsGraphicsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsGraphicsTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsHardwareTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsHardwareTestCases
index 222b416..c08269e 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsHardwareTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsHardwareTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHardwareTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsHarmfulAppWarningHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsHarmfulAppWarningHostTestCases
index f3412a2..4d7c82b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsHarmfulAppWarningHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsHarmfulAppWarningHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHarmfulAppWarningHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiBlacklistApi27TestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiBlacklistApi27TestCases
index dfcb983..bb2c256 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiBlacklistApi27TestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiBlacklistApi27TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHiddenApiBlacklistApi27TestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiBlacklistCurrentApiTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiBlacklistCurrentApiTestCases
index 47cc204..a2c4e0f 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiBlacklistCurrentApiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiBlacklistCurrentApiTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHiddenApiBlacklistCurrentApiTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiBlacklistDebugClassTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiBlacklistDebugClassTestCases
index 3dd4379..e0a8bfb 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiBlacklistDebugClassTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiBlacklistDebugClassTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHiddenApiBlacklistDebugClassTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiKillswitchDebugClassTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiKillswitchDebugClassTestCases
index 43a0e2e..f256d11 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiKillswitchDebugClassTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiKillswitchDebugClassTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHiddenApiKillswitchDebugClassTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiKillswitchWhitelistTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiKillswitchWhitelistTestCases
index cf27938..3549a8b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiKillswitchWhitelistTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiKillswitchWhitelistTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHiddenApiKillswitchWhitelistTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiKillswitchWildcardTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiKillswitchWildcardTestCases
index 65cfebf..a18bc78 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiKillswitchWildcardTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiKillswitchWildcardTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHiddenApiKillswitchWildcardTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsHostTzDataTests b/server/site_tests/cheets_CTS_P/control.arm.CtsHostTzDataTests
index 4831c44..17fd9aa 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsHostTzDataTests
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsHostTzDataTests
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHostTzDataTests of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideNetworkTests b/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideNetworkTests
index 008599a..42cbbbd 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideNetworkTests
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideNetworkTests
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHostsideNetworkTests of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideNumberBlockingTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideNumberBlockingTestCases
index ee87f0d..42afe42 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideNumberBlockingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideNumberBlockingTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHostsideNumberBlockingTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideTvTests b/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideTvTests
index a6e9daf..43a2181 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideTvTests
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideTvTests
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHostsideTvTests of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideWebViewTests b/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideWebViewTests
index 84d3c8b..59770cf 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideWebViewTests
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideWebViewTests
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHostsideWebViewTests of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsIcuTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsIcuTestCases
index cd6c457..a092fce 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsIcuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsIcuTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsIcuTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsIncidentHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsIncidentHostTestCases
index 431d766..1e0589c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsIncidentHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsIncidentHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsIncidentHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsInlineMockingTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsInlineMockingTestCases
index 97f6d56..a0af93d 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsInlineMockingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsInlineMockingTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsInlineMockingTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsInputMethodServiceHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsInputMethodServiceHostTestCases
index 8bc7cb1..e085355 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsInputMethodServiceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsInputMethodServiceHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsInputMethodServiceHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsInputMethodTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsInputMethodTestCases
index 978674a..27fd13e 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsInputMethodTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsInputMethodTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsInputMethodTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsIntentSignatureTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsIntentSignatureTestCases
index 09b8d9d..18e14af 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsIntentSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsIntentSignatureTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsIntentSignatureTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJankDeviceTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJankDeviceTestCases
index 1aa5569..558bfc3 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJankDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJankDeviceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJankDeviceTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJdwpSecurityHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJdwpSecurityHostTestCases
index 8ca2f4b..31df9ad 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJdwpSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJdwpSecurityHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJdwpSecurityHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJdwpTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJdwpTestCases
index 3a112bc..fb387a0 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJdwpTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJdwpTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJdwpTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJniTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJniTestCases
index 961262a..805c2c9 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJniTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJniTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJniTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJobSchedulerSharedUidTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJobSchedulerSharedUidTestCases
index 89a9d60..4c4757d 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJobSchedulerSharedUidTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJobSchedulerSharedUidTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJobSchedulerSharedUidTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJobSchedulerTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJobSchedulerTestCases
index 2e68e51..55e06bb 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJobSchedulerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJobSchedulerTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJobSchedulerTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiAttachingHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiAttachingHostTestCases
index 6b354df..b1967e4 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiAttachingHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiAttachingHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiAttachingHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiAttachingTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiAttachingTestCases
index c742317..3013da3 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiAttachingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiAttachingTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiAttachingTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRedefineClassesHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRedefineClassesHostTestCases
index b7a289e..4df638e 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRedefineClassesHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRedefineClassesHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRedefineClassesHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1900HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1900HostTestCases
index f7c9d52..c4a8b75 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1900HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1900HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1900HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1901HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1901HostTestCases
index 8505eab..0bf1911 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1901HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1901HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1901HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1902HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1902HostTestCases
index 94cdd7f..efb62ed 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1902HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1902HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1902HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1903HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1903HostTestCases
index 77a9a21..c7c3b45 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1903HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1903HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1903HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1904HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1904HostTestCases
index 054f441..4a59201 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1904HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1904HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1904HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1906HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1906HostTestCases
index bea676b..b7f1a34 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1906HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1906HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1906HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1907HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1907HostTestCases
index 4a9e6c8..9deeb5d 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1907HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1907HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1907HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1908HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1908HostTestCases
index 82e007c..554e9fd 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1908HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1908HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1908HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1909HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1909HostTestCases
index cb784db..5d76fcf 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1909HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1909HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1909HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1910HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1910HostTestCases
index 40ba8ff..5705bfd 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1910HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1910HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1910HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1911HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1911HostTestCases
index 46eacc0..e0fc031 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1911HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1911HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1911HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1912HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1912HostTestCases
index d195032..f6e4b9c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1912HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1912HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1912HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1913HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1913HostTestCases
index 7760632..8ccf8ac 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1913HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1913HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1913HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1914HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1914HostTestCases
index 02e4acc..c01c3de 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1914HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1914HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1914HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1915HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1915HostTestCases
index 631e8dc..b2a2f1b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1915HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1915HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1915HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1916HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1916HostTestCases
index c55a8b9..2e6e084 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1916HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1916HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1916HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1917HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1917HostTestCases
index 9d4a7e3..6e3ad2d 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1917HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1917HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1917HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1920HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1920HostTestCases
index eee221a..ee1d3db 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1920HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1920HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1920HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1921HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1921HostTestCases
index db589df..2fdc6f7 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1921HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1921HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1921HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1922HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1922HostTestCases
index 1d16fab..75938fc 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1922HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1922HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1922HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1923HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1923HostTestCases
index 929a319..83bd8fa 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1923HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1923HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1923HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1924HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1924HostTestCases
index e37011b..0b8af24 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1924HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1924HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1924HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1925HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1925HostTestCases
index a765943..cceebc3 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1925HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1925HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1925HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1926HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1926HostTestCases
index e2ce52a..01376e7 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1926HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1926HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1926HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1927HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1927HostTestCases
index d08f8bc..fa6d4ca 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1927HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1927HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1927HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1928HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1928HostTestCases
index 8097c4f..57c3966 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1928HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1928HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1928HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1930HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1930HostTestCases
index 70ec9fb..a75376b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1930HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1930HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1930HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1931HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1931HostTestCases
index 1ae6f84..727a3fa 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1931HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1931HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1931HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1932HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1932HostTestCases
index 0f145b1..39dc62a 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1932HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1932HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1932HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1933HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1933HostTestCases
index ea7d1a0..11e0e56 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1933HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1933HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1933HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1934HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1934HostTestCases
index 6de30da..a9d3665 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1934HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1934HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1934HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1936HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1936HostTestCases
index a6bfbe6..352ed5b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1936HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1936HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1936HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1937HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1937HostTestCases
index c466373..03896fd 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1937HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1937HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1937HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1939HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1939HostTestCases
index a833a29..168ba37 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1939HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1939HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1939HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1941HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1941HostTestCases
index 019de79..ccd4762 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1941HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1941HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1941HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1942HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1942HostTestCases
index 5610770..60a66c8 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1942HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1942HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1942HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1943HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1943HostTestCases
index 7e2d4cd..0b140fa 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1943HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1943HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1943HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest902HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest902HostTestCases
index d5fd557..f4dd0ae 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest902HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest902HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest902HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest903HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest903HostTestCases
index afcecf8..6619d34 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest903HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest903HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest903HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest904HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest904HostTestCases
index 21374b9..de50cfc 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest904HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest904HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest904HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest905HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest905HostTestCases
index 70463bf..252831e 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest905HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest905HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest905HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest906HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest906HostTestCases
index 64233bd..6135ed1 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest906HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest906HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest906HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest907HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest907HostTestCases
index 75d7c13..260d3d6 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest907HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest907HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest907HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest908HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest908HostTestCases
index 5b47445..11dd7eb 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest908HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest908HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest908HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest910HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest910HostTestCases
index 414506a..7ffae6f 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest910HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest910HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest910HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest911HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest911HostTestCases
index be9a710..23ce6df 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest911HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest911HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest911HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest912HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest912HostTestCases
index bf82117..21917db 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest912HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest912HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest912HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest913HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest913HostTestCases
index c42c964..4c5eaf2 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest913HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest913HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest913HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest914HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest914HostTestCases
index 4bc3a85..79ca8ec 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest914HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest914HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest914HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest915HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest915HostTestCases
index 4ec4bb3..7e66a45 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest915HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest915HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest915HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest917HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest917HostTestCases
index b55b108..544dfbe 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest917HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest917HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest917HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest918HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest918HostTestCases
index a82f42a..ec61363 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest918HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest918HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest918HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest919HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest919HostTestCases
index 87e1b5e..595a58b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest919HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest919HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest919HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest920HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest920HostTestCases
index bc5c821..3385f7d 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest920HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest920HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest920HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest922HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest922HostTestCases
index eeadfd5..f4be608 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest922HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest922HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest922HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest923HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest923HostTestCases
index 5e4fa85..0b17521 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest923HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest923HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest923HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest924HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest924HostTestCases
index fea8d72..cb59750 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest924HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest924HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest924HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest926HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest926HostTestCases
index f389737..fa259a9 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest926HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest926HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest926HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest927HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest927HostTestCases
index 74e14bb..21bcf71 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest927HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest927HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest927HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest928HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest928HostTestCases
index f1d89d3..8a32b0c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest928HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest928HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest928HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest930HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest930HostTestCases
index 8d55cb9..47a26e8 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest930HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest930HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest930HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest931HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest931HostTestCases
index e434e31..daf431c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest931HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest931HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest931HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest932HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest932HostTestCases
index 8af9ac9..290e2ef 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest932HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest932HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest932HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest940HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest940HostTestCases
index 2d5c6ae..f446c04 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest940HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest940HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest940HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest942HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest942HostTestCases
index 811b335..43473e5 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest942HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest942HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest942HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest944HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest944HostTestCases
index 40c6e38..ec392c7 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest944HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest944HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest944HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest945HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest945HostTestCases
index ab9a43b..fc9c0d9 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest945HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest945HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest945HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest947HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest947HostTestCases
index 37218c0..cd3a3a1 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest947HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest947HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest947HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest951HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest951HostTestCases
index 5795e78..3f6f46c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest951HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest951HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest951HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest982HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest982HostTestCases
index eef5dde..ce10e26 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest982HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest982HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest982HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest983HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest983HostTestCases
index 4acff1a..8f8208f 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest983HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest983HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest983HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest984HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest984HostTestCases
index 4c0848c..24de4b6 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest984HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest984HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest984HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest985HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest985HostTestCases
index e89148e..6b38071 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest985HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest985HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest985HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest986HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest986HostTestCases
index e9c9dfe..c1d5ec7 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest986HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest986HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest986HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest988HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest988HostTestCases
index 61f0f07..a48eccc 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest988HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest988HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest988HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest989HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest989HostTestCases
index e3d0c35..07d1792 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest989HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest989HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest989HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest990HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest990HostTestCases
index 9c6ac9b..682b306 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest990HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest990HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest990HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest991HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest991HostTestCases
index 8aff563..08ab04e 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest991HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest991HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest991HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest992HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest992HostTestCases
index d57b4a4..4760411 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest992HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest992HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest992HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest993HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest993HostTestCases
index df8f692..0cbf216 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest993HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest993HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest993HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest994HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest994HostTestCases
index 3c98176..5023542 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest994HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest994HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest994HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest995HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest995HostTestCases
index 3254a5c..fcec936 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest995HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest995HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest995HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest996HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest996HostTestCases
index 5373df4..2844be8 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest996HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest996HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest996HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest997HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest997HostTestCases
index beedcc5..6a478c1 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest997HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest997HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest997HostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiTaggingHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiTaggingHostTestCases
index fd4ad6d..df2e5bf 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiTaggingHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiTaggingHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiTaggingHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiTrackingHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiTrackingHostTestCases
index 5fe6829..3bd0ff9 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiTrackingHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiTrackingHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiTrackingHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsKernelConfigTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsKernelConfigTestCases
index 534f2a1..4a4d743 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsKernelConfigTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsKernelConfigTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsKernelConfigTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsKeystoreTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsKeystoreTestCases
index 9d39df2..e26671c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsKeystoreTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsKeystoreTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsKeystoreTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsLeanbackJankTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsLeanbackJankTestCases
index 06ebd03..fc31e80 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsLeanbackJankTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsLeanbackJankTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLeanbackJankTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsLegacyNotificationTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsLegacyNotificationTestCases
index d930a2f..dddad40 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsLegacyNotificationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsLegacyNotificationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLegacyNotificationTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreFileIOTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreFileIOTestCases
index 03081e4..c6c3e31 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreFileIOTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreFileIOTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLibcoreFileIOTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreJsr166TestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreJsr166TestCases
index be6268c..152f379 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreJsr166TestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreJsr166TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLibcoreJsr166TestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreLegacy22TestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreLegacy22TestCases
index 5a134a2..ed62aca 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreLegacy22TestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreLegacy22TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLibcoreLegacy22TestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreOjTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreOjTestCases
index e4c14d4..7ebcc27 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreOjTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreOjTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLibcoreOjTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreOkHttpTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreOkHttpTestCases
index fa9c22d..324534c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreOkHttpTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreOkHttpTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLibcoreOkHttpTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreTestCases
index 023bc18..1ada49b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsLibcoreTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreWycheproofBCTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreWycheproofBCTestCases
index be6a807..cb90e26 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreWycheproofBCTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreWycheproofBCTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLibcoreWycheproofBCTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreWycheproofConscryptTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreWycheproofConscryptTestCases
index 5ae5399..02e7838 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreWycheproofConscryptTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreWycheproofConscryptTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLibcoreWycheproofConscryptTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsLiblogTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsLiblogTestCases
index d4eafa5..b7ee14e 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsLiblogTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsLiblogTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLiblogTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsLocation2TestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsLocation2TestCases
index 4066690..344d1df 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsLocation2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsLocation2TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLocation2TestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsLocationTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsLocationTestCases
index 1a8dd4c..409dbc4 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsLocationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsLocationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLocationTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsLogdTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsLogdTestCases
index 52d645d..d716734 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsLogdTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsLogdTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLogdTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaBitstreamsTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaBitstreamsTestCases
index 02a725b..33b3424 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaBitstreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaBitstreamsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaBitstreamsTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaHostTestCases
index 56f034f..8eae9fd 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaStressTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaStressTestCases
index 386cd00..31811a6 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaStressTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaStressTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsMediaStressTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaStressTestCases.camera.ctshardware b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaStressTestCases.camera.ctshardware
index f25e038..5c0e45a 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaStressTestCases.camera.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaStressTestCases.camera.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsMediaStressTestCases.camera of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases
index bdbf75f..1c00130 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsMediaTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.DecodeAccuracyTest b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.DecodeAccuracyTest
index 389f387..fe407c9 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.DecodeAccuracyTest
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.DecodeAccuracyTest
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsMediaTestCases.DecodeAccuracyTest of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.DecodeAccuracyTest.ctshardware b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.DecodeAccuracyTest.ctshardware
index 68b3824..37731cd 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.DecodeAccuracyTest.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.DecodeAccuracyTest.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsMediaTestCases.DecodeAccuracyTest of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest
index 4f9a94d..e10b0d9 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsMediaTestCases.VideoDecoderPerfAndEncoderTest of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware
index ac29243..fae0177 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsMediaTestCases.VideoDecoderPerfAndEncoderTest of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.ctshardware
index 56f991e..97f7dcd 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsMediaTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.other b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.other
index 75e0f77..f16b101 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.other
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.other
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsMediaTestCases.other of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.other.ctshardware b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.other.ctshardware
index f4bca44..1e3021a 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.other.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.other.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsMediaTestCases.other of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsMidiTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsMidiTestCases
index eddcd9a..dd819ea 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsMidiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsMidiTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMidiTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsMockingDebuggableTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsMockingDebuggableTestCases
index 473fb3f..232b0da 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsMockingDebuggableTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsMockingDebuggableTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMockingDebuggableTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsMockingTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsMockingTestCases
index 4ad98a6..199f737 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsMockingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsMockingTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMockingTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsMonkeyTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsMonkeyTestCases
index 95be8c9..e0a69ae 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsMonkeyTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsMonkeyTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMonkeyTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsMultiUserHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsMultiUserHostTestCases
index eda2342..942e426 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsMultiUserHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsMultiUserHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMultiUserHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsMultiUserTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsMultiUserTestCases
index 4e7b380..3e28951 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsMultiUserTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsMultiUserTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMultiUserTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNNAPITestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNNAPITestCases
index 901ef78..70b0115 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNNAPITestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNNAPITestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNNAPITestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNativeHardwareTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNativeHardwareTestCases
index 3db1356..3cff993 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNativeHardwareTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNativeHardwareTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNativeHardwareTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNativeMediaAAudioTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNativeMediaAAudioTestCases
index c8d1925..c38ca08 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNativeMediaAAudioTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNativeMediaAAudioTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNativeMediaAAudioTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNativeMediaAAudioTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.arm.CtsNativeMediaAAudioTestCases.ctshardware
index 0420aa8..dffe370 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNativeMediaAAudioTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNativeMediaAAudioTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNativeMediaAAudioTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNativeMediaSlTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNativeMediaSlTestCases
index 581385e..8a11a44 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNativeMediaSlTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNativeMediaSlTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNativeMediaSlTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNativeMediaXaTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNativeMediaXaTestCases
index 07e9403..eab3796 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNativeMediaXaTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNativeMediaXaTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNativeMediaXaTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNativeNetTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNativeNetTestCases
index 311fedd..2732a1b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNativeNetTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNativeNetTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNativeNetTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNdefTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNdefTestCases
index 8f408c4..369bab1 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNdefTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNdefTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNdefTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigAttributeTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigAttributeTestCases
index dca4afc..3381f0b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigAttributeTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigAttributeTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetSecConfigAttributeTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigBasicDebugDisabledTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigBasicDebugDisabledTestCases
index 0127c7d..4c41fbf 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigBasicDebugDisabledTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigBasicDebugDisabledTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetSecConfigBasicDebugDisabledTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigBasicDebugEnabledTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigBasicDebugEnabledTestCases
index 125cd0a..91f4587 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigBasicDebugEnabledTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigBasicDebugEnabledTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetSecConfigBasicDebugEnabledTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigBasicDomainConfigTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigBasicDomainConfigTestCases
index 0757337..87a3f07 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigBasicDomainConfigTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigBasicDomainConfigTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetSecConfigBasicDomainConfigTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigCleartextTrafficTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigCleartextTrafficTestCases
index 2a3fe3e..c1e1d06 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigCleartextTrafficTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigCleartextTrafficTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetSecConfigCleartextTrafficTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigDownloadManagerTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigDownloadManagerTestCases
index 5e89551..c7feeaf 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigDownloadManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigDownloadManagerTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetSecConfigDownloadManagerTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigInvalidPinTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigInvalidPinTestCases
index ab51b95..b28b97c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigInvalidPinTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigInvalidPinTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetSecConfigInvalidPinTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigNestedDomainConfigTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigNestedDomainConfigTestCases
index dec7037..26f575e 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigNestedDomainConfigTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigNestedDomainConfigTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetSecConfigNestedDomainConfigTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigPrePCleartextTrafficTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigPrePCleartextTrafficTestCases
index 3cee01e..64f4f7f 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigPrePCleartextTrafficTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigPrePCleartextTrafficTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetSecConfigPrePCleartextTrafficTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigResourcesSrcTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigResourcesSrcTestCases
index c44cfd5..4cbb3fc 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigResourcesSrcTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigResourcesSrcTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetSecConfigResourcesSrcTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
index 6770995..cf162ee 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetSecPolicyUsesCleartextTrafficFalseTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
index d97f8ae..52ebfcd 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetSecPolicyUsesCleartextTrafficTrueTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
index d4e903f..cab8402 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCases
index 9afe2ac..6481cc7 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsNetTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCases.ctshardware
index 3eee397..b6e9841 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsNetTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCasesLegacyApi22 b/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCasesLegacyApi22
index 7478e77..f855152 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCasesLegacyApi22
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCasesLegacyApi22
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetTestCasesLegacyApi22 of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCasesLegacyPermission22 b/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCasesLegacyPermission22
index 99b0dde..511f852 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCasesLegacyPermission22
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCasesLegacyPermission22
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetTestCasesLegacyPermission22 of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsOmapiTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsOmapiTestCases
index ed37fe2..7e05f6b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsOmapiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsOmapiTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsOmapiTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsOpenGLTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsOpenGLTestCases
index f5d0d77..afd2751 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsOpenGLTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsOpenGLTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsOpenGLTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsOpenGlPerf2TestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsOpenGlPerf2TestCases
index e41bf92..0c71e0e 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsOpenGlPerf2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsOpenGlPerf2TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsOpenGlPerf2TestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsOpenGlPerfTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsOpenGlPerfTestCases
index 445c9b5..df43d05 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsOpenGlPerfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsOpenGlPerfTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsOpenGlPerfTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsOsHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsOsHostTestCases
index b51e741..160e024 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsOsHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsOsHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsOsHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsOsTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsOsTestCases
index bcf1016..93f6db0 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsOsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsOsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsOsTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsPdfTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsPdfTestCases
index f9d2387..2d03c52 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsPdfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsPdfTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPdfTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsPerfettoTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsPerfettoTestCases
index 09854dd..b06c563 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsPerfettoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsPerfettoTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPerfettoTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsPerfettoTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.arm.CtsPerfettoTestCases.ctshardware
index 47705ed..b9d71df 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsPerfettoTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsPerfettoTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPerfettoTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsPermission2TestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsPermission2TestCases
index 956aac0..1e38158 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsPermission2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsPermission2TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPermission2TestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsPermissionTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsPermissionTestCases
index 6be7e41..1bb85f2 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsPermissionTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsPermissionTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPermissionTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsPermissionTestCases.camera.ctshardware b/server/site_tests/cheets_CTS_P/control.arm.CtsPermissionTestCases.camera.ctshardware
index a5c3561..98bbe52 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsPermissionTestCases.camera.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsPermissionTestCases.camera.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPermissionTestCases.camera of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsPreference2TestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsPreference2TestCases
index 7949b1c..d32b876 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsPreference2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsPreference2TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPreference2TestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsPreferenceTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsPreferenceTestCases
index 837e5bc..7ee0640 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsPreferenceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsPreferenceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPreferenceTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsPrintTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsPrintTestCases
index 61fb339..8d89d4a 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsPrintTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPrintTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsProtoTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsProtoTestCases
index 594ed1d..de369cb 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsProtoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsProtoTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsProtoTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsProviderTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsProviderTestCases
index 8e48c00..6b8ae94 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsProviderTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsProviderTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsProviderTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsRenderscriptLegacyTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsRenderscriptLegacyTestCases
index 627779d..16acfea 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsRenderscriptLegacyTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsRenderscriptLegacyTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsRenderscriptLegacyTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsRenderscriptTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsRenderscriptTestCases
index 4d191d5..3a4ebb8 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsRenderscriptTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsRenderscriptTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsRenderscriptTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsRsBlasTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsRsBlasTestCases
index 1db68a0..9edd84f 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsRsBlasTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsRsBlasTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsRsBlasTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsRsCppTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsRsCppTestCases
index 58fdeee..759e069 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsRsCppTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsRsCppTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsRsCppTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSampleDeviceTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSampleDeviceTestCases
index 74aad89..d0508d2 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSampleDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSampleDeviceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSampleDeviceTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSampleHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSampleHostTestCases
index 163a9da..58beb9b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSampleHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSampleHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSampleHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSaxTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSaxTestCases
index 3cdd5e4..586aabf 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSaxTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSaxTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSaxTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSeccompHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSeccompHostTestCases
index ddc6a0d..9305a5e 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSeccompHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSeccompHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSeccompHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSecureElementAccessControlTestCases1 b/server/site_tests/cheets_CTS_P/control.arm.CtsSecureElementAccessControlTestCases1
index 1578f40..84b0d81 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSecureElementAccessControlTestCases1
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSecureElementAccessControlTestCases1
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSecureElementAccessControlTestCases1 of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSecureElementAccessControlTestCases2 b/server/site_tests/cheets_CTS_P/control.arm.CtsSecureElementAccessControlTestCases2
index 5aa6b93..550faae 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSecureElementAccessControlTestCases2
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSecureElementAccessControlTestCases2
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSecureElementAccessControlTestCases2 of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSecureElementAccessControlTestCases3 b/server/site_tests/cheets_CTS_P/control.arm.CtsSecureElementAccessControlTestCases3
index 8e73cf5..4d5f734 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSecureElementAccessControlTestCases3
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSecureElementAccessControlTestCases3
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSecureElementAccessControlTestCases3 of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSecurityBulletinHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSecurityBulletinHostTestCases
index e0c4202..b5f5b79 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSecurityBulletinHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSecurityBulletinHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSecurityBulletinHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSecurityHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSecurityHostTestCases
index c3459fc..67648e6 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSecurityHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsSecurityHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSecurityTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSecurityTestCases
index f39f000..17f71d0 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSecurityTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSecurityTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsSecurityTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSelinuxTargetSdk25TestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSelinuxTargetSdk25TestCases
index a98e540..29b23b8 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSelinuxTargetSdk25TestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSelinuxTargetSdk25TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSelinuxTargetSdk25TestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSelinuxTargetSdk27TestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSelinuxTargetSdk27TestCases
index dfcd3fa..24e3f13 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSelinuxTargetSdk27TestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSelinuxTargetSdk27TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSelinuxTargetSdk27TestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSelinuxTargetSdkCurrentTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSelinuxTargetSdkCurrentTestCases
index aae9c8c..c8a2fbf 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSelinuxTargetSdkCurrentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSelinuxTargetSdkCurrentTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSelinuxTargetSdkCurrentTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSensorTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSensorTestCases
index 8432fbf..d479086 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSensorTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSensorTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSensorTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSensorTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.arm.CtsSensorTestCases.ctshardware
index db46be3..9732bd9 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSensorTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSensorTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSensorTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsShortcutHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsShortcutHostTestCases
index 33c76e6..1be6308 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsShortcutHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsShortcutHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsShortcutHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsShortcutManagerTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsShortcutManagerTestCases
index fac29fe..c3e284d 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsShortcutManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsShortcutManagerTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsShortcutManagerTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSimRestrictedApisTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSimRestrictedApisTestCases
index 6f510a3..411ea08 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSimRestrictedApisTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSimRestrictedApisTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSimRestrictedApisTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSimpleCpuTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSimpleCpuTestCases
index 091a35f..ff29906 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSimpleCpuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSimpleCpuTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSimpleCpuTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSimpleperfTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSimpleperfTestCases
index 04463af..88a04ca 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSimpleperfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSimpleperfTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSimpleperfTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSkQPTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSkQPTestCases
index 01e16bb..09f9368 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSkQPTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSkQPTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSkQPTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSliceTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSliceTestCases
index 353729b..8bb04fa 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSliceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSliceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSliceTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSpeechTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSpeechTestCases
index c6949a3..2669777 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSpeechTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSpeechTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSpeechTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsStatsdHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsStatsdHostTestCases
index 35de3ef..be32617 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsStatsdHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsStatsdHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsStatsdHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSustainedPerformanceHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSustainedPerformanceHostTestCases
index 662d88d..8d8d2f6 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSustainedPerformanceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSustainedPerformanceHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSustainedPerformanceHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSustainedPerformanceHostTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.arm.CtsSustainedPerformanceHostTestCases.ctshardware
index 70fafcf..521b517 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSustainedPerformanceHostTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSustainedPerformanceHostTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSustainedPerformanceHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSyncAccountAccessOtherCertTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSyncAccountAccessOtherCertTestCases
index 7de88d0..f935458 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSyncAccountAccessOtherCertTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSyncAccountAccessOtherCertTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSyncAccountAccessOtherCertTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSyncContentHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSyncContentHostTestCases
index 9e0dca1..2058b6b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSyncContentHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSyncContentHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSyncContentHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSyncManagerTestsCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSyncManagerTestsCases
index f816013..4cc0f7d 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSyncManagerTestsCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSyncManagerTestsCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSyncManagerTestsCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSystemApiAnnotationTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSystemApiAnnotationTestCases
index 0d63821..7f33230 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSystemApiAnnotationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSystemApiAnnotationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSystemApiAnnotationTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSystemApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSystemApiSignatureTestCases
index 215de9b..061be00 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSystemApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSystemApiSignatureTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSystemApiSignatureTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSystemIntentTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSystemIntentTestCases
index 53a1357..72bce64 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSystemIntentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSystemIntentTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSystemIntentTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSystemUiHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSystemUiHostTestCases
index 1115f10..00a7e78 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSystemUiHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSystemUiHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSystemUiHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSystemUiTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSystemUiTestCases
index 537393b..78d4616 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSystemUiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSystemUiTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSystemUiTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsTelecomTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsTelecomTestCases
index c0baee1..a10c405 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsTelecomTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsTelecomTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTelecomTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsTelecomTestCases2 b/server/site_tests/cheets_CTS_P/control.arm.CtsTelecomTestCases2
index b69eb60..47b9458 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsTelecomTestCases2
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsTelecomTestCases2
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTelecomTestCases2 of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsTelecomTestCases3 b/server/site_tests/cheets_CTS_P/control.arm.CtsTelecomTestCases3
index 8bd0e39..a733e86 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsTelecomTestCases3
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsTelecomTestCases3
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTelecomTestCases3 of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsTelephony2TestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsTelephony2TestCases
index 23ef7a7..36123b7 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsTelephony2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsTelephony2TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTelephony2TestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsTelephonyTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsTelephonyTestCases
index c1bacdd..e3c348c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsTelephonyTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsTelephonyTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTelephonyTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsTextTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsTextTestCases
index d3c227c..636a92c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsTextTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsTextTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTextTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsThemeDeviceTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsThemeDeviceTestCases
index ca98d78..cc0265d 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsThemeDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsThemeDeviceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsThemeDeviceTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsThemeHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsThemeHostTestCases
index e5a32fa..1cfe6b2 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsThemeHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsThemeHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsThemeHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsToastLegacyTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsToastLegacyTestCases
index c3f5583..d502a65 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsToastLegacyTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsToastLegacyTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsToastLegacyTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsToastTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsToastTestCases
index cb8f026..b33698b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsToastTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsToastTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsToastTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsTransitionTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsTransitionTestCases
index bdd5e55..535941f 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsTransitionTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsTransitionTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTransitionTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsTrustedVoiceHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsTrustedVoiceHostTestCases
index 6ddd31d..a8551d5 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsTrustedVoiceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsTrustedVoiceHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTrustedVoiceHostTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsTvProviderTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsTvProviderTestCases
index 1d7c7a7..703b46f 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsTvProviderTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsTvProviderTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTvProviderTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsTvTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsTvTestCases
index 989887b..e06f6f1 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsTvTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsTvTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTvTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsUiAutomationTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsUiAutomationTestCases
index 9318918..768f7e1 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsUiAutomationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsUiAutomationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUiAutomationTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsUiDeviceTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsUiDeviceTestCases
index 5c4cd53..5af708b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsUiDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsUiDeviceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUiDeviceTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsUiRenderingTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsUiRenderingTestCases
index 0dea1ac..0a47712 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsUiRenderingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsUiRenderingTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUiRenderingTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsUidIsolationTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsUidIsolationTestCases
index 27ac015..e5d58c6 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsUidIsolationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsUidIsolationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUidIsolationTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsUsageStatsTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsUsageStatsTestCases
index 8858c48..cf46592 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsUsageStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsUsageStatsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsUsageStatsTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsUsageStatsTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.arm.CtsUsageStatsTestCases.ctshardware
index 76c6141..57e93a2 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsUsageStatsTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsUsageStatsTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsUsageStatsTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsUsbTests b/server/site_tests/cheets_CTS_P/control.arm.CtsUsbTests
index 511b639..a518d55 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsUsbTests
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsUsbTests
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUsbTests of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsUtilTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsUtilTestCases
index 8884f55..c40c5c7 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsUtilTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsUtilTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUtilTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsVideoTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsVideoTestCases
index 4cf8a88..c9e7982 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsVideoTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsVideoTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsViewTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsViewTestCases
index 7a7a301..6590bfe 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsViewTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsViewTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsViewTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.arm.CtsViewTestCases.ctshardware
index 79168f8..a26eaaf 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsViewTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsViewTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsViewTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsVmTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsVmTestCases
index c77f83f..a3e0a27 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsVmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsVmTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsVmTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsVoiceInteractionTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsVoiceInteractionTestCases
index e16db10..2e52748 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsVoiceInteractionTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsVoiceInteractionTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsVoiceInteractionTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsVoiceSettingsTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsVoiceSettingsTestCases
index 5d62dbe..cc056a2 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsVoiceSettingsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsVoiceSettingsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsVoiceSettingsTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsVrTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsVrTestCases
index a5cddba..481621b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsVrTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsVrTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsVrTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsWebkitTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsWebkitTestCases
index b1f03d5..00acebb 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsWebkitTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsWebkitTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsWebkitTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsWidgetTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsWidgetTestCases
index 723db62..ab1e305 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsWidgetTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsWidgetTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsWindowManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsWindowManagerDeviceTestCases
index cbb6428..7b1203f 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsWindowManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsWindowManagerDeviceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsWindowManagerDeviceTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsWrapNoWrapTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsWrapNoWrapTestCases
index 8346a28..25da239 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsWrapNoWrapTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsWrapNoWrapTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsWrapNoWrapTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsWrapWrapDebugMallocDebugTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsWrapWrapDebugMallocDebugTestCases
index f6645e1..72c1d6d 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsWrapWrapDebugMallocDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsWrapWrapDebugMallocDebugTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsWrapWrapDebugMallocDebugTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsWrapWrapDebugTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsWrapWrapDebugTestCases
index da6dbad..689ed35 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsWrapWrapDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsWrapWrapDebugTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsWrapWrapDebugTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsWrapWrapNoDebugTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsWrapWrapNoDebugTestCases
index db1eafd..f881bba 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsWrapWrapNoDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsWrapWrapNoDebugTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsWrapWrapNoDebugTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.cts-system-all.api b/server/site_tests/cheets_CTS_P/control.arm.cts-system-all.api
index 6db0987..e614cad 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.cts-system-all.api
+++ b/server/site_tests/cheets_CTS_P/control.arm.cts-system-all.api
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module cts-system-all.api of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.signed-CtsSecureElementAccessControlTestCases1 b/server/site_tests/cheets_CTS_P/control.arm.signed-CtsSecureElementAccessControlTestCases1
index 235efa7..27dfc25 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.signed-CtsSecureElementAccessControlTestCases1
+++ b/server/site_tests/cheets_CTS_P/control.arm.signed-CtsSecureElementAccessControlTestCases1
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module signed-CtsSecureElementAccessControlTestCases1 of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.signed-CtsSecureElementAccessControlTestCases2 b/server/site_tests/cheets_CTS_P/control.arm.signed-CtsSecureElementAccessControlTestCases2
index 0625455..dd6a8b4 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.signed-CtsSecureElementAccessControlTestCases2
+++ b/server/site_tests/cheets_CTS_P/control.arm.signed-CtsSecureElementAccessControlTestCases2
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module signed-CtsSecureElementAccessControlTestCases2 of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.signed-CtsSecureElementAccessControlTestCases3 b/server/site_tests/cheets_CTS_P/control.arm.signed-CtsSecureElementAccessControlTestCases3
index c83e7a8..6381b3d 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.signed-CtsSecureElementAccessControlTestCases3
+++ b/server/site_tests/cheets_CTS_P/control.arm.signed-CtsSecureElementAccessControlTestCases3
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module signed-CtsSecureElementAccessControlTestCases3 of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.tradefed-run-collect-tests-only b/server/site_tests/cheets_CTS_P/control.arm.tradefed-run-collect-tests-only
index 29a9360..649e913 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.tradefed-run-collect-tests-only
+++ b/server/site_tests/cheets_CTS_P/control.arm.tradefed-run-collect-tests-only
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 1024000
+PY_VERSION = 3
 PRIORITY = 70
 DOC = 'Run all of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.arm.tradefed-run-collect-tests-only-hardware b/server/site_tests/cheets_CTS_P/control.arm.tradefed-run-collect-tests-only-hardware
index 293663d..2af8fc0 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.tradefed-run-collect-tests-only-hardware
+++ b/server/site_tests/cheets_CTS_P/control.arm.tradefed-run-collect-tests-only-hardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module tradefed-run-collect-tests-only-hardware of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.vm-tests-tf b/server/site_tests/cheets_CTS_P/control.arm.vm-tests-tf
index 9cc0834..d878ccd 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.vm-tests-tf
+++ b/server/site_tests/cheets_CTS_P/control.arm.vm-tests-tf
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module vm-tests-tf of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.waivers b/server/site_tests/cheets_CTS_P/control.arm.waivers
index 5954fcb..3c2bd8c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.waivers
+++ b/server/site_tests/cheets_CTS_P/control.arm.waivers
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run waived tests of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.arm.waivers-collect-tests-only b/server/site_tests/cheets_CTS_P/control.arm.waivers-collect-tests-only
index 4162b2f..312c32c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.waivers-collect-tests-only
+++ b/server/site_tests/cheets_CTS_P/control.arm.waivers-collect-tests-only
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 1024000
+PY_VERSION = 3
 PRIORITY = 70
 DOC = 'Run waived tests of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAbiOverrideHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAbiOverrideHostTestCases
index 586ea77..48330c2 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAbiOverrideHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAbiOverrideHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAbiOverrideHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAccelerationTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAccelerationTestCases
index 026299b..256ea72 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAccelerationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAccelerationTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAccessibilityServiceTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAccessibilityServiceTestCases
index ad4b005..b58e07d 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAccessibilityServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAccessibilityServiceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAccessibilityServiceTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAccessibilityTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAccessibilityTestCases
index 8d2cdea..5a167b5 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAccessibilityTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAccessibilityTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAccessibilityTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAccountManagerTestCases
index 86b4249..c0a1e21 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAccountManagerTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAccountManagerTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsActivityManagerDeviceSdk25TestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsActivityManagerDeviceSdk25TestCases
index 32b2ad1..8252996 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsActivityManagerDeviceSdk25TestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsActivityManagerDeviceSdk25TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsActivityManagerDeviceSdk25TestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsActivityManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsActivityManagerDeviceTestCases
index da3296b..f8a9f3b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsActivityManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsActivityManagerDeviceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsActivityManagerDeviceTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAdminPackageInstallerTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAdminPackageInstallerTestCases
index d41ebe5..9849a4c 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAdminPackageInstallerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAdminPackageInstallerTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAdminPackageInstallerTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAdminTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAdminTestCases
index 481ad46..5207d46 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAdminTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAdminTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAdminTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAlarmClockTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAlarmClockTestCases
index 00ce725..9d22228 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAlarmClockTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAlarmClockTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAlarmClockTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAlarmManagerTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAlarmManagerTestCases
index a2db1d9..014c6ea 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAlarmManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAlarmManagerTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAlarmManagerTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidAppTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidAppTestCases
index b109758..47ccb6c 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidAppTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidAppTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAndroidAppTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidTestBase27ApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidTestBase27ApiSignatureTestCases
index 1d186e1..5ec7364 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidTestBase27ApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidTestBase27ApiSignatureTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAndroidTestBase27ApiSignatureTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidTestMockCurrentApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidTestMockCurrentApiSignatureTestCases
index 30d47a8..4148e7c 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidTestMockCurrentApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidTestMockCurrentApiSignatureTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAndroidTestMockCurrentApiSignatureTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidTestRunnerCurrentApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidTestRunnerCurrentApiSignatureTestCases
index b1a8cc2..ebd9bfc 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidTestRunnerCurrentApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidTestRunnerCurrentApiSignatureTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAndroidTestRunnerCurrentApiSignatureTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAnimationTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAnimationTestCases
index de459a8..66f8873 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAnimationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAnimationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAnimationTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsApacheHttpLegacy27ApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsApacheHttpLegacy27ApiSignatureTestCases
index e44d4e7..3655450 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsApacheHttpLegacy27ApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsApacheHttpLegacy27ApiSignatureTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsApacheHttpLegacy27ApiSignatureTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsApacheHttpLegacyCurrentApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsApacheHttpLegacyCurrentApiSignatureTestCases
index 902132c..f5c87f7 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsApacheHttpLegacyCurrentApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsApacheHttpLegacyCurrentApiSignatureTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsApacheHttpLegacyCurrentApiSignatureTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases
index 3bf682d..575a17b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAppComponentFactoryTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAppComponentFactoryTestCases
index 7be6d18..3d513f1 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAppComponentFactoryTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAppComponentFactoryTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAppComponentFactoryTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAppSecurityHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAppSecurityHostTestCases
index e1e7bec..43169cf 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAppSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAppSecurityHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAppSecurityHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAppTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAppTestCases
index 600b0db..ca97d6b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAppTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAppTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAppTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAppTestCases.feature.ctshardware b/server/site_tests/cheets_CTS_P/control.x86.CtsAppTestCases.feature.ctshardware
index 9c6ff8b..175549c 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAppTestCases.feature.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAppTestCases.feature.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAppTestCases.feature of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAppUsageHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAppUsageHostTestCases
index 9b85173..bffaa2c 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAppUsageHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAppUsageHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAppUsageHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAppWidgetTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAppWidgetTestCases
index 20e7bb9..20e42cc 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAppWidgetTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAppWidgetTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAppWidgetTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAslrMallocTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAslrMallocTestCases
index 93b1637..85bbbd5 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAslrMallocTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAslrMallocTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAslrMallocTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAssistTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAssistTestCases
index fb1863c..c977527 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAssistTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAssistTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAssistTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAtraceHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAtraceHostTestCases
index 105c9c6..7180f2a 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAtraceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAtraceHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAtraceHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAutoFillServiceTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAutoFillServiceTestCases
index 4130e6a..8a7a876 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAutoFillServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAutoFillServiceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsAutoFillServiceTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsBackgroundRestrictionsTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsBackgroundRestrictionsTestCases
index 8dcd075..bb05029 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsBackgroundRestrictionsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsBackgroundRestrictionsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsBackgroundRestrictionsTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsBackupHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsBackupHostTestCases
index 9ccf782..5fd9144 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsBackupHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsBackupHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsBackupHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsBackupTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsBackupTestCases
index e574e14..20a3288 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsBackupTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsBackupTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsBackupTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsBatterySavingTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsBatterySavingTestCases
index 9aeee70..13203b0 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsBatterySavingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsBatterySavingTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsBatterySavingTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsBionicTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsBionicTestCases
index f8f69c1..7e53f54 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsBionicTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsBionicTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsBionicTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsBluetoothTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsBluetoothTestCases
index 175305e..483cd91 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsBluetoothTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsBluetoothTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsBluetoothTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsBootStatsTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsBootStatsTestCases
index 476b2f4..0eaf48a 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsBootStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsBootStatsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsBootStatsTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsCalendarcommon2TestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsCalendarcommon2TestCases
index 532a634..1e7e33c 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsCalendarcommon2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsCalendarcommon2TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCalendarcommon2TestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsCameraApi25TestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsCameraApi25TestCases
index 1886c28..ce65fd9 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsCameraApi25TestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsCameraApi25TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCameraApi25TestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsCameraTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsCameraTestCases
index 9463624..2c3ad43 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsCameraTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsCameraTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsCameraTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsCameraTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.x86.CtsCameraTestCases.ctshardware
index 80e12ba..7befa0f 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsCameraTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsCameraTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsCameraTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsCarTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsCarTestCases
index 047ca78..04021ca 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsCarTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsCarTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCarTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsCarrierApiTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsCarrierApiTestCases
index 0e30432..a27e144 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsCarrierApiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsCarrierApiTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCarrierApiTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsColorModeTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsColorModeTestCases
index 247c27d..a156703 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsColorModeTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsColorModeTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsColorModeTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsCompilationTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsCompilationTestCases
index 35e381b..0fe4a16 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsCompilationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsCompilationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCompilationTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsContactsProviderWipe b/server/site_tests/cheets_CTS_P/control.x86.CtsContactsProviderWipe
index 3aaaf61..76131e0 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsContactsProviderWipe
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsContactsProviderWipe
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsContactsProviderWipe of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsContentTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsContentTestCases
index b8be36e..fd98f34 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsContentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsContentTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsContentTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsCppToolsTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsCppToolsTestCases
index 5b76ecb..ffad398 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsCppToolsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsCppToolsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCppToolsTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsCurrentApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsCurrentApiSignatureTestCases
index fba72cf..27c9c48 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsCurrentApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsCurrentApiSignatureTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsCurrentApiSignatureTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDatabaseTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsDatabaseTestCases
index 60a0d89..28af3e4 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDatabaseTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDatabaseTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDebugTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsDebugTestCases
index a8b7e49..bb94e3a 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDebugTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDebugTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases
index a47e533..c3b87e2 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 1024000
+PY_VERSION = 3
 PRIORITY = 70
 DOC = 'Run module CtsDeqpTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-EGL b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-EGL
index f5f5895..bedbcc5 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-EGL
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-EGL
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-EGL of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-GLES2 b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-GLES2
index f32f598..3ab2ecf 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-GLES2
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-GLES2
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-GLES2 of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-GLES3 b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-GLES3
index 71d4868..20c65ee 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-GLES3
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-GLES3
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-GLES3 of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
index 1eac7d8..f28b7cf 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-GLES31 b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-GLES31
index b5773f0..f48367f 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-GLES31
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-GLES31
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-GLES31 of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.api b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.api
index eef9812..1f6a1dd 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.api
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.api
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.api of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.binding_model b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.binding_model
index 02a15da..eae8ef4 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.binding_model
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.binding_model
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.binding_model of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.clipping b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.clipping
index 5394624..cad274a 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.clipping
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.clipping
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.clipping of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.compute b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.compute
index 6ba15cd..9de5c19 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.compute
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.compute
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.compute of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.device_group b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.device_group
index 41ac680..06a12ab 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.device_group
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.device_group
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.device_group of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.draw b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.draw
index 2d0d05d..9c6664e 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.draw
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.draw
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.draw of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.dynamic_state b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.dynamic_state
index 471c6b8..0bd54e3 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.dynamic_state
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.dynamic_state
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.dynamic_state of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.fragment_operations b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.fragment_operations
index 5e9ddf4..d715173 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.fragment_operations
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.fragment_operations
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.fragment_operations of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.geometry b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.geometry
index 143915b..e4df402 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.geometry
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.geometry
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.geometry of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.glsl b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.glsl
index 828150d..4f8a860 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.glsl
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.glsl
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.glsl of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.image b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.image
index 057c0af..176ecc6 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.image
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.image
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.image of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.info b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.info
index 99623b8..379f4c9 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.info
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.info
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.info of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.memory b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.memory
index 224b300..cddbd13 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.memory
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.memory
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.memory of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.multiview b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.multiview
index d00f2fe..32ec3b3 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.multiview
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.multiview
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.multiview of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.pipeline b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.pipeline
index 0748a86..3dbce7d 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.pipeline
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.pipeline
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.pipeline of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.protected_memory b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.protected_memory
index c2746fa..1e7dcbd 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.protected_memory
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.protected_memory
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.protected_memory of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.query_pool b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.query_pool
index d2a198e..63a1622 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.query_pool
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.query_pool
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.query_pool of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.rasterization b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.rasterization
index 74c16bd..48bfa44 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.rasterization
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.rasterization
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.rasterization of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.renderpass b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.renderpass
index 1f8aacd..7e3f281 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.renderpass
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.renderpass
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.renderpass of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.renderpass2 b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.renderpass2
index 94d12a8..17072eb 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.renderpass2
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.renderpass2
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.renderpass2 of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.robustness b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.robustness
index c12662a..94f3183 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.robustness
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.robustness
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.robustness of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.sparse_resources b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.sparse_resources
index f76dd7f..f5d24a4 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.sparse_resources
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.sparse_resources
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.sparse_resources of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.spirv_assembly b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.spirv_assembly
index 839d089..6ec8c12 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.spirv_assembly
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.spirv_assembly
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.spirv_assembly of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.ssbo b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.ssbo
index 2a8ad5c..8fcaf97 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.ssbo
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.ssbo
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.ssbo of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups
index d9db12f..fabab61 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.subgroups of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups.arithmetic.32 b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups.arithmetic.32
index 660af56..ba29fba 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups.arithmetic.32
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups.arithmetic.32
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.subgroups.arithmetic.32 of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups.arithmetic.64 b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups.arithmetic.64
index 0cd717e..a31200d 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups.arithmetic.64
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups.arithmetic.64
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.subgroups.arithmetic.64 of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups.b b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups.b
index e5ffb17..1d0f964 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups.b
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups.b
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.subgroups.b of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups.clustered b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups.clustered
index 132a669..7b75891 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups.clustered
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups.clustered
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.subgroups.clustered of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups.quad b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups.quad
index 218be41..7170c90 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups.quad
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups.quad
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.subgroups.quad of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups.s b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups.s
index b77f19d..efa72c4 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups.s
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups.s
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.subgroups.s of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups.vote b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups.vote
index 706b675..9c1b377 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups.vote
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.subgroups.vote
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.subgroups.vote of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.synchronization b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.synchronization
index 49f8a19..0bb21e4 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.synchronization
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.synchronization
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.synchronization of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.tessellation b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.tessellation
index 95f7b93..1ecbdf8 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.tessellation
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.tessellation
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.tessellation of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.texture b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.texture
index 1348e95..d8611c2 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.texture
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.texture
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.texture of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.ubo b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.ubo
index 7f29098..4cf46d8 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.ubo
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.ubo
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.ubo of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.wsi b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.wsi
index a990470..0031c8a 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.wsi
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.wsi
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.wsi of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.ycbcr b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.ycbcr
index ae0f9ef..ab5aebd 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.ycbcr
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-VK.ycbcr
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsDeqpTestCases.dEQP-VK.ycbcr of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeviceIdleHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsDeviceIdleHostTestCases
index eae7c37..8cbd326 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeviceIdleHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeviceIdleHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDeviceIdleHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDevicePolicyManagerTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsDevicePolicyManagerTestCases
index 1714f46..2144edd 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDevicePolicyManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDevicePolicyManagerTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDevicePolicyManagerTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDexMetadataHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsDexMetadataHostTestCases
index 7e49af9..d1c3b8d 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDexMetadataHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDexMetadataHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDexMetadataHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDisplayTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsDisplayTestCases
index 53507db..318bf62 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDisplayTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDisplayTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDisplayTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDpiTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsDpiTestCases
index 586e2b3..af85863 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDpiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDpiTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDpiTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDpiTestCases2 b/server/site_tests/cheets_CTS_P/control.x86.CtsDpiTestCases2
index eebce1a..30ac9e3 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDpiTestCases2
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDpiTestCases2
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDpiTestCases2 of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDreamsTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsDreamsTestCases
index 86c6d40..7118dae 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDreamsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDreamsTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDrmTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsDrmTestCases
index 8f3684a..1950578 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDrmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDrmTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDrmTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDumpsysHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsDumpsysHostTestCases
index ed2d6dd..37cbe79 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDumpsysHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDumpsysHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDumpsysHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDynamicLinkerTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsDynamicLinkerTestCases
index 1a4ef40..8e97baa 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDynamicLinkerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDynamicLinkerTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsDynamicLinkerTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsEdiHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsEdiHostTestCases
index 2f0dbec..e7a3244 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsEdiHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsEdiHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsEdiHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsEffectTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsEffectTestCases
index c981ee6..2fbe818 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsEffectTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsEffectTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsEffectTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsExternalServiceTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsExternalServiceTestCases
index ab3443e..26ecdbc 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsExternalServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsExternalServiceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsExternalServiceTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsExternalSourcesTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsExternalSourcesTestCases
index 8e5719d..a8985b3 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsExternalSourcesTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsExternalSourcesTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsExternalSourcesTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsFileSystemTestCases
index e5aac8c..a26f4a8 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsFileSystemTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsFileSystemTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsFragmentTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsFragmentTestCases
index 5a05208..10b117c 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsFragmentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsFragmentTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsFragmentTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsFragmentTestCasesSdk26 b/server/site_tests/cheets_CTS_P/control.x86.CtsFragmentTestCasesSdk26
index 1c758ad..0ab407b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsFragmentTestCasesSdk26
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsFragmentTestCasesSdk26
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsFragmentTestCasesSdk26 of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsGestureTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsGestureTestCases
index 6e13476..b62d213 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsGestureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsGestureTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsGestureTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsGpuToolsHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsGpuToolsHostTestCases
index eb5cd7f..ace4735 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsGpuToolsHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsGpuToolsHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsGpuToolsHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsGraphicsTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsGraphicsTestCases
index 5ea11f4..39fc3e5 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsGraphicsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsGraphicsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsGraphicsTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsHardwareTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsHardwareTestCases
index 8f3efd1..a3c80d2 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsHardwareTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsHardwareTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHardwareTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsHarmfulAppWarningHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsHarmfulAppWarningHostTestCases
index 5f96306..b56ad07 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsHarmfulAppWarningHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsHarmfulAppWarningHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHarmfulAppWarningHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiBlacklistApi27TestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiBlacklistApi27TestCases
index 6d19a2e..5a74c53 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiBlacklistApi27TestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiBlacklistApi27TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHiddenApiBlacklistApi27TestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiBlacklistCurrentApiTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiBlacklistCurrentApiTestCases
index c99ee39..e6a97d7 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiBlacklistCurrentApiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiBlacklistCurrentApiTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHiddenApiBlacklistCurrentApiTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiBlacklistDebugClassTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiBlacklistDebugClassTestCases
index 0c7a30d..6fb53b4 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiBlacklistDebugClassTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiBlacklistDebugClassTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHiddenApiBlacklistDebugClassTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiKillswitchDebugClassTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiKillswitchDebugClassTestCases
index b1e7527..38e1bb7 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiKillswitchDebugClassTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiKillswitchDebugClassTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHiddenApiKillswitchDebugClassTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiKillswitchWhitelistTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiKillswitchWhitelistTestCases
index 08574e9..6c6a513 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiKillswitchWhitelistTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiKillswitchWhitelistTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHiddenApiKillswitchWhitelistTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiKillswitchWildcardTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiKillswitchWildcardTestCases
index be2ad65..42154a2 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiKillswitchWildcardTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiKillswitchWildcardTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHiddenApiKillswitchWildcardTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsHostTzDataTests b/server/site_tests/cheets_CTS_P/control.x86.CtsHostTzDataTests
index 5879984..6c11cc9 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsHostTzDataTests
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsHostTzDataTests
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHostTzDataTests of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideNetworkTests b/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideNetworkTests
index c8bab3a..bd92eca 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideNetworkTests
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideNetworkTests
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHostsideNetworkTests of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideNumberBlockingTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideNumberBlockingTestCases
index 3a6c123..43b06b4 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideNumberBlockingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideNumberBlockingTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHostsideNumberBlockingTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideTvTests b/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideTvTests
index 19793d1..d0216e6 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideTvTests
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideTvTests
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHostsideTvTests of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideWebViewTests b/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideWebViewTests
index 1091fc2..b3e9130 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideWebViewTests
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideWebViewTests
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsHostsideWebViewTests of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsIcuTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsIcuTestCases
index a370161..89ab835 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsIcuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsIcuTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsIcuTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsIncidentHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsIncidentHostTestCases
index bb6695f..506be1b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsIncidentHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsIncidentHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsIncidentHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsInlineMockingTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsInlineMockingTestCases
index 4c481df..9e5499b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsInlineMockingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsInlineMockingTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsInlineMockingTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsInputMethodServiceHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsInputMethodServiceHostTestCases
index 698aeee..256e106 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsInputMethodServiceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsInputMethodServiceHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsInputMethodServiceHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsInputMethodTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsInputMethodTestCases
index bfc0e01..cdb55e6 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsInputMethodTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsInputMethodTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsInputMethodTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsIntentSignatureTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsIntentSignatureTestCases
index f4e37e9..ae20ea4 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsIntentSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsIntentSignatureTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsIntentSignatureTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJankDeviceTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJankDeviceTestCases
index a1aae0a..98690c8 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJankDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJankDeviceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJankDeviceTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJdwpSecurityHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJdwpSecurityHostTestCases
index 0770881..8ac3712 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJdwpSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJdwpSecurityHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJdwpSecurityHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJdwpTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJdwpTestCases
index 96c6de8..0ce5088 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJdwpTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJdwpTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJdwpTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJniTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJniTestCases
index 85ba664..81af742 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJniTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJniTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJniTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJobSchedulerSharedUidTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJobSchedulerSharedUidTestCases
index 2da40b3..33d8dba 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJobSchedulerSharedUidTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJobSchedulerSharedUidTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJobSchedulerSharedUidTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJobSchedulerTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJobSchedulerTestCases
index df8981a..b2dddfc 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJobSchedulerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJobSchedulerTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJobSchedulerTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiAttachingHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiAttachingHostTestCases
index eb25670..b42dd1f 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiAttachingHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiAttachingHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiAttachingHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiAttachingTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiAttachingTestCases
index 40b0c21..7b40846 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiAttachingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiAttachingTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiAttachingTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRedefineClassesHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRedefineClassesHostTestCases
index ddb18ef..43a2785 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRedefineClassesHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRedefineClassesHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRedefineClassesHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1900HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1900HostTestCases
index c4865ea..da8a49d 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1900HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1900HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1900HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1901HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1901HostTestCases
index f4a6041..f09633d 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1901HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1901HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1901HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1902HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1902HostTestCases
index aca7ad4..a15cde2 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1902HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1902HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1902HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1903HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1903HostTestCases
index 97c2ba8..da9ee86 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1903HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1903HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1903HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1904HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1904HostTestCases
index cd65c3b..5b5ec92 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1904HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1904HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1904HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1906HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1906HostTestCases
index 72ba1b0..6ec9fc4 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1906HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1906HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1906HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1907HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1907HostTestCases
index e181a07..ebdfc1d 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1907HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1907HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1907HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1908HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1908HostTestCases
index 6a22871..c07b2f6 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1908HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1908HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1908HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1909HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1909HostTestCases
index 072d851..1a63148 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1909HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1909HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1909HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1910HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1910HostTestCases
index b428d8a..ffba7d7 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1910HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1910HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1910HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1911HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1911HostTestCases
index 7e07522..46c7544 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1911HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1911HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1911HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1912HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1912HostTestCases
index 41a06fd..de41973 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1912HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1912HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1912HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1913HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1913HostTestCases
index 1fe3462..f8f50fd 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1913HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1913HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1913HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1914HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1914HostTestCases
index de27ba2..2be1f96 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1914HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1914HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1914HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1915HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1915HostTestCases
index dba939e..bdc75fb 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1915HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1915HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1915HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1916HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1916HostTestCases
index 46c7d36..d74dc22 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1916HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1916HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1916HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1917HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1917HostTestCases
index a3f2976..6d7fb49 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1917HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1917HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1917HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1920HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1920HostTestCases
index fcd9146..82a13f7 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1920HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1920HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1920HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1921HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1921HostTestCases
index f703ba9..66571ed 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1921HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1921HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1921HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1922HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1922HostTestCases
index ae0af14..f85da63 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1922HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1922HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1922HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1923HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1923HostTestCases
index e98b405..06eff2c 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1923HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1923HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1923HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1924HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1924HostTestCases
index 7e6bfd8..4228caa 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1924HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1924HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1924HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1925HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1925HostTestCases
index 074363b..aa10020 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1925HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1925HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1925HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1926HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1926HostTestCases
index 7db5cda..1788620 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1926HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1926HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1926HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1927HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1927HostTestCases
index 90e7bfc..e41b42a 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1927HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1927HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1927HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1928HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1928HostTestCases
index 8611127..0a50fb7 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1928HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1928HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1928HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1930HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1930HostTestCases
index da64a22..1e4783f 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1930HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1930HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1930HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1931HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1931HostTestCases
index 33a53e1..ed7c51e 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1931HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1931HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1931HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1932HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1932HostTestCases
index 5889d56..07a7ae8 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1932HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1932HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1932HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1933HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1933HostTestCases
index 925fcc0..84bce72 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1933HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1933HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1933HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1934HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1934HostTestCases
index 8754815..646b9d2 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1934HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1934HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1934HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1936HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1936HostTestCases
index 9a1f13e..7503677 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1936HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1936HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1936HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1937HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1937HostTestCases
index 4b06e99..89551ea 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1937HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1937HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1937HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1939HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1939HostTestCases
index c00367a..de5d972 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1939HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1939HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1939HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1941HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1941HostTestCases
index fa53cbf..f044ed1 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1941HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1941HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1941HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1942HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1942HostTestCases
index 0e7c905..fdd171f 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1942HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1942HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1942HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1943HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1943HostTestCases
index 69746fa..230adab 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1943HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1943HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest1943HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest902HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest902HostTestCases
index 84c7274..4fca65e 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest902HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest902HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest902HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest903HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest903HostTestCases
index dea6a3b..5efeef2 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest903HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest903HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest903HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest904HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest904HostTestCases
index 718095a..c6f8294 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest904HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest904HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest904HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest905HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest905HostTestCases
index 9c1f06b..dfa726d 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest905HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest905HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest905HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest906HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest906HostTestCases
index 79bdd45..2172bae 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest906HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest906HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest906HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest907HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest907HostTestCases
index 89d985e..2a104ce 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest907HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest907HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest907HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest908HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest908HostTestCases
index b6036b3..3ddac17 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest908HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest908HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest908HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest910HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest910HostTestCases
index fc3c2d8..1b972c0 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest910HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest910HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest910HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest911HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest911HostTestCases
index 5e99414..7c287c5 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest911HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest911HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest911HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest912HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest912HostTestCases
index 5a59fb6..ed778b6 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest912HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest912HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest912HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest913HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest913HostTestCases
index df986c4..94b052e 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest913HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest913HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest913HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest914HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest914HostTestCases
index 2f95db1..24b5f09 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest914HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest914HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest914HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest915HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest915HostTestCases
index dfded08..e0589eb 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest915HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest915HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest915HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest917HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest917HostTestCases
index f6e54a4..af12778 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest917HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest917HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest917HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest918HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest918HostTestCases
index 1504cec..a440b70 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest918HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest918HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest918HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest919HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest919HostTestCases
index c8ffae3..d15ab31 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest919HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest919HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest919HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest920HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest920HostTestCases
index 9cdcb88..54b042b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest920HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest920HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest920HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest922HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest922HostTestCases
index 12dc046..7b17a54 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest922HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest922HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest922HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest923HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest923HostTestCases
index bacda24..f27ec4d 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest923HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest923HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest923HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest924HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest924HostTestCases
index 29388ff..ccd30e3 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest924HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest924HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest924HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest926HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest926HostTestCases
index 682e723..f0b175d 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest926HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest926HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest926HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest927HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest927HostTestCases
index 02515ce..821015d 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest927HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest927HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest927HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest928HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest928HostTestCases
index 86e1890..bc3a71f 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest928HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest928HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest928HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest930HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest930HostTestCases
index 3c23732..077a4f5 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest930HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest930HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest930HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest931HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest931HostTestCases
index 0f8e50d..46894bb 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest931HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest931HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest931HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest932HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest932HostTestCases
index 2d98cda..f1e0313 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest932HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest932HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest932HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest940HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest940HostTestCases
index e4688a0..d75351b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest940HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest940HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest940HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest942HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest942HostTestCases
index dd9376f..58cf05e 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest942HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest942HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest942HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest944HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest944HostTestCases
index de46365..ab14a05 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest944HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest944HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest944HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest945HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest945HostTestCases
index 06e9307..dafb9f5 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest945HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest945HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest945HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest947HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest947HostTestCases
index 59bfddf..2082ed4 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest947HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest947HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest947HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest951HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest951HostTestCases
index b81d6d8..acd0478 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest951HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest951HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest951HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest982HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest982HostTestCases
index c2c9efb..4f13cb3 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest982HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest982HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest982HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest983HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest983HostTestCases
index 4a2042c..a3a1270 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest983HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest983HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest983HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest984HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest984HostTestCases
index 69a117a..c773cf4 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest984HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest984HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest984HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest985HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest985HostTestCases
index 70f2a72..ca4afc1 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest985HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest985HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest985HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest986HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest986HostTestCases
index f841b9b..84f689a 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest986HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest986HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest986HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest988HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest988HostTestCases
index 61f6926..09fffe4 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest988HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest988HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest988HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest989HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest989HostTestCases
index 71c3fde..a5843b8 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest989HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest989HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest989HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest990HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest990HostTestCases
index af6df83..6040bb0 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest990HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest990HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest990HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest991HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest991HostTestCases
index 88723a8..557ea13 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest991HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest991HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest991HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest992HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest992HostTestCases
index 6e26082..dca6464 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest992HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest992HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest992HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest993HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest993HostTestCases
index 5dd30d3..3c5d1e7 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest993HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest993HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest993HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest994HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest994HostTestCases
index 4bf8b99..f489b2b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest994HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest994HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest994HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest995HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest995HostTestCases
index 7af62a3..8ad957e 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest995HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest995HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest995HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest996HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest996HostTestCases
index 7b5898e..5960fa1 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest996HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest996HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest996HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest997HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest997HostTestCases
index 7bdd660..45b4959 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest997HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest997HostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiRunTest997HostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiTaggingHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiTaggingHostTestCases
index 553bbcd..02524c3 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiTaggingHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiTaggingHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiTaggingHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiTrackingHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiTrackingHostTestCases
index a5eb086..4cccada 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiTrackingHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiTrackingHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsJvmtiTrackingHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsKernelConfigTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsKernelConfigTestCases
index e619c9d..050544c 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsKernelConfigTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsKernelConfigTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsKernelConfigTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsKeystoreTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsKeystoreTestCases
index 94ffd46..12ede79 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsKeystoreTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsKeystoreTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsKeystoreTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsLeanbackJankTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsLeanbackJankTestCases
index 8e9a192..440fcfa 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsLeanbackJankTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsLeanbackJankTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLeanbackJankTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsLegacyNotificationTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsLegacyNotificationTestCases
index 97baa9a..0765820 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsLegacyNotificationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsLegacyNotificationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLegacyNotificationTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreFileIOTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreFileIOTestCases
index 14b9ef5..781fa8b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreFileIOTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreFileIOTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLibcoreFileIOTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreJsr166TestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreJsr166TestCases
index f1abdb2..b98c3f7 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreJsr166TestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreJsr166TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLibcoreJsr166TestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreLegacy22TestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreLegacy22TestCases
index 73c9334..14375f0 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreLegacy22TestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreLegacy22TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLibcoreLegacy22TestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreOjTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreOjTestCases
index f927be7..0b2f480 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreOjTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreOjTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLibcoreOjTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreOkHttpTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreOkHttpTestCases
index 8524ff2..2b21a88 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreOkHttpTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreOkHttpTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLibcoreOkHttpTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreTestCases
index a9c078d..f7d74f6 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsLibcoreTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreWycheproofBCTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreWycheproofBCTestCases
index eabda56..d052eab 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreWycheproofBCTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreWycheproofBCTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLibcoreWycheproofBCTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreWycheproofConscryptTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreWycheproofConscryptTestCases
index 03be32f..2498596 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreWycheproofConscryptTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreWycheproofConscryptTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLibcoreWycheproofConscryptTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsLiblogTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsLiblogTestCases
index 1678b7d..19fe66b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsLiblogTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsLiblogTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLiblogTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsLocation2TestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsLocation2TestCases
index 7003342..aedf0ce 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsLocation2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsLocation2TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLocation2TestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsLocationTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsLocationTestCases
index 61f1f60..23d8fcb 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsLocationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsLocationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLocationTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsLogdTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsLogdTestCases
index fec7551..17419c7 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsLogdTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsLogdTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsLogdTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaBitstreamsTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaBitstreamsTestCases
index 080bc5f..e63d815 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaBitstreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaBitstreamsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaBitstreamsTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaHostTestCases
index e394ab3..7e7dca2 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMediaHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaStressTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaStressTestCases
index 3070eea..6d3206a 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaStressTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaStressTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsMediaStressTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaStressTestCases.camera.ctshardware b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaStressTestCases.camera.ctshardware
index 570bac9..0fa2729 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaStressTestCases.camera.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaStressTestCases.camera.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsMediaStressTestCases.camera of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases
index 3d411fd..838e9d6 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsMediaTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.DecodeAccuracyTest b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.DecodeAccuracyTest
index 6190af7..da9122b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.DecodeAccuracyTest
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.DecodeAccuracyTest
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsMediaTestCases.DecodeAccuracyTest of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.DecodeAccuracyTest.ctshardware b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.DecodeAccuracyTest.ctshardware
index fe4eb12..866a12a 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.DecodeAccuracyTest.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.DecodeAccuracyTest.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsMediaTestCases.DecodeAccuracyTest of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest
index 2a9e7cf..5ad1bdd 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsMediaTestCases.VideoDecoderPerfAndEncoderTest of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware
index 99f65ce..c46cfb4 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.VideoDecoderPerfAndEncoderTest.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsMediaTestCases.VideoDecoderPerfAndEncoderTest of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.ctshardware
index 536b518..9da9b18 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsMediaTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.other b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.other
index 7fa4e74..07eecaa 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.other
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.other
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsMediaTestCases.other of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.other.ctshardware b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.other.ctshardware
index 47dab70..9d9331e 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.other.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.other.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsMediaTestCases.other of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsMidiTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsMidiTestCases
index bc64ef7..111dd2c 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsMidiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsMidiTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMidiTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsMockingDebuggableTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsMockingDebuggableTestCases
index 9e816a8..6837c54 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsMockingDebuggableTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsMockingDebuggableTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMockingDebuggableTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsMockingTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsMockingTestCases
index 12930f5..1134b5e 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsMockingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsMockingTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMockingTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsMonkeyTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsMonkeyTestCases
index 930c272..81ed1eb 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsMonkeyTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsMonkeyTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMonkeyTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsMultiUserHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsMultiUserHostTestCases
index e5a3117..f6db3a2 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsMultiUserHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsMultiUserHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMultiUserHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsMultiUserTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsMultiUserTestCases
index 23cacdd..5d9bb1c 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsMultiUserTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsMultiUserTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsMultiUserTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNNAPITestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNNAPITestCases
index da2eb66..03ddd28 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNNAPITestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNNAPITestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNNAPITestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNativeHardwareTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNativeHardwareTestCases
index 9fda64b..a31e944 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNativeHardwareTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNativeHardwareTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNativeHardwareTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNativeMediaAAudioTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNativeMediaAAudioTestCases
index f8e8833..3edacdb 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNativeMediaAAudioTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNativeMediaAAudioTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNativeMediaAAudioTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNativeMediaAAudioTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.x86.CtsNativeMediaAAudioTestCases.ctshardware
index f0a7784..4e02636 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNativeMediaAAudioTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNativeMediaAAudioTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNativeMediaAAudioTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNativeMediaSlTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNativeMediaSlTestCases
index c910770..11931eb 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNativeMediaSlTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNativeMediaSlTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNativeMediaSlTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNativeMediaXaTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNativeMediaXaTestCases
index 69e160f..ae0862d 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNativeMediaXaTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNativeMediaXaTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNativeMediaXaTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNativeNetTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNativeNetTestCases
index 8c1a934..6f6692b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNativeNetTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNativeNetTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNativeNetTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNdefTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNdefTestCases
index 61315a6..684c46c 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNdefTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNdefTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNdefTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigAttributeTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigAttributeTestCases
index f9f8f41..cefbcee 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigAttributeTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigAttributeTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetSecConfigAttributeTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigBasicDebugDisabledTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigBasicDebugDisabledTestCases
index 9f24fc1..ee3e7bb 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigBasicDebugDisabledTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigBasicDebugDisabledTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetSecConfigBasicDebugDisabledTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigBasicDebugEnabledTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigBasicDebugEnabledTestCases
index 8710bb3..2cd424b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigBasicDebugEnabledTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigBasicDebugEnabledTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetSecConfigBasicDebugEnabledTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigBasicDomainConfigTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigBasicDomainConfigTestCases
index c3d8deb..18def0c 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigBasicDomainConfigTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigBasicDomainConfigTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetSecConfigBasicDomainConfigTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigCleartextTrafficTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigCleartextTrafficTestCases
index 2b2b90c..96a2f03 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigCleartextTrafficTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigCleartextTrafficTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetSecConfigCleartextTrafficTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigDownloadManagerTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigDownloadManagerTestCases
index fb58efd..d959ddb 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigDownloadManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigDownloadManagerTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetSecConfigDownloadManagerTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigInvalidPinTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigInvalidPinTestCases
index d90f205..b09c705 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigInvalidPinTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigInvalidPinTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetSecConfigInvalidPinTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigNestedDomainConfigTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigNestedDomainConfigTestCases
index 030aa8f..c700fb7 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigNestedDomainConfigTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigNestedDomainConfigTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetSecConfigNestedDomainConfigTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigPrePCleartextTrafficTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigPrePCleartextTrafficTestCases
index 84a1177..c23eacc 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigPrePCleartextTrafficTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigPrePCleartextTrafficTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetSecConfigPrePCleartextTrafficTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigResourcesSrcTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigResourcesSrcTestCases
index f475667..a192191 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigResourcesSrcTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigResourcesSrcTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetSecConfigResourcesSrcTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
index 4fd1a7e..1cf9041 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetSecPolicyUsesCleartextTrafficFalseTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
index 4e7ce12..f4887cd 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetSecPolicyUsesCleartextTrafficTrueTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
index 1e6eb23..261d225 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCases
index b5b94b9..8a28255 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsNetTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCases.ctshardware
index 10bfaf8..cef74f0 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsNetTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCasesLegacyApi22 b/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCasesLegacyApi22
index 224aeb4..ef431ce 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCasesLegacyApi22
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCasesLegacyApi22
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetTestCasesLegacyApi22 of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCasesLegacyPermission22 b/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCasesLegacyPermission22
index 35d1717..c1eefbb 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCasesLegacyPermission22
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCasesLegacyPermission22
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsNetTestCasesLegacyPermission22 of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsOmapiTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsOmapiTestCases
index 5e18857..932b35a 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsOmapiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsOmapiTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsOmapiTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsOpenGLTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsOpenGLTestCases
index 91d5aa3..b1784d4 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsOpenGLTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsOpenGLTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsOpenGLTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsOpenGlPerf2TestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsOpenGlPerf2TestCases
index 7d5aeac..fefce8e 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsOpenGlPerf2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsOpenGlPerf2TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsOpenGlPerf2TestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsOpenGlPerfTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsOpenGlPerfTestCases
index 7db60fd..6827c81 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsOpenGlPerfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsOpenGlPerfTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsOpenGlPerfTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsOsHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsOsHostTestCases
index a04f9b7..7afc830 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsOsHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsOsHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsOsHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsOsTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsOsTestCases
index 8dd0135..8fe3ff4 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsOsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsOsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsOsTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsPdfTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsPdfTestCases
index 14f1d99..b678895 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsPdfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsPdfTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPdfTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsPerfettoTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsPerfettoTestCases
index 9af493a..e2881a7 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsPerfettoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsPerfettoTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPerfettoTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsPerfettoTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.x86.CtsPerfettoTestCases.ctshardware
index 5a327cc..fc1486c 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsPerfettoTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsPerfettoTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPerfettoTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsPermission2TestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsPermission2TestCases
index 6879ad1..b820b66 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsPermission2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsPermission2TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPermission2TestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsPermissionTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsPermissionTestCases
index e96f5c2..6ec8960 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsPermissionTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsPermissionTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPermissionTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsPermissionTestCases.camera.ctshardware b/server/site_tests/cheets_CTS_P/control.x86.CtsPermissionTestCases.camera.ctshardware
index b42a921..9c9c511 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsPermissionTestCases.camera.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsPermissionTestCases.camera.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPermissionTestCases.camera of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsPreference2TestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsPreference2TestCases
index e31ed43..a0573d1 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsPreference2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsPreference2TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPreference2TestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsPreferenceTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsPreferenceTestCases
index b5221ed..40e153e 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsPreferenceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsPreferenceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPreferenceTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsPrintTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsPrintTestCases
index e0e0c33..b01cfd2 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsPrintTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsPrintTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsProtoTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsProtoTestCases
index a5f6300..15b36d6 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsProtoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsProtoTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsProtoTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsProviderTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsProviderTestCases
index 4d3e7df..1bc65ac 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsProviderTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsProviderTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsProviderTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsRenderscriptLegacyTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsRenderscriptLegacyTestCases
index cfd3270..0c1f7cf 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsRenderscriptLegacyTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsRenderscriptLegacyTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsRenderscriptLegacyTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsRenderscriptTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsRenderscriptTestCases
index 346c951..1e3f28e 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsRenderscriptTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsRenderscriptTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsRenderscriptTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsRsBlasTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsRsBlasTestCases
index 70ec381..28f5f86 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsRsBlasTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsRsBlasTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsRsBlasTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsRsCppTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsRsCppTestCases
index a20877a..3f99c73 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsRsCppTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsRsCppTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsRsCppTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSampleDeviceTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSampleDeviceTestCases
index 7d460dc..461d3c8 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSampleDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSampleDeviceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSampleDeviceTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSampleHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSampleHostTestCases
index a9674e2..fc615ff 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSampleHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSampleHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSampleHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSaxTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSaxTestCases
index e39d081..fd0a67d 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSaxTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSaxTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSaxTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSeccompHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSeccompHostTestCases
index 7110604..5fb83e0 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSeccompHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSeccompHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSeccompHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSecureElementAccessControlTestCases1 b/server/site_tests/cheets_CTS_P/control.x86.CtsSecureElementAccessControlTestCases1
index 8451197..deac5f4 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSecureElementAccessControlTestCases1
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSecureElementAccessControlTestCases1
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSecureElementAccessControlTestCases1 of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSecureElementAccessControlTestCases2 b/server/site_tests/cheets_CTS_P/control.x86.CtsSecureElementAccessControlTestCases2
index 12bedfc..4336e98 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSecureElementAccessControlTestCases2
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSecureElementAccessControlTestCases2
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSecureElementAccessControlTestCases2 of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSecureElementAccessControlTestCases3 b/server/site_tests/cheets_CTS_P/control.x86.CtsSecureElementAccessControlTestCases3
index f0dd6ad..f694b16 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSecureElementAccessControlTestCases3
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSecureElementAccessControlTestCases3
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSecureElementAccessControlTestCases3 of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSecurityBulletinHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSecurityBulletinHostTestCases
index a0ad2c6..ef6a4cd 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSecurityBulletinHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSecurityBulletinHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSecurityBulletinHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSecurityHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSecurityHostTestCases
index 0d08725..d6103f9 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSecurityHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsSecurityHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSecurityTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSecurityTestCases
index 4844e77..1ed05a3 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSecurityTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSecurityTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'LONG'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsSecurityTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSelinuxTargetSdk25TestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSelinuxTargetSdk25TestCases
index 35cbc3f..38e48c2 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSelinuxTargetSdk25TestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSelinuxTargetSdk25TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSelinuxTargetSdk25TestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSelinuxTargetSdk27TestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSelinuxTargetSdk27TestCases
index 54d7b7f..206ceda 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSelinuxTargetSdk27TestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSelinuxTargetSdk27TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSelinuxTargetSdk27TestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSelinuxTargetSdkCurrentTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSelinuxTargetSdkCurrentTestCases
index 3942432..34eb867 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSelinuxTargetSdkCurrentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSelinuxTargetSdkCurrentTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSelinuxTargetSdkCurrentTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSensorTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSensorTestCases
index e9ac745..8c472a6 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSensorTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSensorTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSensorTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSensorTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.x86.CtsSensorTestCases.ctshardware
index a6bcece..c7d823f 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSensorTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSensorTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSensorTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsShortcutHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsShortcutHostTestCases
index b666635..cf95586 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsShortcutHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsShortcutHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsShortcutHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsShortcutManagerTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsShortcutManagerTestCases
index 83769b6..457410f 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsShortcutManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsShortcutManagerTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsShortcutManagerTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSimRestrictedApisTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSimRestrictedApisTestCases
index ce7a596..bc251a2 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSimRestrictedApisTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSimRestrictedApisTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSimRestrictedApisTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSimpleCpuTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSimpleCpuTestCases
index 5d163c2..fb0876b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSimpleCpuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSimpleCpuTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSimpleCpuTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSimpleperfTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSimpleperfTestCases
index 25d48b9..ae35612 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSimpleperfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSimpleperfTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSimpleperfTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSkQPTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSkQPTestCases
index 119a451..a3ac56d 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSkQPTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSkQPTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSkQPTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSliceTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSliceTestCases
index 0e2ed08..3a797fd 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSliceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSliceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSliceTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSpeechTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSpeechTestCases
index e6bcd4d..2b0e3f3 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSpeechTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSpeechTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSpeechTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsStatsdHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsStatsdHostTestCases
index 209e034..361a1ca 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsStatsdHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsStatsdHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsStatsdHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSustainedPerformanceHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSustainedPerformanceHostTestCases
index 59d9e35..0f6575b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSustainedPerformanceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSustainedPerformanceHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSustainedPerformanceHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSustainedPerformanceHostTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.x86.CtsSustainedPerformanceHostTestCases.ctshardware
index fec63e4..855520e 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSustainedPerformanceHostTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSustainedPerformanceHostTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSustainedPerformanceHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSyncAccountAccessOtherCertTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSyncAccountAccessOtherCertTestCases
index 8dc8cc3..2a5dfe0 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSyncAccountAccessOtherCertTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSyncAccountAccessOtherCertTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSyncAccountAccessOtherCertTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSyncContentHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSyncContentHostTestCases
index 9b3cebd..20dbaa4 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSyncContentHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSyncContentHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSyncContentHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSyncManagerTestsCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSyncManagerTestsCases
index 9f48d66..2f5e5bd 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSyncManagerTestsCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSyncManagerTestsCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSyncManagerTestsCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSystemApiAnnotationTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSystemApiAnnotationTestCases
index 888e8b2..bfa3821 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSystemApiAnnotationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSystemApiAnnotationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSystemApiAnnotationTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSystemApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSystemApiSignatureTestCases
index c0857dc..06922f7 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSystemApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSystemApiSignatureTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSystemApiSignatureTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSystemIntentTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSystemIntentTestCases
index 04473f3..d05adf1 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSystemIntentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSystemIntentTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSystemIntentTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSystemUiHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSystemUiHostTestCases
index cfe4672..f4c6c46 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSystemUiHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSystemUiHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSystemUiHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSystemUiTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSystemUiTestCases
index fd0de14..d856b3b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSystemUiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSystemUiTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsSystemUiTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsTelecomTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsTelecomTestCases
index 68183a2..b386155 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsTelecomTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsTelecomTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTelecomTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsTelecomTestCases2 b/server/site_tests/cheets_CTS_P/control.x86.CtsTelecomTestCases2
index 635cf08..f2777b8 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsTelecomTestCases2
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsTelecomTestCases2
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTelecomTestCases2 of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsTelecomTestCases3 b/server/site_tests/cheets_CTS_P/control.x86.CtsTelecomTestCases3
index 42e9feb..0c3dba4 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsTelecomTestCases3
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsTelecomTestCases3
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTelecomTestCases3 of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsTelephony2TestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsTelephony2TestCases
index ad6df3e..0294e93 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsTelephony2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsTelephony2TestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTelephony2TestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsTelephonyTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsTelephonyTestCases
index 3f826a9..7b68245 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsTelephonyTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsTelephonyTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTelephonyTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsTextTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsTextTestCases
index 0bc33e1..f31efa5 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsTextTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsTextTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTextTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsThemeDeviceTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsThemeDeviceTestCases
index ed369bf..099b328 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsThemeDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsThemeDeviceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsThemeDeviceTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsThemeHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsThemeHostTestCases
index 5be37f0..4fad74e 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsThemeHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsThemeHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsThemeHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsToastLegacyTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsToastLegacyTestCases
index b5add10..2d02cc0 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsToastLegacyTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsToastLegacyTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsToastLegacyTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsToastTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsToastTestCases
index 1ce598a..4219e50 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsToastTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsToastTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsToastTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsTransitionTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsTransitionTestCases
index dd4b2d9..1cb2a7c 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsTransitionTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsTransitionTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTransitionTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsTrustedVoiceHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsTrustedVoiceHostTestCases
index b5f09d2..7b048c8 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsTrustedVoiceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsTrustedVoiceHostTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTrustedVoiceHostTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsTvProviderTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsTvProviderTestCases
index 0132313..1e0b1ef 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsTvProviderTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsTvProviderTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTvProviderTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsTvTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsTvTestCases
index f915b9a..6608207 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsTvTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsTvTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsTvTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsUiAutomationTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsUiAutomationTestCases
index 8e73b9c..b065079 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsUiAutomationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsUiAutomationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUiAutomationTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsUiDeviceTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsUiDeviceTestCases
index e4bfde8..f19f25e 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsUiDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsUiDeviceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUiDeviceTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsUiRenderingTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsUiRenderingTestCases
index 7900b1f..18af270 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsUiRenderingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsUiRenderingTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUiRenderingTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsUidIsolationTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsUidIsolationTestCases
index d46d2d5..ba1f8b0 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsUidIsolationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsUidIsolationTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUidIsolationTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsUsageStatsTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsUsageStatsTestCases
index 1d01eed..b08d7ca 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsUsageStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsUsageStatsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsUsageStatsTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsUsageStatsTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.x86.CtsUsageStatsTestCases.ctshardware
index b9239e9..100440a 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsUsageStatsTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsUsageStatsTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 PRIORITY = 50
 DOC = 'Run module CtsUsageStatsTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsUsbTests b/server/site_tests/cheets_CTS_P/control.x86.CtsUsbTests
index 5f1a00d..854ab87 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsUsbTests
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsUsbTests
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUsbTests of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsUtilTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsUtilTestCases
index ee75a48..122bfce 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsUtilTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsUtilTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsUtilTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsVideoTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsVideoTestCases
index 974c960..b04e5ec 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsVideoTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsVideoTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsViewTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsViewTestCases
index 5b4c3d4..687f43c 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsViewTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsViewTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsViewTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.x86.CtsViewTestCases.ctshardware
index 7771649..74b9d31 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsViewTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsViewTestCases.ctshardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsViewTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsVmTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsVmTestCases
index a837412..6bd2a5c 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsVmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsVmTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsVmTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsVoiceInteractionTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsVoiceInteractionTestCases
index 9a50664..a093e1d 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsVoiceInteractionTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsVoiceInteractionTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsVoiceInteractionTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsVoiceSettingsTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsVoiceSettingsTestCases
index f6f9dcb..d91a130 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsVoiceSettingsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsVoiceSettingsTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsVoiceSettingsTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsVrTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsVrTestCases
index 56ed2f3..54c7292 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsVrTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsVrTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsVrTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsWebkitTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsWebkitTestCases
index 4c11be4..1bb4b56 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsWebkitTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsWebkitTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsWebkitTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsWidgetTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsWidgetTestCases
index 30804cf..b7cbbb9 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsWidgetTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsWidgetTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsWindowManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsWindowManagerDeviceTestCases
index a9bc33f..24563d7 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsWindowManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsWindowManagerDeviceTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsWindowManagerDeviceTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsWrapNoWrapTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsWrapNoWrapTestCases
index 50b5e0f..1aacf58 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsWrapNoWrapTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsWrapNoWrapTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsWrapNoWrapTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsWrapWrapDebugMallocDebugTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsWrapWrapDebugMallocDebugTestCases
index 720b9a0..23327f4 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsWrapWrapDebugMallocDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsWrapWrapDebugMallocDebugTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsWrapWrapDebugMallocDebugTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsWrapWrapDebugTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsWrapWrapDebugTestCases
index dc456b4..5aac5cd 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsWrapWrapDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsWrapWrapDebugTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsWrapWrapDebugTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsWrapWrapNoDebugTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsWrapWrapNoDebugTestCases
index 765f345..d9f1941 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsWrapWrapNoDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsWrapWrapNoDebugTestCases
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module CtsWrapWrapNoDebugTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.cts-system-all.api b/server/site_tests/cheets_CTS_P/control.x86.cts-system-all.api
index 9318094..bbb9dc2 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.cts-system-all.api
+++ b/server/site_tests/cheets_CTS_P/control.x86.cts-system-all.api
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module cts-system-all.api of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.signed-CtsSecureElementAccessControlTestCases1 b/server/site_tests/cheets_CTS_P/control.x86.signed-CtsSecureElementAccessControlTestCases1
index e14d79b..cec324b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.signed-CtsSecureElementAccessControlTestCases1
+++ b/server/site_tests/cheets_CTS_P/control.x86.signed-CtsSecureElementAccessControlTestCases1
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module signed-CtsSecureElementAccessControlTestCases1 of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.signed-CtsSecureElementAccessControlTestCases2 b/server/site_tests/cheets_CTS_P/control.x86.signed-CtsSecureElementAccessControlTestCases2
index 338fe22..c459bc1 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.signed-CtsSecureElementAccessControlTestCases2
+++ b/server/site_tests/cheets_CTS_P/control.x86.signed-CtsSecureElementAccessControlTestCases2
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module signed-CtsSecureElementAccessControlTestCases2 of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.signed-CtsSecureElementAccessControlTestCases3 b/server/site_tests/cheets_CTS_P/control.x86.signed-CtsSecureElementAccessControlTestCases3
index 9f5fad7..a7ce595 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.signed-CtsSecureElementAccessControlTestCases3
+++ b/server/site_tests/cheets_CTS_P/control.x86.signed-CtsSecureElementAccessControlTestCases3
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module signed-CtsSecureElementAccessControlTestCases3 of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.tradefed-run-collect-tests-only b/server/site_tests/cheets_CTS_P/control.x86.tradefed-run-collect-tests-only
index 7e773ee..9bffc1c 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.tradefed-run-collect-tests-only
+++ b/server/site_tests/cheets_CTS_P/control.x86.tradefed-run-collect-tests-only
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 1024000
+PY_VERSION = 3
 PRIORITY = 70
 DOC = 'Run all of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
diff --git a/server/site_tests/cheets_CTS_P/control.x86.tradefed-run-collect-tests-only-hardware b/server/site_tests/cheets_CTS_P/control.x86.tradefed-run-collect-tests-only-hardware
index 67f72ac..13fb7f3 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.tradefed-run-collect-tests-only-hardware
+++ b/server/site_tests/cheets_CTS_P/control.x86.tradefed-run-collect-tests-only-hardware
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module tradefed-run-collect-tests-only-hardware of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.vm-tests-tf b/server/site_tests/cheets_CTS_P/control.x86.vm-tests-tf
index a7cea7e..e6f4ac3 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.vm-tests-tf
+++ b/server/site_tests/cheets_CTS_P/control.x86.vm-tests-tf
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run module vm-tests-tf of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.waivers b/server/site_tests/cheets_CTS_P/control.x86.waivers
index b3dd0d0..db5b61e 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.waivers
+++ b/server/site_tests/cheets_CTS_P/control.x86.waivers
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 512000
+PY_VERSION = 3
 DOC = 'Run waived tests of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
 
 def run_TS(machine):
diff --git a/server/site_tests/cheets_CTS_P/control.x86.waivers-collect-tests-only b/server/site_tests/cheets_CTS_P/control.x86.waivers-collect-tests-only
index 35feb12..92488c1 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.waivers-collect-tests-only
+++ b/server/site_tests/cheets_CTS_P/control.x86.waivers-collect-tests-only
@@ -12,6 +12,7 @@
 TEST_TYPE = 'server'
 TIME = 'MEDIUM'
 MAX_RESULT_SIZE_KB = 1024000
+PY_VERSION = 3
 PRIORITY = 70
 DOC = 'Run waived tests of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'