Add test tracker project ID to telephony controls files.

Add location label to test bed.

Test: None
Bug: None
Change-Id: I714aa9dff4370d20aa6d180b99c1cb78dbc41584
Reviewed-on: https://chromium-review.googlesource.com/466506
Reviewed-by: Betty Zhou <bettyzhou@google.com>
Commit-Queue: Betty Zhou <bettyzhou@google.com>
Trybot-Ready: Betty Zhou <bettyzhou@google.com>
Tested-by: Betty Zhou <bettyzhou@google.com>
diff --git a/server/site_tests/android_ACTS/control.Telephony_ATT_Basic b/server/site_tests/android_ACTS/control.Telephony_ATT_Basic
deleted file mode 100644
index a61a21d..0000000
--- a/server/site_tests/android_ACTS/control.Telephony_ATT_Basic
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = 'bettyzhou, krisr'
-NAME = 'android_ACTS.Telephony_ATT_Basic'
-TIME = 'LONG'
-TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:android_telephony_nexus_att,'
-              'suite:android_telephony_nightly_att')
-DEPENDENCIES = 'carrier:att'
-
-DOC = """
-This test runs telephony sanity against an phones with AT&T SIMs.
-"""
-
-def run(machine):
-    job.run_test('android_ACTS',
-                 testbed=hosts.create_testbed(machine),
-                 config_file='android1758-telephony-test-station.config',
-                 test_file='telephony_att_basic',
-                 additional_configs=['simcard_list.json'],
-                 acts_timeout=18000)
-
-parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_ATT_Long_Call b/server/site_tests/android_ACTS/control.Telephony_ATT_Long_Call
deleted file mode 100644
index 39b63a1..0000000
--- a/server/site_tests/android_ACTS/control.Telephony_ATT_Long_Call
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = 'bettyzhou, krisr'
-NAME = 'android_ACTS.Telephony_ATT_Long_Voice'
-TIME = 'LONG'
-TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:android_telephony_nightly_att'
-DEPENDENCIES = 'carrier:att'
-
-DOC = """
-This test runs telephony long voice call test against phone with AT&T SIMs.
-"""
-
-def run(machine):
-    job.run_test('android_ACTS',
-                 testbed=hosts.create_testbed(machine),
-                 config_file='android1758-telephony-test-station.config',
-                 test_file='telephony_long_voice_att',
-                 additional_configs=['simcard_list.json'],
-                 acts_timeout=36000)
-
-parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_ATT_Longevity b/server/site_tests/android_ACTS/control.Telephony_ATT_Longevity
deleted file mode 100644
index 537260d..0000000
--- a/server/site_tests/android_ACTS/control.Telephony_ATT_Longevity
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = 'bettyzhou, krisr'
-NAME = 'android_ACTS.Telephony_ATT_Longevity'
-TIME = 'LONG'
-TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:android_telephony_longevity'
-DEPENDENCIES = 'carrier:att'
-
-DOC = """
-This test runs telephony longevity test against an phones with AT&T SIMs.
-"""
-
-def run(machine):
-    job.run_test('android_ACTS',
-                 testbed=hosts.create_testbed(machine),
-                 config_file='android1758-telephony-test-station.config',
-                 test_file='telephony_longevity',
-                 additional_configs=['simcard_list.json'],
-                 acts_timeout=36000)
-
-parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_Australia_Telstra_Basic b/server/site_tests/android_ACTS/control.Telephony_Australia_Telstra_Basic
deleted file mode 100644
index 1f6f866..0000000
--- a/server/site_tests/android_ACTS/control.Telephony_Australia_Telstra_Basic
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = 'bettyzhou, krisr'
-NAME = 'android_ACTS.Telephony_Australia_Telstra_Roaming_Basic'
-TIME = 'MEDIUM'
-TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:android_telephony_international_roaming'
-DEPENDENCIES = 'carrier:australia_telstra'
-
-DOC = """
-This test runs telephony sanity against phones with Australia Telstra SIMs
-roaming in US.
-"""
-
-def run(machine):
-    job.run_test('android_ACTS',
-                 testbed=hosts.create_testbed(machine),
-                 config_file='android1758-telephony-test-station.config',
-                 test_file='telephony_international_roaming',
-                 additional_configs=['simcard_list.json'],
-                 acts_timeout=18000)
-
-parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_England_EE_Basic b/server/site_tests/android_ACTS/control.Telephony_England_EE_Basic
index 32b4b13..8a285aa 100644
--- a/server/site_tests/android_ACTS/control.Telephony_England_EE_Basic
+++ b/server/site_tests/android_ACTS/control.Telephony_England_EE_Basic
@@ -7,7 +7,7 @@
 TIME = 'LONG'
 TEST_TYPE = 'Server'
 ATTRIBUTES = 'suite:android_telephony_nightly'
-DEPENDENCIES = 'carrier:england_ee'
+DEPENDENCIES = 'carrier:england_ee,location:london'
 
 DOC = """
 This test runs telephony sanity against an phones with EE SIMs.
@@ -19,6 +19,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_uk_ee_basic',
                  additional_configs=['simcard_list.json'],
+                 testtracker_project_id=11349,
                  acts_timeout=25200)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_England_EE_Conf_CEP b/server/site_tests/android_ACTS/control.Telephony_England_EE_Conf_CEP
index e1d761a..15ddfd0 100644
--- a/server/site_tests/android_ACTS/control.Telephony_England_EE_Conf_CEP
+++ b/server/site_tests/android_ACTS/control.Telephony_England_EE_Conf_CEP
@@ -7,7 +7,7 @@
 TIME = 'LONG'
 TEST_TYPE = 'Server'
 ATTRIBUTES = 'suite:android_telephony_nightly'
-DEPENDENCIES = 'carrier:england_ee'
+DEPENDENCIES = 'carrier:england_ee,location:london'
 
 DOC = """
 This test runs telephony sanity against an phones with EE SIMs.
@@ -19,6 +19,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_uk_ee_conf_cep',
                  additional_configs=['simcard_list.json'],
+                 testtracker_project_id=11349,
                  acts_timeout=25200)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_England_EE_Conf_NoCEP b/server/site_tests/android_ACTS/control.Telephony_England_EE_Conf_NoCEP
