diff --git a/server/site_tests/cheets_GTS/cheets_GTS.py b/server/site_tests/cheets_GTS/cheets_GTS.py
index f644b91..c9b96d3 100644
--- a/server/site_tests/cheets_GTS/cheets_GTS.py
+++ b/server/site_tests/cheets_GTS/cheets_GTS.py
@@ -18,7 +18,7 @@
 from autotest_lib.server import utils
 from autotest_lib.server.cros import tradefed_test
 
-_PARTNER_GTS_LOCATION = 'gs://chromeos-partner-gts/gts-5.0_r2-4389763.zip'
+_PARTNER_GTS_LOCATION = 'gs://chromeos-partner-gts/gts-5.1_r2-4507047.zip'
 
 
 class cheets_GTS(tradefed_test.TradefedTest):
diff --git a/server/site_tests/cheets_GTS/control.GtsAccountsHostTestCases b/server/site_tests/cheets_GTS/control.GtsAccountsHostTestCases
index 12c6d1e..8d0563c 100644
--- a/server/site_tests/cheets_GTS/control.GtsAccountsHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsAccountsHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsAccountsHostTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsAccountsHostTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsAdminTestCases b/server/site_tests/cheets_GTS/control.GtsAdminTestCases
index 8addb8d..e1cee76 100644
--- a/server/site_tests/cheets_GTS/control.GtsAdminTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsAdminTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsAdminTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -27,4 +27,4 @@
         target_package='GtsAdminTestCases',
         timeout=360)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsAfwTestCases b/server/site_tests/cheets_GTS/control.GtsAfwTestCases
