diff --git a/apex/Android.bp b/apex/Android.bp
index d425260..64d618a 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -50,38 +50,16 @@
     additional_stubs: [
         "android-non-updatable",
     ],
-    hidden_api: {
-
-        // This module does not contain any split packages.
-        split_packages: [],
-
-        // The following packages and all their subpackages currently only
-        // contain classes from this bootclasspath_fragment. Listing a package
-        // here won't prevent other bootclasspath modules from adding classes in
-        // any of those packages but it will prevent them from adding those
-        // classes into an API surface, e.g. public, system, etc.. Doing so will
-        // result in a build failure due to inconsistent flags.
-        package_prefixes: [
-            "android.scheduling",
-        ],
-    },
-
-}
-
-systemserverclasspath_fragment {
-    name: "com.android.scheduling-systemserverclasspath-fragment",
-    standalone_contents: ["service-scheduling"],
-    apex_available: ["com.android.scheduling"],
 }
 
 apex {
     name: "com.android.scheduling",
-    defaults: ["s-launched-apex-module"],
+    updatable: true,
+    min_sdk_version: "current",
     bootclasspath_fragments: ["com.android.scheduling-bootclasspath-fragment"],
-    systemserverclasspath_fragments: ["com.android.scheduling-systemserverclasspath-fragment"],
+    java_libs: ["service-scheduling"],
     prebuilts: ["current_sdkinfo"],
     manifest: "manifest.json",
-    androidManifest: "AndroidManifest.xml",
     file_contexts: ":com.android.scheduling-file_contexts",
     key: "com.android.scheduling.key",
 }
@@ -89,5 +67,4 @@
 sdk {
     name: "scheduling-sdk",
     bootclasspath_fragments: ["com.android.scheduling-bootclasspath-fragment"],
-    systemserverclasspath_fragments: ["com.android.scheduling-systemserverclasspath-fragment"],
 }
diff --git a/apex/AndroidManifest.xml b/apex/AndroidManifest.xml
index dee0cb0..ec78924 100644
--- a/apex/AndroidManifest.xml
+++ b/apex/AndroidManifest.xml
@@ -1,28 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.scheduling">
-    <!-- APEX does not have classes.dex -->
-    <application android:hasCode="false">
-        <apex-system-service
-            android:name="com.android.server.scheduling.RebootReadinessManagerService$Lifecycle"
-            android:minSdkVersion="31"
-            android:path="/apex/com.android.scheduling/javalib/service-scheduling.jar"
-        />
-    </application>
+  package="com.android.scheduling">
+  <!-- APEX does not have classes.dex -->
+  <application android:hasCode="false" />
 </manifest>
diff --git a/apex/jarjar-rules.txt b/apex/jarjar-rules.txt
index 8b5d3a0..e7a2cb0 100644
--- a/apex/jarjar-rules.txt
+++ b/apex/jarjar-rules.txt
@@ -1,2 +1,2 @@
-rule com.android.internal.util.Preconditions* com.android.scheduling.Preconditions@1
-rule com.android.modules.utils.** com.android.scheduling.@1
+rule android.os.HandlerExecutor* com.android.scheduling.HandlerExecutor@1
+rule com.android.internal.util.Preconditions* com.android.scheduling.Preconditions@1
\ No newline at end of file
diff --git a/apex/manifest.json b/apex/manifest.json
index ccf4ddd..da53cc1 100644
--- a/apex/manifest.json
+++ b/apex/manifest.json
@@ -1,4 +1,4 @@
 {
   "name": "com.android.scheduling",
-  "version": 339990000
+  "version": 319999900
 }
diff --git a/framework/Android.bp b/framework/Android.bp
index 1224d9d..ba693b9 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -38,5 +38,5 @@
     apex_available: [
         "com.android.scheduling",
     ],
-    min_sdk_version: "S",
+    min_sdk_version: "current",
 }
diff --git a/service/Android.bp b/service/Android.bp
index 34ead52..0d661a7 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -36,7 +36,6 @@
 java_library {
     name: "scheduling-statsd",
     sdk_version: "system_current",
-    min_sdk_version: "31",
     srcs: [":statslog-scheduling-java-gen"],
     apex_available: [
         "com.android.scheduling",
@@ -47,9 +46,11 @@
     name: "service-scheduling",
     srcs: [
         ":service-scheduling-sources",
+        // TODO(b/161353402): Remove framework dependency when modules-utils expands
+        ":framework-cellbroadcast-shared-srcs",
         ":reboot-stats-parser",
     ],
-    min_sdk_version: "31",
+    min_sdk_version: "current",
     defaults: ["framework-system-server-module-defaults" ],
     sdk_version: "system_server_current",
     libs: [
@@ -58,14 +59,11 @@
         "unsupportedappusage",
     ],
     static_libs: [
-        "modules-utils-handlerexecutor",
-        "modules-utils-locallog",
-        "modules-utils-shell-command-handler",
+        "modules-utils-os",
         "scheduling-statsd",
     ],
     jarjar_rules: ":scheduling-jarjar-rules",
     apex_available: [
         "com.android.scheduling",
     ],
-    installable: true,
 }
diff --git a/service/java/com/android/server/scheduling/RebootReadinessManagerService.java b/service/java/com/android/server/scheduling/RebootReadinessManagerService.java
index 3073118..b480857 100644
--- a/service/java/com/android/server/scheduling/RebootReadinessManagerService.java
+++ b/service/java/com/android/server/scheduling/RebootReadinessManagerService.java
@@ -31,6 +31,7 @@
 import android.net.TetheringManager.TetheringEventCallback;
 import android.os.Binder;
 import android.os.Handler;
+import android.os.HandlerExecutor;
 import android.os.Looper;
 import android.os.ParcelFileDescriptor;
 import android.os.PowerManager;
@@ -49,7 +50,6 @@
 
 import com.android.internal.annotations.GuardedBy;
 import com.android.internal.annotations.VisibleForTesting;
-import com.android.modules.utils.HandlerExecutor;
 import com.android.server.SystemService;
 
 import java.io.FileDescriptor;
diff --git a/tests/Android.bp b/tests/Android.bp
index 13d143a..36be7c4 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -22,6 +22,4 @@
     srcs: ["src/**/*.java"],
     static_libs: ["androidx.test.rules", "truth-prebuilt", "androidx.test.core"],
     test_suites: ["general-tests", "cts", "mts-scheduling"],
-    target_sdk_version: "31",
-    min_sdk_version: "31",
 }
diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
index 1b71bf2..9f75d64 100644
--- a/tests/AndroidTest.xml
+++ b/tests/AndroidTest.xml
@@ -19,7 +19,6 @@
     <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
-    <option name="config-descriptor:metadata" key="parameter" value="no_foldable_states" />
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true"/>
         <option name="test-file-name" value="CtsRebootReadinessTestCases.apk"/>
diff --git a/tests/unittests/Android.bp b/tests/unittests/Android.bp
index 14b6884..5d89778 100644
--- a/tests/unittests/Android.bp
+++ b/tests/unittests/Android.bp
@@ -38,7 +38,7 @@
         "libstaticjvmtiagent",
     ],
     compile_multilib: "both",
-    target_sdk_version: "31",
-    min_sdk_version: "31",
+    min_sdk_version: "current",
+    target_sdk_version: "current",
     test_suites: ["general-tests", "mts-scheduling"],
 }