diff --git a/apex/manifest.json b/apex/manifest.json
index c1bdf6a..2c83052 100644
--- a/apex/manifest.json
+++ b/apex/manifest.json
@@ -1,4 +1,4 @@
 {
   "name": "com.android.tzdata",
-  "version": 300000000
+  "version": 310000000
 }
diff --git a/apex/tests/AndroidTest.xml b/apex/tests/AndroidTest.xml
index c9a547a..1981a5b 100644
--- a/apex/tests/AndroidTest.xml
+++ b/apex/tests/AndroidTest.xml
@@ -30,7 +30,9 @@
     <object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
         <!-- This module is found on Q devices. -->
         <option name="mainline-module-package-name" value="com.google.android.tzdata" />
-        <!-- This module is found on R+ devices. -->
+        <!-- This module is found on R devices. -->
         <option name="mainline-module-package-name" value="com.google.android.tzdata2" />
+        <!-- This module is found on S devices. -->
+        <option name="mainline-module-package-name" value="com.google.android.tzdata3" />
     </object>
 </configuration>
diff --git a/testing/data/test3/apex/manifest.json b/testing/data/test3/apex/manifest.json
index 0a82015..873fbc4 100644
--- a/testing/data/test3/apex/manifest.json
+++ b/testing/data/test3/apex/manifest.json
@@ -1,4 +1,4 @@
 {
   "name": "com.android.tzdata",
-  "version": 2147483647
+  "version": 309999900
 }