index bf2135d..52102cc 100644
--- a/server/site_tests/cheets_GTS/control.GtsAfwTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsAfwTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsAfwTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsAfwTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsAppBlacklistDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsAppBlacklistDeviceTestCases
index 9a0437a..b69dd61 100644
--- a/server/site_tests/cheets_GTS/control.GtsAppBlacklistDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsAppBlacklistDeviceTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsAppBlacklistDeviceTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsAppBlacklistDeviceTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsArTestCases b/server/site_tests/cheets_GTS/control.GtsArTestCases
index 6024f16..804d7cb 100644
--- a/server/site_tests/cheets_GTS/control.GtsArTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsArTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsArTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsArTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsBackupHostTestCases b/server/site_tests/cheets_GTS/control.GtsBackupHostTestCases
index 9edb9d2..2f90bc8 100644
--- a/server/site_tests/cheets_GTS/control.GtsBackupHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsBackupHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsBackupHostTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsBackupHostTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsBackupTestCases b/server/site_tests/cheets_GTS/control.GtsBackupTestCases
index 2e01120..b541646 100644
--- a/server/site_tests/cheets_GTS/control.GtsBackupTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsBackupTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsBackupTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsBackupTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsCallLogTestCases b/server/site_tests/cheets_GTS/control.GtsCallLogTestCases
index f4f8c70..b11a0da 100644
--- a/server/site_tests/cheets_GTS/control.GtsCallLogTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsCallLogTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsCallLogTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsCallLogTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsCastHostTestCases b/server/site_tests/cheets_GTS/control.GtsCastHostTestCases
index e0dd450..17d2e37 100644
--- a/server/site_tests/cheets_GTS/control.GtsCastHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsCastHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsCastHostTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsCastHostTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsDexModuleRegistrationTestCases b/server/site_tests/cheets_GTS/control.GtsDexModuleRegistrationTestCases
index 3bcc629..0cb5dc4 100644
--- a/server/site_tests/cheets_GTS/control.GtsDexModuleRegistrationTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsDexModuleRegistrationTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsDexModuleRegistrationTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsDexModuleRegistrationTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsDozeDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsDozeDeviceTestCases
index 2aa1da7..a646619 100644
--- a/server/site_tests/cheets_GTS/control.GtsDozeDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsDozeDeviceTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsDozeDeviceTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsDozeDeviceTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsEdiHostTestCases b/server/site_tests/cheets_GTS/control.GtsEdiHostTestCases
index a967d29..27470ed 100644
--- a/server/site_tests/cheets_GTS/control.GtsEdiHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsEdiHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsEdiHostTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsEdiHostTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsExoPlayerTestCases b/server/site_tests/cheets_GTS/control.GtsExoPlayerTestCases
index 19df8e1..b60a1be 100644
--- a/server/site_tests/cheets_GTS/control.GtsExoPlayerTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsExoPlayerTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsExoPlayerTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsExoPlayerTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsExternalSourcesNegativeTestCases b/server/site_tests/cheets_GTS/control.GtsExternalSourcesNegativeTestCases
index 676dc51..9c25ab2 100644
--- a/server/site_tests/cheets_GTS/control.GtsExternalSourcesNegativeTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsExternalSourcesNegativeTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsExternalSourcesNegativeTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsExternalSourcesNegativeTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsExternalSourcesTestCases b/server/site_tests/cheets_GTS/control.GtsExternalSourcesTestCases
index 8c7456b..448719b 100644
--- a/server/site_tests/cheets_GTS/control.GtsExternalSourcesTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsExternalSourcesTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsExternalSourcesTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsExternalSourcesTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsFeaturesTestCases b/server/site_tests/cheets_GTS/control.GtsFeaturesTestCases
index cd818c4..586bf22 100644
--- a/server/site_tests/cheets_GTS/control.GtsFeaturesTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsFeaturesTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsFeaturesTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsFeaturesTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsGmscoreHostTestCases b/server/site_tests/cheets_GTS/control.GtsGmscoreHostTestCases
index 5128c5b..02fc0b9c 100644
--- a/server/site_tests/cheets_GTS/control.GtsGmscoreHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsGmscoreHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsGmscoreHostTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsGmscoreHostTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsHomeHostTestCases b/server/site_tests/cheets_GTS/control.GtsHomeHostTestCases
index fe5b069..603651e 100644
--- a/server/site_tests/cheets_GTS/control.GtsHomeHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsHomeHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsHomeHostTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsHomeHostTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsInstallPackagesWhitelistDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsInstallPackagesWhitelistDeviceTestCases
index 1f90a92..9363c6b 100644
--- a/server/site_tests/cheets_GTS/control.GtsInstallPackagesWhitelistDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsInstallPackagesWhitelistDeviceTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsInstallPackagesWhitelistDeviceTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsInstallPackagesWhitelistDeviceTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsInstantAppsHostTestCases b/server/site_tests/cheets_GTS/control.GtsInstantAppsHostTestCases
new file mode 100644
index 0000000..4203699
--- /dev/null
+++ b/server/site_tests/cheets_GTS/control.GtsInstantAppsHostTestCases
@@ -0,0 +1,30 @@
+# 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.
+
+# This file has been automatically generated. Do not edit!
+
+AUTHOR = 'ARC++ Team'
+NAME = 'cheets_GTS.GtsInstantAppsHostTestCases'
+ATTRIBUTES = 'suite:gts'
+DEPENDENCIES = 'arc'
+JOB_RETRIES = 2
+TEST_TYPE = 'server'
+TIME = 'LENGTHY'
+
+DOC = ('Run package GtsInstantAppsHostTestCases of the '
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
+       'in the ARC++ container.')
+
+def run_GTS(machine):
+    host = hosts.create_host(machine)
+    job.run_test(
+        'cheets_GTS',
+        host=host,
+        iterations=1,
+        tag='GtsInstantAppsHostTestCases',
+        target_package='GtsInstantAppsHostTestCases',
+
+        timeout=3600)
+
+parallel_simple(run_GTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_GTS/control.GtsLargeApkHostTestCases b/server/site_tests/cheets_GTS/control.GtsLargeApkHostTestCases
index 5e99a49..92d2dbe 100644
--- a/server/site_tests/cheets_GTS/control.GtsLargeApkHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsLargeApkHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsLargeApkHostTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsLargeApkHostTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsLauncherHostTestCases b/server/site_tests/cheets_GTS/control.GtsLauncherHostTestCases
index e5f01e5..b845839 100644
--- a/server/site_tests/cheets_GTS/control.GtsLauncherHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsLauncherHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsLauncherHostTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsLauncherHostTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsLocationHostTestCases b/server/site_tests/cheets_GTS/control.GtsLocationHostTestCases
index 45c662a..b70d524 100644
--- a/server/site_tests/cheets_GTS/control.GtsLocationHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsLocationHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsLocationHostTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsLocationHostTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsLocationTestCases b/server/site_tests/cheets_GTS/control.GtsLocationTestCases
index e60d9b9..64df963 100644
--- a/server/site_tests/cheets_GTS/control.GtsLocationTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsLocationTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsLocationTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsLocationTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsMediaTestCases b/server/site_tests/cheets_GTS/control.GtsMediaTestCases
index 77fda0b..010491c 100644
--- a/server/site_tests/cheets_GTS/control.GtsMediaTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsMediaTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsMediaTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsMediaTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsMemoryHostTestCases b/server/site_tests/cheets_GTS/control.GtsMemoryHostTestCases
new file mode 100644
index 0000000..9400895
--- /dev/null
+++ b/server/site_tests/cheets_GTS/control.GtsMemoryHostTestCases
@@ -0,0 +1,30 @@
+# 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.
+
+# This file has been automatically generated. Do not edit!
+
+AUTHOR = 'ARC++ Team'
+NAME = 'cheets_GTS.GtsMemoryHostTestCases'
+ATTRIBUTES = 'suite:gts'
+DEPENDENCIES = 'arc'
+JOB_RETRIES = 2
+TEST_TYPE = 'server'
+TIME = 'LENGTHY'
+
+DOC = ('Run package GtsMemoryHostTestCases of the '
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
+       'in the ARC++ container.')
+
+def run_GTS(machine):
+    host = hosts.create_host(machine)
+    job.run_test(
+        'cheets_GTS',
+        host=host,
+        iterations=1,
+        tag='GtsMemoryHostTestCases',
+        target_package='GtsMemoryHostTestCases',
+
+        timeout=3600)
+
+parallel_simple(run_GTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_GTS/control.GtsMemoryTestCases b/server/site_tests/cheets_GTS/control.GtsMemoryTestCases
new file mode 100644
index 0000000..f7b8d40
--- /dev/null
+++ b/server/site_tests/cheets_GTS/control.GtsMemoryTestCases
@@ -0,0 +1,30 @@
+# 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.
+
+# This file has been automatically generated. Do not edit!
+
+AUTHOR = 'ARC++ Team'
+NAME = 'cheets_GTS.GtsMemoryTestCases'
+ATTRIBUTES = 'suite:gts'
+DEPENDENCIES = 'arc'
+JOB_RETRIES = 2
+TEST_TYPE = 'server'
+TIME = 'LENGTHY'
+
+DOC = ('Run package GtsMemoryTestCases of the '
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
+       'in the ARC++ container.')
+
+def run_GTS(machine):
+    host = hosts.create_host(machine)
+    job.run_test(
+        'cheets_GTS',
+        host=host,
+        iterations=1,
+        tag='GtsMemoryTestCases',
+        target_package='GtsMemoryTestCases',
+
+        timeout=3600)
+
+parallel_simple(run_GTS, machines)
\ No newline at end of file
diff --git a/server/site_tests/cheets_GTS/control.GtsNetTestCases b/server/site_tests/cheets_GTS/control.GtsNetTestCases
index beea6ab..cc7043f 100644
--- a/server/site_tests/cheets_GTS/control.GtsNetTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsNetTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsNetTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -27,4 +27,4 @@
         target_package='GtsNetTestCases',
         timeout=360)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsNmgiarcTestCases b/server/site_tests/cheets_GTS/control.GtsNmgiarcTestCases
index ffc6d4b..e625f8b 100644
--- a/server/site_tests/cheets_GTS/control.GtsNmgiarcTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsNmgiarcTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsNmgiarcTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsNmgiarcTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsNotificationTvExtenderTestCases b/server/site_tests/cheets_GTS/control.GtsNotificationTvExtenderTestCases
index 415ab82..125a2d9 100644
--- a/server/site_tests/cheets_GTS/control.GtsNotificationTvExtenderTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsNotificationTvExtenderTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsNotificationTvExtenderTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsNotificationTvExtenderTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsOemLockServiceTestCases b/server/site_tests/cheets_GTS/control.GtsOemLockServiceTestCases
index 557621c..647be05 100644
--- a/server/site_tests/cheets_GTS/control.GtsOemLockServiceTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsOemLockServiceTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsOemLockServiceTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsOemLockServiceTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsOsTestCases b/server/site_tests/cheets_GTS/control.GtsOsTestCases
index e87d1c4..40b3de1 100644
--- a/server/site_tests/cheets_GTS/control.GtsOsTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsOsTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsOsTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsOsTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsPackageInstallSessionTestCases b/server/site_tests/cheets_GTS/control.GtsPackageInstallSessionTestCases
index 8183e1f..4c6771b 100644
--- a/server/site_tests/cheets_GTS/control.GtsPackageInstallSessionTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPackageInstallSessionTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsPackageInstallSessionTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsPackageInstallSessionTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsPackageInstallerTapjackingTestCases b/server/site_tests/cheets_GTS/control.GtsPackageInstallerTapjackingTestCases
index 83f150b..2ea0b1f 100644
--- a/server/site_tests/cheets_GTS/control.GtsPackageInstallerTapjackingTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPackageInstallerTapjackingTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsPackageInstallerTapjackingTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsPackageInstallerTapjackingTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsPackageManagerHostTestCases b/server/site_tests/cheets_GTS/control.GtsPackageManagerHostTestCases
index bd98910..82b74a8 100644
--- a/server/site_tests/cheets_GTS/control.GtsPackageManagerHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPackageManagerHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsPackageManagerHostTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsPackageManagerHostTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsPackageNameCertPairsDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsPackageNameCertPairsDeviceTestCases
index f4a861b..a080dc0 100644
--- a/server/site_tests/cheets_GTS/control.GtsPackageNameCertPairsDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPackageNameCertPairsDeviceTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsPackageNameCertPairsDeviceTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsPackageNameCertPairsDeviceTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsPartnerBookmarksTestCases b/server/site_tests/cheets_GTS/control.GtsPartnerBookmarksTestCases
index 7b5280c..49d5dd8 100644
--- a/server/site_tests/cheets_GTS/control.GtsPartnerBookmarksTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPartnerBookmarksTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsPartnerBookmarksTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsPartnerBookmarksTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsPermissionTestCases b/server/site_tests/cheets_GTS/control.GtsPermissionTestCases
index ad1810d..495468e 100644
--- a/server/site_tests/cheets_GTS/control.GtsPermissionTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPermissionTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsPermissionTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsPermissionTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsPlacementTestCases b/server/site_tests/cheets_GTS/control.GtsPlacementTestCases
index 4b71d94..d1b5385 100644
--- a/server/site_tests/cheets_GTS/control.GtsPlacementTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPlacementTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsPlacementTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -27,4 +27,4 @@
         target_package='GtsPlacementTestCases',
         timeout=360)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsPlayAutoInstallTestCases b/server/site_tests/cheets_GTS/control.GtsPlayAutoInstallTestCases