index e07b3a6..ecd8aa5 100644
--- a/server/site_tests/android_ACTS/control.Telephony_England_EE_Conf_NoCEP
+++ b/server/site_tests/android_ACTS/control.Telephony_England_EE_Conf_NoCEP
@@ -7,7 +7,7 @@
 TIME = 'LONG'
 TEST_TYPE = 'Server'
 ATTRIBUTES = 'suite:android_telephony_nightly'
-DEPENDENCIES = 'carrier:england_ee'
+DEPENDENCIES = 'carrier:england_ee,location:london'
 
 DOC = """
 This test runs telephony sanity against an phones with EE SIMs.
@@ -19,6 +19,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_uk_ee_conf_nocep',
                  additional_configs=['simcard_list.json'],
+                 testtracker_project_id=11349,
                  acts_timeout=25200)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_England_EE_WFC b/server/site_tests/android_ACTS/control.Telephony_England_EE_WFC
index a24b6fe..8330086 100644
--- a/server/site_tests/android_ACTS/control.Telephony_England_EE_WFC
+++ b/server/site_tests/android_ACTS/control.Telephony_England_EE_WFC
@@ -7,7 +7,7 @@
 TIME = 'LONG'
 TEST_TYPE = 'Server'
 ATTRIBUTES = 'suite:android_telephony_nightly'
-DEPENDENCIES = 'carrier:uk_ee'
+DEPENDENCIES = 'carrier:england_ee,location:london'
 
 DOC = """
 This test runs telephony sanity against an phones with EE SIMs.
@@ -19,6 +19,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_uk_ee_wfc',
                  additional_configs=['simcard_list.json'],
+                 testtracker_project_id=11349,
                  acts_timeout=25200)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_England_O2_Basic b/server/site_tests/android_ACTS/control.Telephony_England_O2_Basic
index c66923d..ea0fea0 100644
--- a/server/site_tests/android_ACTS/control.Telephony_England_O2_Basic
+++ b/server/site_tests/android_ACTS/control.Telephony_England_O2_Basic
@@ -7,7 +7,7 @@
 TIME = 'LONG'
 TEST_TYPE = 'Server'
 ATTRIBUTES = 'suite:android_telephony_international_roaming'
-DEPENDENCIES = 'carrier:england_o2'
+DEPENDENCIES = 'carrier:england_o2,location:london'
 
 DOC = """
 This test runs telephony sanity against an phones with UK O2 SIMs.
@@ -19,6 +19,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_uk_vodafone',
                  additional_configs=['simcard_list.json'],
+                 testtracker_project_id=11349,
                  acts_timeout=18000)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_England_Three_Basic b/server/site_tests/android_ACTS/control.Telephony_England_Three_Basic
index 49daa3e..bc23c3f 100644
--- a/server/site_tests/android_ACTS/control.Telephony_England_Three_Basic
+++ b/server/site_tests/android_ACTS/control.Telephony_England_Three_Basic
@@ -7,7 +7,7 @@
 TIME = 'LONG'
 TEST_TYPE = 'Server'
 ATTRIBUTES = 'suite:android_telephony_international_roaming'
-DEPENDENCIES = 'carrier:england_three'
+DEPENDENCIES = 'carrier:england_three,location:london'
 
 DOC = """
 This test runs telephony sanity against an phones with UK Three SIMs.
@@ -19,6 +19,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_uk_vodafone',
                  additional_configs=['simcard_list.json'],
+                 testtracker_project_id=11349,
                  acts_timeout=18000)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_England_VZW_roaming b/server/site_tests/android_ACTS/control.Telephony_England_VZW_roaming
index 1b427b0..60e0357 100644
--- a/server/site_tests/android_ACTS/control.Telephony_England_VZW_roaming
+++ b/server/site_tests/android_ACTS/control.Telephony_England_VZW_roaming
@@ -7,7 +7,7 @@
 TIME = 'MEDIUM'
 TEST_TYPE = 'Server'
 ATTRIBUTES = 'suite:android_telephony_international_roaming'
-DEPENDENCIES = 'carrier:verizon_london'
+DEPENDENCIES = 'carrier:verizon,location:london'
 
 DOC = """
 This test runs telephony sanity against phones with Verizon SIMs roaming
@@ -20,6 +20,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_international_roaming',
                  additional_configs=['simcard_list.json'],
+                 testtracker_project_id=11349,
                  acts_timeout=18000)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_England_Vodafone_Basic b/server/site_tests/android_ACTS/control.Telephony_England_Vodafone_Basic
index a97c74d..b32138f 100644
--- a/server/site_tests/android_ACTS/control.Telephony_England_Vodafone_Basic
+++ b/server/site_tests/android_ACTS/control.Telephony_England_Vodafone_Basic
@@ -7,7 +7,7 @@
 TIME = 'MEDIUM'
 TEST_TYPE = 'Server'
 ATTRIBUTES = 'suite:android_telephony_international_roaming'
-DEPENDENCIES = 'carrier:england_vodafone'
+DEPENDENCIES = 'carrier:england_vodafone,location:london'
 
 DOC = """
 This test runs telephony sanity against phones with England Vodafone SIMs.
@@ -19,6 +19,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_uk_vodafone',
                  additional_configs=['simcard_list.json'],
+                 testtracker_project_id=11349,
                  acts_timeout=18000)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_France_Lapuce_Basic b/server/site_tests/android_ACTS/control.Telephony_France_Lapuce_Basic
