diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 12f2cff..931b99c 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,6 +1,6 @@
 drops {
   android_build_drop {
-    build_id: "T1005166"
+    build_id: "T1005628"
     target: "train_build"
     source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.scheduling/sdk/scheduling-sdk-current.zip"
   }
diff --git a/current/Android.bp b/current/Android.bp
index 4138fa1..4378370 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -1,16 +1,5 @@
 // This is auto-generated. DO NOT EDIT.
 
-// Soong config variable stanza added by vendor/google/build/mainline_modules_sdks.py.
-soong_config_module_type_import {
-    from: "packages/modules/common/Android.bp",
-    module_types: [
-        "module_java_import",
-        "module_java_sdk_library_import",
-        "module_prebuilt_bootclasspath_fragment",
-        "module_prebuilt_systemserverclasspath_fragment",
-    ],
-}
-
 package {
     // A default list here prevents the license LSC from adding its own list which would
     // be unnecessary as every module in the sdk already has its own licenses property.
@@ -18,36 +7,11 @@
 }
 
 prebuilt_bootclasspath_fragment {
-    name: "scheduling-sdk_com.android.scheduling-bootclasspath-fragment@current",
-    sdk_member_name: "com.android.scheduling-bootclasspath-fragment",
-    visibility: ["//visibility:public"],
-    apex_available: ["com.android.scheduling"],
-    licenses: ["scheduling-sdk_Android-Apache-2.0@current"],
-    contents: ["scheduling-sdk_framework-scheduling@current"],
-    fragments: [
-        {
-            apex: "com.android.art",
-            module: "art-bootclasspath-fragment",
-        },
-    ],
-    hidden_api: {
-        annotation_flags: "hiddenapi/annotation-flags.csv",
-        metadata: "hiddenapi/metadata.csv",
-        index: "hiddenapi/index.csv",
-        signature_patterns: "hiddenapi/signature-patterns.csv",
-        filtered_stub_flags: "hiddenapi/filtered-stub-flags.csv",
-        filtered_flags: "hiddenapi/filtered-flags.csv",
-    },
-}
-
-module_prebuilt_bootclasspath_fragment {
     name: "com.android.scheduling-bootclasspath-fragment",
     // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
-    prefer: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
+    use_source_config_var: {
+        config_namespace: "ANDROID",
+        var_name: "module_build_from_source",
     },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.scheduling"],
@@ -70,47 +34,11 @@
 }
 
 java_sdk_library_import {
-    name: "scheduling-sdk_framework-scheduling@current",
-    sdk_member_name: "framework-scheduling",
-    visibility: ["//visibility:public"],
-    apex_available: ["com.android.scheduling"],
-    licenses: ["scheduling-sdk_Android-Apache-2.0@current"],
-    shared_library: false,
-    permitted_packages: ["android.scheduling"],
-    public: {
-        jars: ["sdk_library/public/framework-scheduling-stubs.jar"],
-        stub_srcs: ["sdk_library/public/framework-scheduling.srcjar"],
-        current_api: "sdk_library/public/framework-scheduling.txt",
-        removed_api: "sdk_library/public/framework-scheduling-removed.txt",
-        annotations: "sdk_library/public/framework-scheduling_annotations.zip",
-        sdk_version: "module_current",
-    },
-    system: {
-        jars: ["sdk_library/system/framework-scheduling-stubs.jar"],
-        stub_srcs: ["sdk_library/system/framework-scheduling.srcjar"],
-        current_api: "sdk_library/system/framework-scheduling.txt",
-        removed_api: "sdk_library/system/framework-scheduling-removed.txt",
-        annotations: "sdk_library/system/framework-scheduling_annotations.zip",
-        sdk_version: "module_current",
-    },
-    module_lib: {
-        jars: ["sdk_library/module-lib/framework-scheduling-stubs.jar"],
-        stub_srcs: ["sdk_library/module-lib/framework-scheduling.srcjar"],
-        current_api: "sdk_library/module-lib/framework-scheduling.txt",
-        removed_api: "sdk_library/module-lib/framework-scheduling-removed.txt",
-        annotations: "sdk_library/module-lib/framework-scheduling_annotations.zip",
-        sdk_version: "module_current",
-    },
-}
-
-module_java_sdk_library_import {
     name: "framework-scheduling",
     // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
-    prefer: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
+    use_source_config_var: {
+        config_namespace: "ANDROID",
+        var_name: "module_build_from_source",
     },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.scheduling"],
@@ -144,22 +72,11 @@
 }
 
 java_import {
-    name: "scheduling-sdk_service-scheduling@current",
-    sdk_member_name: "service-scheduling",
-    visibility: ["//visibility:public"],
-    apex_available: ["com.android.scheduling"],
-    licenses: ["scheduling-sdk_Android-Apache-2.0@current"],
-    jars: ["java_systemserver_libs/snapshot/jars/are/invalid/service-scheduling.jar"],
-}
-
-module_java_import {
     name: "service-scheduling",
     // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
-    prefer: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
+    use_source_config_var: {
+        config_namespace: "ANDROID",
+        var_name: "module_build_from_source",
     },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.scheduling"],
@@ -168,14 +85,6 @@
 }
 
 license {
-    name: "scheduling-sdk_Android-Apache-2.0@current",
-    sdk_member_name: "Android-Apache-2.0",
-    visibility: ["//visibility:private"],
-    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
-    license_text: ["licenses/build/soong/licenses/LICENSE"],
-}
-
-license {
     name: "scheduling-sdk_Android-Apache-2.0",
     visibility: ["//visibility:private"],
     license_kinds: ["SPDX-license-identifier-Apache-2.0"],
@@ -183,34 +92,14 @@
 }
 
 prebuilt_systemserverclasspath_fragment {
-    name: "scheduling-sdk_com.android.scheduling-systemserverclasspath-fragment@current",
-    sdk_member_name: "com.android.scheduling-systemserverclasspath-fragment",
-    visibility: ["//visibility:public"],
-    apex_available: ["com.android.scheduling"],
-    licenses: ["scheduling-sdk_Android-Apache-2.0@current"],
-    standalone_contents: ["scheduling-sdk_service-scheduling@current"],
-}
-
-module_prebuilt_systemserverclasspath_fragment {
     name: "com.android.scheduling-systemserverclasspath-fragment",
     // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
-    prefer: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
+    use_source_config_var: {
+        config_namespace: "ANDROID",
+        var_name: "module_build_from_source",
     },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.scheduling"],
     licenses: ["scheduling-sdk_Android-Apache-2.0"],
     standalone_contents: ["service-scheduling"],
 }
-
-sdk_snapshot {
-    name: "scheduling-sdk@current",
-    visibility: ["//visibility:public"],
-    bootclasspath_fragments: ["scheduling-sdk_com.android.scheduling-bootclasspath-fragment@current"],
-    java_sdk_libs: ["scheduling-sdk_framework-scheduling@current"],
-    java_systemserver_libs: ["scheduling-sdk_service-scheduling@current"],
-    systemserverclasspath_fragments: ["scheduling-sdk_com.android.scheduling-systemserverclasspath-fragment@current"],
-}
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index 6382e10..8d3cc89 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-9147603
\ No newline at end of file
+9098410
\ No newline at end of file