index a1400f4..2ad0dec 100644
--- a/server/site_tests/cheets_GTS/control.GtsPlayAutoInstallTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPlayAutoInstallTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsPlayAutoInstallTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsPlayAutoInstallTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsPlayStoreHostTestCases b/server/site_tests/cheets_GTS/control.GtsPlayStoreHostTestCases
index 81cd762..3be3a71 100644
--- a/server/site_tests/cheets_GTS/control.GtsPlayStoreHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPlayStoreHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsPlayStoreHostTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsPlayStoreHostTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsPrintTestCases b/server/site_tests/cheets_GTS/control.GtsPrintTestCases
index f29f4d7..8ae2c4f 100644
--- a/server/site_tests/cheets_GTS/control.GtsPrintTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPrintTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsPrintTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsPrintTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsPrivacyTestCases b/server/site_tests/cheets_GTS/control.GtsPrivacyTestCases
index 15406e5..a918893 100644
--- a/server/site_tests/cheets_GTS/control.GtsPrivacyTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsPrivacyTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsPrivacyTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsPrivacyTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsRlzTestCases b/server/site_tests/cheets_GTS/control.GtsRlzTestCases
index 0fd038f..78308c7 100644
--- a/server/site_tests/cheets_GTS/control.GtsRlzTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsRlzTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsRlzTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsRlzTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsSampleDeviceTestCases b/server/site_tests/cheets_GTS/control.GtsSampleDeviceTestCases
index 5b6dfc6..da9edcc 100644
--- a/server/site_tests/cheets_GTS/control.GtsSampleDeviceTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSampleDeviceTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsSampleDeviceTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsSampleDeviceTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsSampleDynamicConfigTestCases b/server/site_tests/cheets_GTS/control.GtsSampleDynamicConfigTestCases
index 82e8bc7..0d10c50 100644
--- a/server/site_tests/cheets_GTS/control.GtsSampleDynamicConfigTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSampleDynamicConfigTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsSampleDynamicConfigTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsSampleDynamicConfigTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsSampleHostTestCases b/server/site_tests/cheets_GTS/control.GtsSampleHostTestCases
index 61d65b9..988a3f5 100644
--- a/server/site_tests/cheets_GTS/control.GtsSampleHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSampleHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsSampleHostTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsSampleHostTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsScreenshotHostTestCases b/server/site_tests/cheets_GTS/control.GtsScreenshotHostTestCases
index 7c3d282..042f5b2 100644
--- a/server/site_tests/cheets_GTS/control.GtsScreenshotHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsScreenshotHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsScreenshotHostTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsScreenshotHostTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsSearchHostTestCases b/server/site_tests/cheets_GTS/control.GtsSearchHostTestCases
index 97d6985..0c96ba0 100644
--- a/server/site_tests/cheets_GTS/control.GtsSearchHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSearchHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsSearchHostTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsSearchHostTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsSecurityHostTestCases b/server/site_tests/cheets_GTS/control.GtsSecurityHostTestCases
index dad3c31..924dd7f 100644
--- a/server/site_tests/cheets_GTS/control.GtsSecurityHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSecurityHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsSecurityHostTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsSecurityHostTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsSensorHostTestCases b/server/site_tests/cheets_GTS/control.GtsSensorHostTestCases
index 9eeb4c2..621dd1a 100644
--- a/server/site_tests/cheets_GTS/control.GtsSensorHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSensorHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsSensorHostTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsSensorHostTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsSetupWizardHostTestCases b/server/site_tests/cheets_GTS/control.GtsSetupWizardHostTestCases
index 62fd961..24d0eb3 100644
--- a/server/site_tests/cheets_GTS/control.GtsSetupWizardHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSetupWizardHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsSetupWizardHostTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsSetupWizardHostTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsSsaidHostTestCases b/server/site_tests/cheets_GTS/control.GtsSsaidHostTestCases
index 2980cfd..06e4110 100644
--- a/server/site_tests/cheets_GTS/control.GtsSsaidHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsSsaidHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsSsaidHostTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsSsaidHostTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsStorageTestCases b/server/site_tests/cheets_GTS/control.GtsStorageTestCases
new file mode 100644
index 0000000..b191680
--- /dev/null
+++ b/server/site_tests/cheets_GTS/control.GtsStorageTestCases
@@ -0,0 +1,30 @@
+# 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.
+
+# This file has been automatically generated. Do not edit!
+
+AUTHOR = 'ARC++ Team'
+NAME = 'cheets_GTS.GtsStorageTestCases'
+ATTRIBUTES = 'suite:gts'
+DEPENDENCIES = 'arc'
+JOB_RETRIES = 2
+TEST_TYPE = 'server'
+TIME = 'LENGTHY'
+
+DOC = ('Run package GtsStorageTestCases of the '
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
+       'in the ARC++ container.')
+
+def run_GTS(machine):
+    host = hosts.create_host(machine)
+    job.run_test(
+        'cheets_GTS',
+        host=host,
+        iterations=1,
+        tag='GtsStorageTestCases',
+        target_package='GtsStorageTestCases',
+
+        timeout=3600)
+
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsTelecomManagerTests b/server/site_tests/cheets_GTS/control.GtsTelecomManagerTests
index 223c470..cc41e6e 100644
--- a/server/site_tests/cheets_GTS/control.GtsTelecomManagerTests
+++ b/server/site_tests/cheets_GTS/control.GtsTelecomManagerTests
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsTelecomManagerTests of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsTelecomManagerTests',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsTetheringTestCases b/server/site_tests/cheets_GTS/control.GtsTetheringTestCases
index 1772ac7..8d9d52c 100644
--- a/server/site_tests/cheets_GTS/control.GtsTetheringTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsTetheringTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsTetheringTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsTetheringTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsTvBugReportTestCases b/server/site_tests/cheets_GTS/control.GtsTvBugReportTestCases
index aa1fb6d..30ae8a1 100644
--- a/server/site_tests/cheets_GTS/control.GtsTvBugReportTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsTvBugReportTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsTvBugReportTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsTvBugReportTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsTvHostTestCases b/server/site_tests/cheets_GTS/control.GtsTvHostTestCases
index a40f11b..bf5b5ae 100644
--- a/server/site_tests/cheets_GTS/control.GtsTvHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsTvHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsTvHostTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsTvHostTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsWebViewHostTestCases b/server/site_tests/cheets_GTS/control.GtsWebViewHostTestCases
index b8f65a2..b810cb8 100644
--- a/server/site_tests/cheets_GTS/control.GtsWebViewHostTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsWebViewHostTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsWebViewHostTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsWebViewHostTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsWebViewTestCases b/server/site_tests/cheets_GTS/control.GtsWebViewTestCases
index f417375..3ab4e50 100644
--- a/server/site_tests/cheets_GTS/control.GtsWebViewTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsWebViewTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsWebViewTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsWebViewTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)
diff --git a/server/site_tests/cheets_GTS/control.GtsYouTubeTestCases b/server/site_tests/cheets_GTS/control.GtsYouTubeTestCases
index 211317d..9eb34fd 100644
--- a/server/site_tests/cheets_GTS/control.GtsYouTubeTestCases
+++ b/server/site_tests/cheets_GTS/control.GtsYouTubeTestCases
@@ -13,7 +13,7 @@
 TIME = 'LENGTHY'
 
 DOC = ('Run package GtsYouTubeTestCases of the '
-       'Android 5.0_r2 Google Test Suite (GTS), build 4389763,'
+       'Android 5.1_r2 Google Test Suite (GTS), build 4507047,'
        'in the ARC++ container.')
 
 def run_GTS(machine):
@@ -26,4 +26,4 @@
         target_package='GtsYouTubeTestCases',
         timeout=3600)
 
-parallel_simple(run_GTS, machines)
\ No newline at end of file
+parallel_simple(run_GTS, machines)