deleted file mode 100644
index 52fd423..0000000
--- a/server/site_tests/android_ACTS/control.Telephony_France_Lapuce_Basic
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = 'bettyzhou, krisr'
-NAME = 'android_ACTS.Telephony_France_Lapuce_Roaming_Basic'
-TIME = 'MEDIUM'
-TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:android_telephony_international_roaming'
-DEPENDENCIES = 'carrier:france_lapuce'
-
-DOC = """
-This test runs telephony sanity against phones with France Lapuce SIMs roaming
-in US.
-"""
-
-def run(machine):
-    job.run_test('android_ACTS',
-                 testbed=hosts.create_testbed(machine),
-                 config_file='android1758-telephony-test-station.config',
-                 test_file='telephony_international_roaming',
-                 additional_configs=['simcard_list.json'],
-                 acts_timeout=18000)
-
-parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_Germany_Vodaphone_Basic b/server/site_tests/android_ACTS/control.Telephony_Germany_Vodaphone_Basic
deleted file mode 100644
index b2b7a3a..0000000
--- a/server/site_tests/android_ACTS/control.Telephony_Germany_Vodaphone_Basic
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = 'bettyzhou, krisr'
-NAME = 'android_ACTS.Telephony_Germany_Vodaphone_Roaming_Basic'
-TIME = 'MEDIUM'
-TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:android_telephony_international_roaming'
-DEPENDENCIES = 'carrier:germany_vodaphone'
-
-DOC = """
-This test runs telephony sanity against phones with Germany Vodaphone SIMs
-roaming in US.
-"""
-
-def run(machine):
-    job.run_test('android_ACTS',
-                 testbed=hosts.create_testbed(machine),
-                 config_file='android1758-telephony-test-station.config',
-                 test_file='telephony_international_roaming',
-                 additional_configs=['simcard_list.json'],
-                 acts_timeout=18000)
-
-parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_Italy_Vodaphone_Basic b/server/site_tests/android_ACTS/control.Telephony_Italy_Vodaphone_Basic
deleted file mode 100644
index b4f2396..0000000
--- a/server/site_tests/android_ACTS/control.Telephony_Italy_Vodaphone_Basic
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = 'bettyzhou, krisr'
-NAME = 'android_ACTS.Telephony_Italy_Vodaphone_Roaming_Basic'
-TIME = 'MEDIUM'
-TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:android_telephony_international_roaming'
-DEPENDENCIES = 'carrier:italy_vodaphone'
-
-DOC = """
-This test runs telephony sanity against phones with Italy Vodaphone SIMs roaming
-in US.
-"""
-
-def run(machine):
-    job.run_test('android_ACTS',
-                 testbed=hosts.create_testbed(machine),
-                 config_file='android1758-telephony-test-station.config',
-                 test_file='telephony_international_roaming',
-                 additional_configs=['simcard_list.json'],
-                 acts_timeout=18000)
-
-parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_MTV_ATT_Basic b/server/site_tests/android_ACTS/control.Telephony_MTV_ATT_Basic
index 97c67fd..72409ba 100644
--- a/server/site_tests/android_ACTS/control.Telephony_MTV_ATT_Basic
+++ b/server/site_tests/android_ACTS/control.Telephony_MTV_ATT_Basic
@@ -7,7 +7,7 @@
 TIME = 'LONG'
 TEST_TYPE = 'Server'
 ATTRIBUTES = 'suite:android_telephony_nightly'
-DEPENDENCIES = 'carrier:att'
+DEPENDENCIES = 'carrier:att,location:mtv'
 
 DOC = """
 This test runs telephony sanity against an phones with AT&T SIMs.
@@ -19,6 +19,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_att_basic',
                  additional_configs=['simcard_list.json'],
+                 testtracker_project_id=11349,
                  acts_timeout=18000)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_MTV_ATT_Long_Call b/server/site_tests/android_ACTS/control.Telephony_MTV_ATT_Long_Call
index 3b34562..d028452 100644
--- a/server/site_tests/android_ACTS/control.Telephony_MTV_ATT_Long_Call
+++ b/server/site_tests/android_ACTS/control.Telephony_MTV_ATT_Long_Call
@@ -7,7 +7,7 @@
 TIME = 'LONG'
 TEST_TYPE = 'Server'
 ATTRIBUTES = 'suite:android_telephony_longevity'
-DEPENDENCIES = 'carrier:att'
+DEPENDENCIES = 'carrier:att,location:mtv'
 
 DOC = """
 This test runs telephony long voice call test against phone with AT&T SIMs.
@@ -19,6 +19,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_long_voice_att',
                  additional_configs=['simcard_list.json'],
+                 testtracker_project_id=11349,
                  acts_timeout=36000)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_MTV_ATT_Longevity b/server/site_tests/android_ACTS/control.Telephony_MTV_ATT_Longevity
index e18e11b..8eb62b0 100644
--- a/server/site_tests/android_ACTS/control.Telephony_MTV_ATT_Longevity
+++ b/server/site_tests/android_ACTS/control.Telephony_MTV_ATT_Longevity
@@ -7,7 +7,7 @@
 TIME = 'LONG'
 TEST_TYPE = 'Server'
 ATTRIBUTES = 'suite:android_telephony_longevity'
-DEPENDENCIES = 'carrier:att'
+DEPENDENCIES = 'carrier:att,location:mtv'
 
 DOC = """
 This test runs telephony longevity test against an phones with AT&T SIMs.
@@ -19,6 +19,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_longevity',
                  additional_configs=['simcard_list.json'],
+                 testtracker_project_id=11349,
                  acts_timeout=36000)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_MTV_Australia_Telstra_Roaming b/server/site_tests/android_ACTS/control.Telephony_MTV_Australia_Telstra_Roaming
index cd0c6b8..35490ef 100644
--- a/server/site_tests/android_ACTS/control.Telephony_MTV_Australia_Telstra_Roaming
+++ b/server/site_tests/android_ACTS/control.Telephony_MTV_Australia_Telstra_Roaming
@@ -7,7 +7,7 @@
 TIME = 'MEDIUM'
 TEST_TYPE = 'Server'
 ATTRIBUTES = 'suite:android_telephony_international_roaming'
-DEPENDENCIES = 'carrier:australia_telstra'
+DEPENDENCIES = 'carrier:australia_telstra,location:mtv'
 
 DOC = """
 This test runs telephony sanity against phones with Australia Telstra SIMs
@@ -20,6 +20,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_international_roaming',
                  additional_configs=['simcard_list.json'],
