diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index ff5a2a9..5063263 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: "T1005032"
+    build_id: "T1005628"
     target: "train_build"
     source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.uwb/sdk/uwb-module-sdk-current.zip"
   }
diff --git a/current/Android.bp b/current/Android.bp
index 26db009..8566ec1 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -46,6 +46,7 @@
     shared_library: false,
     permitted_packages: [
         "android.uwb",
+        "android.uwb.util",
         "com.android.x.uwb",
     ],
     public: {
@@ -83,6 +84,8 @@
     },
     visibility: [
         "//packages/modules/Uwb/apex",
+        "//packages/modules/Uwb/indev_uwb_adaptation",
+        "//packages/modules/Uwb/indev_uwb_adaptation/tests",
         "//packages/modules/Uwb/service",
         "//packages/modules/Uwb/service/tests/uwbtests/apex",
     ],
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index 6386a17..f09c43b 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv
@@ -52,6 +52,10 @@
 Landroid/uwb/IUwbAdfProvisionStateCallbacks$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/uwb/IUwbAdfProvisionStateCallbacks$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/uwb/IUwbAdfProvisionStateCallbacks$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/uwb/IUwbOemExtensionCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/uwb/IUwbOemExtensionCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/uwb/IUwbOemExtensionCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/uwb/IUwbOemExtensionCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
 Landroid/uwb/IUwbRangingCallbacks$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/uwb/IUwbRangingCallbacks$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/uwb/IUwbRangingCallbacks$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
@@ -132,6 +136,7 @@
 Landroid/uwb/RangingSession$$ExternalSyntheticLambda22;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/uwb/RangingSession$$ExternalSyntheticLambda23;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/uwb/RangingSession$$ExternalSyntheticLambda24;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/uwb/RangingSession$$ExternalSyntheticLambda25;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/uwb/RangingSession$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/uwb/RangingSession$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/uwb/RangingSession$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,sdk,system-api,test-api
@@ -262,5 +267,9 @@
 Landroid/uwb/UwbManager;->setUwbEnabled(Z)V,sdk,system-api,test-api
 Landroid/uwb/UwbManager;->unregisterAdapterStateCallback(Landroid/uwb/UwbManager$AdapterStateCallback;)V,sdk,system-api,test-api
 Landroid/uwb/UwbManager;->unregisterUwbVendorUciCallback(Landroid/uwb/UwbManager$UwbVendorUciCallback;)V,sdk,system-api,test-api
+Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda0;->call()Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda3;->call()Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/uwb/UwbVendorUciCallbackListener$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/uwb/UwbVendorUciCallbackListener$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
index adf222f..1db3f1f 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -52,6 +52,10 @@
 Landroid/uwb/IUwbAdfProvisionStateCallbacks$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/uwb/IUwbAdfProvisionStateCallbacks$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/uwb/IUwbAdfProvisionStateCallbacks$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/uwb/IUwbOemExtensionCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/uwb/IUwbOemExtensionCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/uwb/IUwbOemExtensionCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/uwb/IUwbOemExtensionCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
 Landroid/uwb/IUwbRangingCallbacks$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/uwb/IUwbRangingCallbacks$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/uwb/IUwbRangingCallbacks$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
@@ -132,6 +136,7 @@
 Landroid/uwb/RangingSession$$ExternalSyntheticLambda22;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/uwb/RangingSession$$ExternalSyntheticLambda23;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/uwb/RangingSession$$ExternalSyntheticLambda24;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/uwb/RangingSession$$ExternalSyntheticLambda25;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/uwb/RangingSession$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/uwb/RangingSession$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/uwb/RangingSession$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,system-api,test-api
@@ -262,5 +267,9 @@
 Landroid/uwb/UwbManager;->setUwbEnabled(Z)V,system-api,test-api
 Landroid/uwb/UwbManager;->unregisterAdapterStateCallback(Landroid/uwb/UwbManager$AdapterStateCallback;)V,system-api,test-api
 Landroid/uwb/UwbManager;->unregisterUwbVendorUciCallback(Landroid/uwb/UwbManager$UwbVendorUciCallback;)V,system-api,test-api
+Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda0;->call()Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
+Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda3;->call()Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
 Landroid/uwb/UwbVendorUciCallbackListener$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/uwb/UwbVendorUciCallbackListener$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
diff --git a/current/hiddenapi/signature-patterns.csv b/current/hiddenapi/signature-patterns.csv
index 1207a1b..57edbee 100644
--- a/current/hiddenapi/signature-patterns.csv
+++ b/current/hiddenapi/signature-patterns.csv
@@ -6,6 +6,7 @@
 android/uwb/IUwbAdapter
 android/uwb/IUwbAdapterStateCallbacks
 android/uwb/IUwbAdfProvisionStateCallbacks
+android/uwb/IUwbOemExtensionCallback
 android/uwb/IUwbRangingCallbacks
 android/uwb/IUwbVendorUciCallback
 android/uwb/MeasurementStatus
@@ -19,5 +20,7 @@
 android/uwb/UwbAddress
 android/uwb/UwbFrameworkInitializer
 android/uwb/UwbManager
+android/uwb/UwbOemExtensionCallbackListener
 android/uwb/UwbVendorUciCallbackListener
+android/uwb/util/**
 com/android/x/**
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index 233b869..01907dd 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-9035496
\ No newline at end of file
+9453351
\ No newline at end of file