-                 acts_timeout=18000)
+                 testtracker_project_id=11349,
+                 acts_timeout=36000)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_MTV_France_Lapuce_Roaming b/server/site_tests/android_ACTS/control.Telephony_MTV_France_Lapuce_Roaming
index bfde6df..596b0e3 100644
--- a/server/site_tests/android_ACTS/control.Telephony_MTV_France_Lapuce_Roaming
+++ b/server/site_tests/android_ACTS/control.Telephony_MTV_France_Lapuce_Roaming
@@ -7,7 +7,7 @@
 TIME = 'MEDIUM'
 TEST_TYPE = 'Server'
 ATTRIBUTES = 'suite:android_telephony_international_roaming'
-DEPENDENCIES = 'carrier:france_lapuce'
+DEPENDENCIES = 'carrier:france_lapuce,location:mtv'
 
 DOC = """
 This test runs telephony sanity against phones with France Lapuce SIMs roaming
@@ -20,6 +20,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_international_roaming',
                  additional_configs=['simcard_list.json'],
-                 acts_timeout=18000)
+                 testtracker_project_id=11349,
+                 acts_timeout=36000)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_MTV_Germany_Vodafone_Roaming b/server/site_tests/android_ACTS/control.Telephony_MTV_Germany_Vodafone_Roaming
index 83670f3..c4bc892 100644
--- a/server/site_tests/android_ACTS/control.Telephony_MTV_Germany_Vodafone_Roaming
+++ b/server/site_tests/android_ACTS/control.Telephony_MTV_Germany_Vodafone_Roaming
@@ -7,7 +7,7 @@
 TIME = 'MEDIUM'
 TEST_TYPE = 'Server'
 ATTRIBUTES = 'suite:android_telephony_international_roaming'
-DEPENDENCIES = 'carrier:germany_vodafone'
+DEPENDENCIES = 'carrier:germany_vodafone,location:mtv'
 
 DOC = """
 This test runs telephony sanity against phones with Germany Vodaphone SIMs
@@ -20,6 +20,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_international_roaming',
                  additional_configs=['simcard_list.json'],
-                 acts_timeout=18000)
+                 testtracker_project_id=11349,
+                 acts_timeout=36000)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_MTV_Italy_Vodafone_Roaming b/server/site_tests/android_ACTS/control.Telephony_MTV_Italy_Vodafone_Roaming
index 1490c20..9191e0b 100644
--- a/server/site_tests/android_ACTS/control.Telephony_MTV_Italy_Vodafone_Roaming
+++ b/server/site_tests/android_ACTS/control.Telephony_MTV_Italy_Vodafone_Roaming
@@ -7,7 +7,7 @@
 TIME = 'MEDIUM'
 TEST_TYPE = 'Server'
 ATTRIBUTES = 'suite:android_telephony_international_roaming'
-DEPENDENCIES = 'carrier:italy_vodafone'
+DEPENDENCIES = 'carrier:italy_vodafone,location:mtv'
 
 DOC = """
 This test runs telephony sanity against phones with Italy Vodaphone SIMs roaming
@@ -20,6 +20,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_international_roaming',
                  additional_configs=['simcard_list.json'],
-                 acts_timeout=18000)
+                 testtracker_project_id=11349,
+                 acts_timeout=36000)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_MTV_Norway_Telenor_Roaming b/server/site_tests/android_ACTS/control.Telephony_MTV_Norway_Telenor_Roaming
index 90a5c72..b0ce566 100644
--- a/server/site_tests/android_ACTS/control.Telephony_MTV_Norway_Telenor_Roaming
+++ b/server/site_tests/android_ACTS/control.Telephony_MTV_Norway_Telenor_Roaming
@@ -7,7 +7,7 @@
 TIME = 'MEDIUM'
 TEST_TYPE = 'Server'
 ATTRIBUTES = 'suite:android_telephony_international_roaming'
-DEPENDENCIES = 'carrier:norway_telenor'
+DEPENDENCIES = 'carrier:norway_telenor,location:mtv'
 
 DOC = """
 This test runs telephony sanity against phones with Norway Telenor SIMs roaming
@@ -20,6 +20,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_international_roaming',
                  additional_configs=['simcard_list.json'],
-                 acts_timeout=18000)
+                 testtracker_project_id=11349,
+                 acts_timeout=36000)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_MTV_SPT_Basic b/server/site_tests/android_ACTS/control.Telephony_MTV_SPT_Basic
index 3909bcb..71309b0 100644
--- a/server/site_tests/android_ACTS/control.Telephony_MTV_SPT_Basic
+++ b/server/site_tests/android_ACTS/control.Telephony_MTV_SPT_Basic
@@ -7,7 +7,7 @@
 TIME = 'LONG'
 TEST_TYPE = 'Server'
 ATTRIBUTES = 'suite:android_telephony_nightly'
-DEPENDENCIES = 'carrier:sprint'
+DEPENDENCIES = 'carrier:sprint,location:mtv'
 
 DOC = """
 This test runs telephony sanity against an phones with Sprint SIMs.
@@ -19,6 +19,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_spt_basic',
                  additional_configs=['simcard_list.json'],
-                 acts_timeout=18000)
+                 testtracker_project_id=11349,
+                 acts_timeout=36000)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_MTV_SPT_Long_Call b/server/site_tests/android_ACTS/control.Telephony_MTV_SPT_Long_Call
index ff53308..87c4e42 100644
--- a/server/site_tests/android_ACTS/control.Telephony_MTV_SPT_Long_Call
+++ b/server/site_tests/android_ACTS/control.Telephony_MTV_SPT_Long_Call
@@ -7,7 +7,7 @@
 TIME = 'LONG'
 TEST_TYPE = 'Server'
 ATTRIBUTES = 'suite:android_telephony_longevity'
-DEPENDENCIES = 'carrier:sprint'
+DEPENDENCIES = 'carrier:sprint,location:mtv'
 
 DOC = """
 This test runs telephony long voice call test against phone with Sprint SIMs.
@@ -19,6 +19,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_long_voice_spt',
                  additional_configs=['simcard_list.json'],
+                 testtracker_project_id=11349,
                  acts_timeout=36000)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_MTV_SPT_Longevity b/server/site_tests/android_ACTS/control.Telephony_MTV_SPT_Longevity
index 8110bb2..598ddb1 100644
--- a/server/site_tests/android_ACTS/control.Telephony_MTV_SPT_Longevity
+++ b/server/site_tests/android_ACTS/control.Telephony_MTV_SPT_Longevity
@@ -7,7 +7,7 @@
 TIME = 'LONG'
 TEST_TYPE = 'Server'
 ATTRIBUTES = 'suite:android_telephony_longevity'
-DEPENDENCIES = 'carrier:sprint'
+DEPENDENCIES = 'carrier:sprint,location:mtv'
 
 DOC = """
 This test runs telephony longevity test against an phones with Sprint SIMs.
@@ -19,6 +19,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_longevity',
                  additional_configs=['simcard_list.json'],
+                 testtracker_project_id=11349,
                  acts_timeout=36000)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_MTV_Spain_Vodafone_Roaming b/server/site_tests/android_ACTS/control.Telephony_MTV_Spain_Vodafone_Roaming
index 7981d50..869c36c 100644
--- a/server/site_tests/android_ACTS/control.Telephony_MTV_Spain_Vodafone_Roaming
+++ b/server/site_tests/android_ACTS/control.Telephony_MTV_Spain_Vodafone_Roaming
@@ -7,7 +7,7 @@
 TIME = 'MEDIUM'
 TEST_TYPE = 'Server'
 ATTRIBUTES = 'suite:android_telephony_international_roaming'
-DEPENDENCIES = 'carrier:spain_vodafone'
+DEPENDENCIES = 'carrier:spain_vodafone,location:mtv'
 
 DOC = """
 This test runs telephony sanity against phones with Spain Vodafone SIMs roaming
@@ -20,6 +20,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_international_roaming',
                  additional_configs=['simcard_list.json'],
-                 acts_timeout=18000)
+                 testtracker_project_id=11349,
+                 acts_timeout=36000)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_Basic b/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_Basic
index 84a97c8..76e1255 100644
--- a/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_Basic
+++ b/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_Basic
@@ -7,7 +7,7 @@
 TIME = 'LONG'
 TEST_TYPE = 'Server'
 ATTRIBUTES = 'suite:android_telephony_nightly'
-DEPENDENCIES = 'carrier:tmobile'
+DEPENDENCIES = 'carrier:tmobile,location:mtv'
 
 DOC = """
 This test runs telephony sanity against an phones with T-Mobile SIMs.
@@ -19,6 +19,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_tmo_basic',
                  additional_configs=['simcard_list.json'],
-                 acts_timeout=25200)
+                 testtracker_project_id=11349,
+                 acts_timeout=36000)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_Conf_CEP b/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_Conf_CEP
index 3da2c54..f7e1b56 100644
--- a/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_Conf_CEP
+++ b/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_Conf_CEP
@@ -7,7 +7,7 @@
 TIME = 'LONG'
 TEST_TYPE = 'Server'
 ATTRIBUTES = 'suite:android_telephony_nightly'
-DEPENDENCIES = 'carrier:tmobile,telephony:conf'
+DEPENDENCIES = 'carrier:tmobile,telephony:conf,location:mtv'
 
 DOC = """
 This test runs telephony sanity against an phones with T-Mobile SIMs.
@@ -19,6 +19,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_tmo_conf_cep',
                  additional_configs=['simcard_list.json'],
-                 acts_timeout=18000)
+                 testtracker_project_id=11349,
+                 acts_timeout=36000)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_Conf_NoCEP b/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_Conf_NoCEP
index cd39a61..e14a797 100644
--- a/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_Conf_NoCEP
+++ b/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_Conf_NoCEP
@@ -7,7 +7,7 @@
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
 ATTRIBUTES = 'suite:android_telephony_nightly'
-DEPENDENCIES = 'carrier:tmobile,telephony:cep'
+DEPENDENCIES = 'carrier:tmobile,telephony:cep,location:mtv'
 
 DOC = """
 This test runs telephony sanity against an phones with T-Mobile SIMs.
diff --git a/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_Data b/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_Data
index ad1296f..cb6e419 100644
--- a/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_Data
+++ b/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_Data
@@ -19,6 +19,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_tmo_data',
                  additional_configs=['simcard_list.json'],
-                 acts_timeout=25200)
+                 testtracker_project_id=11349,
+                 acts_timeout=36000)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_Long_Call b/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_Long_Call
index df89d97..8eaebcb 100644
--- a/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_Long_Call
+++ b/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_Long_Call
@@ -19,6 +19,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_long_voice_tmo',
                  additional_configs=['simcard_list.json'],
+                 testtracker_project_id=11349,
                  acts_timeout=36000)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_Longevity b/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_Longevity
index 55418d3..c6b37fc 100644
--- a/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_Longevity
+++ b/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_Longevity
@@ -19,6 +19,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_longevity',
                  additional_configs=['simcard_list.json'],
+                 testtracker_project_id=11349,
                  acts_timeout=36000)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_VT b/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_VT
index efe75d5..a58970b 100644
--- a/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_VT
+++ b/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_VT
@@ -18,6 +18,8 @@
                  testbed=hosts.create_testbed(machine),
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_tmo_vt',
-                 additional_configs=['simcard_list.json'])
+                 additional_configs=['simcard_list.json'],
+                 testtracker_project_id=11349,
+                 acts_timeout=36000)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_WFC b/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_WFC
index 055b924..5795219 100644
--- a/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_WFC
+++ b/server/site_tests/android_ACTS/control.Telephony_MTV_TMO_WFC
@@ -19,6 +19,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_tmo_wfc',
                  additional_configs=['simcard_list.json'],
-                 acts_timeout=25200)
+                 testtracker_project_id=11349,
+                 acts_timeout=36000)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_Basic b/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_Basic
index aeb214d..3e908f3 100644
--- a/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_Basic
+++ b/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_Basic
@@ -19,6 +19,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_vzw_basic',
                  additional_configs=['simcard_list.json'],
-                 acts_timeout=25200)
+                 testtracker_project_id=11349,
+                 acts_timeout=36000)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_Conf b/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_Conf
index 5ef60e9..6716500 100644
--- a/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_Conf
+++ b/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_Conf
@@ -19,6 +19,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_vzw_conf',
                  additional_configs=['simcard_list.json'],
-                 acts_timeout=25200)
+                 testtracker_project_id=11349,
+                 acts_timeout=36000)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_Conf_CEP b/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_Conf_CEP
index bf143b0..01c2d95 100644
--- a/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_Conf_CEP
+++ b/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_Conf_CEP
@@ -19,6 +19,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_vzw_conf_cep',
                  additional_configs=['simcard_list.json'],
-                 acts_timeout=18000)
+                 testtracker_project_id=11349,
+                 acts_timeout=36000)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_Conf_NoCEP b/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_Conf_NoCEP
index e2d064b..6a9b635 100644
--- a/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_Conf_NoCEP
+++ b/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_Conf_NoCEP
@@ -18,6 +18,8 @@
                  testbed=hosts.create_testbed(machine),
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_vzw_conf_nocep',
-                 additional_configs=['simcard_list.json'])
+                 additional_configs=['simcard_list.json'],
+                 testtracker_project_id=11349,
+                 acts_timeout=36000)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_Data b/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_Data
index 2fb3195..6d0551d 100644
--- a/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_Data
+++ b/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_Data
@@ -7,7 +7,7 @@
 TIME = 'MEDIUM'
 TEST_TYPE = 'Server'
 ATTRIBUTES = 'suite:android_telephony_nightly'
-DEPENDENCIES = 'carrier:verizon,telephony:data'
+DEPENDENCIES = 'carrier:verizon,telephony:data,location:mtv'
 
 DOC = """
 This test runs telephony data tests against devices with Verizon SIMs.
@@ -19,6 +19,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_vzw_data',
                  additional_configs=['simcard_list.json'],
-                 acts_timeout=25200)
+                 testtracker_project_id=11349,
+                 acts_timeout=36000)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_Long_Call b/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_Long_Call
index a3e5372..fce5b9a 100644
--- a/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_Long_Call
+++ b/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_Long_Call
@@ -7,7 +7,7 @@
 TIME = 'LONG'
 TEST_TYPE = 'Server'
 ATTRIBUTES = 'suite:android_telephony_longevity'
-DEPENDENCIES = 'carrier:verizon'
+DEPENDENCIES = 'carrier:verizon,location:mtv'
 
 DOC = """
 This test runs telephony long voice call test against phone with Verizon SIMs.
@@ -19,6 +19,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_long_voice_vzw',
                  additional_configs=['simcard_list.json'],
+                 testtracker_project_id=11349,
                  acts_timeout=36000)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_Longevity b/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_Longevity
index d66b579..f0c67ac 100644
--- a/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_Longevity
+++ b/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_Longevity
@@ -7,7 +7,7 @@
 TIME = 'LONG'
 TEST_TYPE = 'Server'
 ATTRIBUTES = 'suite:android_telephony_longevity'
-DEPENDENCIES = 'carrier:verizon'
+DEPENDENCIES = 'carrier:verizon,location:mtv'
 
 DOC = """
 This test runs telephony longevity test against an phones with Verizon SIMs.
diff --git a/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_VT b/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_VT
index fe34846..9b6f758 100644
--- a/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_VT
+++ b/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_VT
@@ -7,7 +7,7 @@
 TIME = 'LONG'
 TEST_TYPE = 'Server'
 ATTRIBUTES = 'suite:android_telephony_nightly'
-DEPENDENCIES = 'carrier:verizon,telephony:vt'
+DEPENDENCIES = 'carrier:verizon,telephony:vt,location:mtv'
 
 DOC = """
 This test runs telephony sanity against an phones with Verizon SIMs.
@@ -19,6 +19,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_vzw_vt',
                  additional_configs=['simcard_list.json'],
+                 testtracker_project_id=11349,
                  acts_timeout=18000)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_WFC b/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_WFC
index a7bdfe8..4662ef0 100644
--- a/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_WFC
+++ b/server/site_tests/android_ACTS/control.Telephony_MTV_VZW_WFC
@@ -7,7 +7,7 @@
 TIME = 'LONG'
 TEST_TYPE = 'Server'
 ATTRIBUTES = 'suite:android_telephony_nightly'
-DEPENDENCIES = 'carrier:verizon,telephony:wfc'
+DEPENDENCIES = 'carrier:verizon,telephony:wfc,location:mtv'
 
 DOC = """
 This test runs telephony sanity against an phones with Verizon SIMs.
@@ -19,6 +19,7 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_vzw_wfc',
                  additional_configs=['simcard_list.json'],
+                 testtracker_project_id=11349,
                  acts_timeout=18000)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_Norway_Telenor_Basic b/server/site_tests/android_ACTS/control.Telephony_Norway_Telenor_Basic
deleted file mode 100644
index 12f18e4..0000000
--- a/server/site_tests/android_ACTS/control.Telephony_Norway_Telenor_Basic
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = 'bettyzhou, krisr'
-NAME = 'android_ACTS.Telephony_Norway_Telenor_Roaming_Basic'
-TIME = 'MEDIUM'
-TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:android_telephony_international_roaming'
-DEPENDENCIES = 'carrier:norway_telenor'
-
-DOC = """
-This test runs telephony sanity against phones with Norway Telenor SIMs roaming
-in US.
-"""
-
-def run(machine):
-    job.run_test('android_ACTS',
-                 testbed=hosts.create_testbed(machine),
-                 config_file='android1758-telephony-test-station.config',
-                 test_file='telephony_international_roaming',
-                 additional_configs=['simcard_list.json'],
-                 acts_timeout=18000)
-
-parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_SPT_Basic b/server/site_tests/android_ACTS/control.Telephony_SPT_Basic
deleted file mode 100644
index 55b065c..0000000
--- a/server/site_tests/android_ACTS/control.Telephony_SPT_Basic
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = 'bettyzhou, krisr'
-NAME = 'android_ACTS.Telephony_SPT_Basic'
-TIME = 'LONG'
-TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:android_telephony_nexus_spt,'
-              'suite:android_telephony_nightly_spt')
-DEPENDENCIES = 'carrier:sprint'
-
-DOC = """
-This test runs telephony sanity against an phones with Sprint SIMs.
-"""
-
-def run(machine):
-    job.run_test('android_ACTS',
-                 testbed=hosts.create_testbed(machine),
-                 config_file='android1758-telephony-test-station.config',
-                 test_file='telephony_spt_basic',
-                 additional_configs=['simcard_list.json'],
-                 acts_timeout=18000)
-
-parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_SPT_Long_Call b/server/site_tests/android_ACTS/control.Telephony_SPT_Long_Call
deleted file mode 100644
index feaa931..0000000
--- a/server/site_tests/android_ACTS/control.Telephony_SPT_Long_Call
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = 'bettyzhou, krisr'
-NAME = 'android_ACTS.Telephony_SPT_Long_Voice'
-TIME = 'LONG'
-TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:android_telephony_nightly_spt'
-DEPENDENCIES = 'carrier:sprint'
-
-DOC = """
-This test runs telephony long voice call test against phone with Sprint SIMs.
-"""
-
-def run(machine):
-    job.run_test('android_ACTS',
-                 testbed=hosts.create_testbed(machine),
-                 config_file='android1758-telephony-test-station.config',
-                 test_file='telephony_long_voice_spt',
-                 additional_configs=['simcard_list.json'],
-                 acts_timeout=36000)
-
-parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_SPT_Longevity b/server/site_tests/android_ACTS/control.Telephony_SPT_Longevity
deleted file mode 100644
index cdb0efd..0000000
--- a/server/site_tests/android_ACTS/control.Telephony_SPT_Longevity
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = 'bettyzhou, krisr'
-NAME = 'android_ACTS.Telephony_SPT_Longevity'
-TIME = 'LONG'
-TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:android_telephony_longevity'
-DEPENDENCIES = 'carrier:sprint'
-
-DOC = """
-This test runs telephony longevity test against an phones with Sprint SIMs.
-"""
-
-def run(machine):
-    job.run_test('android_ACTS',
-                 testbed=hosts.create_testbed(machine),
-                 config_file='android1758-telephony-test-station.config',
-                 test_file='telephony_longevity',
-                 additional_configs=['simcard_list.json'],
-                 acts_timeout=36000)
-
-parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_Spain_Vodaphone_Basic b/server/site_tests/android_ACTS/control.Telephony_Spain_Vodaphone_Basic
deleted file mode 100644
index 2f349d5..0000000
--- a/server/site_tests/android_ACTS/control.Telephony_Spain_Vodaphone_Basic
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = 'bettyzhou, krisr'
-NAME = 'android_ACTS.Telephony_Spain_Vodaphone_Roaming_Basic'
-TIME = 'MEDIUM'
-TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:android_telephony_international_roaming'
-DEPENDENCIES = 'carrier:spain_vodaphone'
-
-DOC = """
-This test runs telephony sanity against phones with Spain Vodaphone SIMs roaming
-in US.
-"""
-
-def run(machine):
-    job.run_test('android_ACTS',
-                 testbed=hosts.create_testbed(machine),
-                 config_file='android1758-telephony-test-station.config',
-                 test_file='telephony_international_roaming',
-                 additional_configs=['simcard_list.json'],
-                 acts_timeout=18000)
-
-parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_TMO_Basic b/server/site_tests/android_ACTS/control.Telephony_TMO_Basic
deleted file mode 100644
index 6ffbbbd..0000000
--- a/server/site_tests/android_ACTS/control.Telephony_TMO_Basic
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = 'bettyzhou, krisr'
-NAME = 'android_ACTS.Telephony_TMO_Basic'
-TIME = 'LONG'
-TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:android_telephony_nightly_tmo'
-DEPENDENCIES = 'carrier:tmobile'
-
-DOC = """
-This test runs telephony sanity against an phones with T-Mobile SIMs.
-"""
-
-def run(machine):
-    job.run_test('android_ACTS',
-                 testbed=hosts.create_testbed(machine),
-                 config_file='android1758-telephony-test-station.config',
-                 test_file='telephony_tmo_basic',
-                 additional_configs=['simcard_list.json'],
-                 acts_timeout=25200)
-
-parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_TMO_Conf_CEP b/server/site_tests/android_ACTS/control.Telephony_TMO_Conf_CEP
deleted file mode 100644
index 8f2109d..0000000
--- a/server/site_tests/android_ACTS/control.Telephony_TMO_Conf_CEP
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = 'bettyzhou, krisr'
-NAME = 'android_ACTS.Telephony_TMO_Conf_CEP'
-TIME = 'LONG'
-TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:android_telephony_nightly_tmo'
-DEPENDENCIES = 'carrier:tmobile,telephony:conf'
-
-DOC = """
-This test runs telephony sanity against an phones with T-Mobile SIMs.
-"""
-
-def run(machine):
-    job.run_test('android_ACTS',
-                 testbed=hosts.create_testbed(machine),
-                 config_file='android1758-telephony-test-station.config',
-                 test_file='telephony_tmo_conf_cep',
-                 additional_configs=['simcard_list.json'],
-                 acts_timeout=18000)
-
-parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_TMO_Conf_NoCEP b/server/site_tests/android_ACTS/control.Telephony_TMO_Conf_NoCEP
deleted file mode 100644
index 71d15ec..0000000
--- a/server/site_tests/android_ACTS/control.Telephony_TMO_Conf_NoCEP
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = 'bettyzhou, krisr'
-NAME = 'android_ACTS.Telephony_TMO_Conf_NoCEP'
-TIME = 'SHORT'
-TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:android_telephony_nightly_tmo'
-DEPENDENCIES = 'carrier:tmobile,telephony:cep'
-
-DOC = """
-This test runs telephony sanity against an phones with T-Mobile SIMs.
-"""
-
-def run(machine):
-    job.run_test('android_ACTS',
-                 testbed=hosts.create_testbed(machine),
-                 config_file='android1758-telephony-test-station.config',
-                 test_file='telephony_tmo_conf_nocep',
-                 additional_configs=['simcard_list.json'])
-
-parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_TMO_Data b/server/site_tests/android_ACTS/control.Telephony_TMO_Data
deleted file mode 100644
index 12e24e0..0000000
--- a/server/site_tests/android_ACTS/control.Telephony_TMO_Data
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = 'bettyzhou, krisr'
-NAME = 'android_ACTS.Telephony_TMO_Data'
-TIME = 'MEDIUM'
-TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:android_telephony_nightly_tmo'
-DEPENDENCIES = 'carrier:tmobile,telephony:data'
-
-DOC = """
-This test runs telephony data tests against devices with T-Mobile SIMs.
-"""
-
-def run(machine):
-    job.run_test('android_ACTS',
-                 testbed=hosts.create_testbed(machine),
-                 config_file='android1758-telephony-test-station.config',
-                 test_file='telephony_tmo_data',
-                 additional_configs=['simcard_list.json'],
-                 acts_timeout=25200)
-
-parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_TMO_Long_Call b/server/site_tests/android_ACTS/control.Telephony_TMO_Long_Call
deleted file mode 100644
index dd9bf4c..0000000
--- a/server/site_tests/android_ACTS/control.Telephony_TMO_Long_Call
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = 'bettyzhou, krisr'
-NAME = 'android_ACTS.Telephony_TMO_Long_Voice'
-TIME = 'LONG'
-TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:android_telephony_nightly_tmo'
-DEPENDENCIES = 'carrier:tmobile'
-
-DOC = """
-This test runs telephony long voice call test against phone with T-mobile SIMs.
-"""
-
-def run(machine):
-    job.run_test('android_ACTS',
-                 testbed=hosts.create_testbed(machine),
-                 config_file='android1758-telephony-test-station.config',
-                 test_file='telephony_long_voice_tmo',
-                 additional_configs=['simcard_list.json'],
-                 acts_timeout=36000)
-
-parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_TMO_Longevity b/server/site_tests/android_ACTS/control.Telephony_TMO_Longevity
deleted file mode 100644
index 55418d3..0000000
--- a/server/site_tests/android_ACTS/control.Telephony_TMO_Longevity
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = 'bettyzhou, krisr'
-NAME = 'android_ACTS.Telephony_TMO_Longevity'
-TIME = 'LONG'
-TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:android_telephony_longevity'
-DEPENDENCIES = 'carrier:tmobile'
-
-DOC = """
-This test runs telephony longevity test against an phones with T-mobile SIMs.
-"""
-
-def run(machine):
-    job.run_test('android_ACTS',
-                 testbed=hosts.create_testbed(machine),
-                 config_file='android1758-telephony-test-station.config',
-                 test_file='telephony_longevity',
-                 additional_configs=['simcard_list.json'],
-                 acts_timeout=36000)
-
-parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_TMO_Nexus b/server/site_tests/android_ACTS/control.Telephony_TMO_Nexus
index 3361a5c..bbf64ea 100644
--- a/server/site_tests/android_ACTS/control.Telephony_TMO_Nexus
+++ b/server/site_tests/android_ACTS/control.Telephony_TMO_Nexus
@@ -1,16 +1,16 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
+# Copyright 2017 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = 'angli, krisr'
+AUTHOR = 'bettyzhou, jaineelm, krisr'
 NAME = 'android_ACTS.Telephony_TMO_Nexus'
 TIME = 'LONG'
 TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:android_telephony_nexus_tmo'
+ATTRIBUTES = 'suite:android_telephony_nexus'
 DEPENDENCIES = 'carrier:tmobile'
 
 DOC = """
-This test runs telephony Nexus sanity against phones with T-Mobile SIMs.
+This test runs telephony Nexus sanity against phones with Verizon SIMs.
 """
 
 def run(machine):
diff --git a/server/site_tests/android_ACTS/control.Telephony_TMO_VT b/server/site_tests/android_ACTS/control.Telephony_TMO_VT
deleted file mode 100644
index f45c673..0000000
--- a/server/site_tests/android_ACTS/control.Telephony_TMO_VT
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = 'angli, krisr'
-NAME = 'android_ACTS.Telephony_TMO_VT'
-TIME = 'MEDIUM'
-TEST_TYPE = 'Server'
-
-DOC = """
-This test runs telephony sanity against an phones with T-Mobile SIMs.
-"""
-
-def run(machine):
-    job.run_test('android_ACTS',
-                 testbed=hosts.create_testbed(machine),
-                 config_file='android1758-telephony-test-station.config',
-                 test_file='telephony_tmo_vt',
-                 additional_configs=['simcard_list.json'])
-
-parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_TMO_WFC b/server/site_tests/android_ACTS/control.Telephony_TMO_WFC
deleted file mode 100644
index 116b34d..0000000
--- a/server/site_tests/android_ACTS/control.Telephony_TMO_WFC
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = 'bettyzhou, krisr'
-NAME = 'android_ACTS.Telephony_TMO_WFC'
-TIME = 'LONG'
-TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:android_telephony_nightly_tmo'
-DEPENDENCIES = 'carrier:tmobile'
-
-DOC = """
-This test runs telephony wifi-calling sanity against an phones with T-Mobile SIMs.
-"""
-
-def run(machine):
-    job.run_test('android_ACTS',
-                 testbed=hosts.create_testbed(machine),
-                 config_file='android1758-telephony-test-station.config',
-                 test_file='telephony_tmo_wfc',
-                 additional_configs=['simcard_list.json'],
-                 acts_timeout=25200)
-
-parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_VZW_Nexus b/server/site_tests/android_ACTS/control.Telephony_VZW_Nexus
index a5dd4b0..1c16c7e 100644
--- a/server/site_tests/android_ACTS/control.Telephony_VZW_Nexus
+++ b/server/site_tests/android_ACTS/control.Telephony_VZW_Nexus
@@ -1,12 +1,12 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
+# Copyright 2017 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-AUTHOR = 'angli, krisr'
+AUTHOR = 'bettyzhou, jaineelm, krisr'
 NAME = 'android_ACTS.Telephony_VZW_Nexus'
 TIME = 'LONG'
 TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:android_telephony_nexus_vzw'
+ATTRIBUTES = 'suite:android_telephony_nexus'
 DEPENDENCIES = 'carrier:verizon'
 
 DOC = """