diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 242f2efa148f014cb8d59a5bcc7c84f7645eff33..c94ef10033e1cdc2bcd1c9ed307d635c2a1d344e 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: "12509279"
+    build_id: "12785903"
     target: "train_build"
     source_file: "mainline-sdks/for-latest-build/current/com.google.android.os.statsd/sdk/statsd-module-sdk-current.zip"
   }
diff --git a/current/Android.bp b/current/Android.bp
index 2a47faf6208fd84fc82d54c42231fa153cc79422..3743ec6df6244cf7446ba15dc711dc23e04f6377 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -105,6 +105,7 @@ cc_prebuilt_library_shared {
             "30",
             "current",
         ],
+        symbol_file: "libstatspull.map.txt",
     },
     arch: {
         arm64: {
@@ -138,6 +139,7 @@ cc_prebuilt_library_shared {
             "30",
             "current",
         ],
+        symbol_file: "libstatssocket.map.txt",
     },
     arch: {
         arm64: {
diff --git a/current/arm/lib/libstatspull.so b/current/arm/lib/libstatspull.so
index c3d2cb4583a6e823fd5806d1c266021197b82fe2..468505bf05c635764d47c505d321c740bc552249 100755
Binary files a/current/arm/lib/libstatspull.so and b/current/arm/lib/libstatspull.so differ
diff --git a/current/arm/lib/libstatssocket.so b/current/arm/lib/libstatssocket.so
index 3c6f5b7134f4cd1d7cbfecbc082d783a9bad1dcb..a3e97e0cab9c6315380077b267ca188a7f715bd5 100755
Binary files a/current/arm/lib/libstatssocket.so and b/current/arm/lib/libstatssocket.so differ
diff --git a/current/arm64/lib/libstatspull.so b/current/arm64/lib/libstatspull.so
index fafe86c6e5cd6510d496f0d6b8104107e67117cb..beb0c43f83ba92dd1d1ad20fbf4b7eb85e765a9e 100755
Binary files a/current/arm64/lib/libstatspull.so and b/current/arm64/lib/libstatspull.so differ
diff --git a/current/arm64/lib/libstatssocket.so b/current/arm64/lib/libstatssocket.so
index 6cb342b4588f426feb82723a989b9939e5f1e3af..7198f78e14c89e100f7a4aee0a26fe969ef677ba 100755
Binary files a/current/arm64/lib/libstatssocket.so and b/current/arm64/lib/libstatssocket.so differ
diff --git a/current/libstatspull.map.txt b/current/libstatspull.map.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a76342c9426a2ddf15f9fcade1402812ec1cae5f
--- /dev/null
+++ b/current/libstatspull.map.txt
@@ -0,0 +1,21 @@
+LIBSTATSPULL {
+    global:
+        AStatsManager_PullAtomMetadata_obtain; # apex introduced=30
+        AStatsManager_PullAtomMetadata_release; # apex introduced=30
+        AStatsManager_PullAtomMetadata_setCoolDownMillis; # apex introduced=30
+        AStatsManager_PullAtomMetadata_getCoolDownMillis; # apex introduced=30
+        AStatsManager_PullAtomMetadata_setTimeoutMillis; # apex introduced=30
+        AStatsManager_PullAtomMetadata_getTimeoutMillis; # apex introduced=30
+        AStatsManager_PullAtomMetadata_setAdditiveFields; # apex introduced=30
+        AStatsManager_PullAtomMetadata_getNumAdditiveFields; # apex introduced=30
+        AStatsManager_PullAtomMetadata_getAdditiveFields; # apex introduced=30
+        AStatsEventList_addStatsEvent; # apex introduced=30
+        AStatsManager_setPullAtomCallback; # apex introduced=30
+        AStatsManager_clearPullAtomCallback; # apex introduced=30
+
+        AStatsManager_addSubscription; # apex introduced=UpsideDownCake
+        AStatsManager_removeSubscription; # apex introduced=UpsideDownCake
+        AStatsManager_flushSubscription; # apex introduced=UpsideDownCake
+    local:
+        *;
+};
diff --git a/current/libstatssocket.map.txt b/current/libstatssocket.map.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e1edee511435dd23829467b13e48534fd690e156
--- /dev/null
+++ b/current/libstatssocket.map.txt
@@ -0,0 +1,35 @@
+LIBSTATSSOCKET {
+    global:
+        AStatsEvent_obtain; # apex introduced=30
+        AStatsEvent_build; # apex introduced=30
+        AStatsEvent_write; # apex introduced=30
+        AStatsEvent_release; # apex introduced=30
+        AStatsEvent_setAtomId; # apex introduced=30
+        AStatsEvent_writeInt32; # apex introduced=30
+        AStatsEvent_writeInt64; # apex introduced=30
+        AStatsEvent_writeFloat; # apex introduced=30
+        AStatsEvent_writeBool; # apex introduced=30
+        AStatsEvent_writeByteArray; # apex introduced=30
+        AStatsEvent_writeString; # apex introduced=30
+        AStatsEvent_writeAttributionChain; # apex introduced=30
+        AStatsEvent_writeInt32Array; # apex introduced=Tiramisu
+        AStatsEvent_writeInt64Array; # apex introduced=Tiramisu
+        AStatsEvent_writeFloatArray; # apex introduced=Tiramisu
+        AStatsEvent_writeBoolArray; # apex introduced=Tiramisu
+        AStatsEvent_writeStringArray; # apex introduced=Tiramisu
+        AStatsEvent_addBoolAnnotation; # apex introduced=30
+        AStatsEvent_addInt32Annotation; # apex introduced=30
+        AStatsSocket_close; # apex introduced=30
+    local:
+        *;
+};
+
+LIBSTATSSOCKET_PRIVATE {
+    global:
+        AStatsEvent_getBuffer;
+        AStatsEvent_getErrors;
+        AStatsEvent_overwriteTimestamp;
+        write_buffer_to_statsd;
+    local:
+        *;
+} LIBSTATSSOCKET;
\ No newline at end of file
diff --git a/current/sdk_library/module-lib/framework-statsd-stubs.jar b/current/sdk_library/module-lib/framework-statsd-stubs.jar
index 3f887ff757972eacb0865466d627701f89d21ac7..56d6e3c59e35157dfca09a57d1f5b7216b4c8c9a 100644
Binary files a/current/sdk_library/module-lib/framework-statsd-stubs.jar and b/current/sdk_library/module-lib/framework-statsd-stubs.jar differ
diff --git a/current/sdk_library/module-lib/framework-statsd.srcjar b/current/sdk_library/module-lib/framework-statsd.srcjar
index 7dff6f98b8dcf6b288736791661fab03d9f7b7e0..de3a77b96aace846881465c8b8e744e901df995a 100644
Binary files a/current/sdk_library/module-lib/framework-statsd.srcjar and b/current/sdk_library/module-lib/framework-statsd.srcjar differ
diff --git a/current/sdk_library/public/framework-statsd-stubs.jar b/current/sdk_library/public/framework-statsd-stubs.jar
index 0a2d519c7c9ae1c453cc7b582af4f5c4df596eed..ca5364d6b98ead99bd8b5c48c960014e77d016c9 100644
Binary files a/current/sdk_library/public/framework-statsd-stubs.jar and b/current/sdk_library/public/framework-statsd-stubs.jar differ
diff --git a/current/sdk_library/public/framework-statsd.srcjar b/current/sdk_library/public/framework-statsd.srcjar
index c7f77f7897b678776d28b40d4bb888b5559a6834..8f13a83ec57bd8a098db09ad1dbe5e4077fa93f3 100644
Binary files a/current/sdk_library/public/framework-statsd.srcjar and b/current/sdk_library/public/framework-statsd.srcjar differ
diff --git a/current/sdk_library/system/framework-statsd-stubs.jar b/current/sdk_library/system/framework-statsd-stubs.jar
index 7c9383ff997ba4333bd3da0074b1ed8e1aca8a82..a71ea98b8c7e3b164f00261a2da0aeae6c58b55b 100644
Binary files a/current/sdk_library/system/framework-statsd-stubs.jar and b/current/sdk_library/system/framework-statsd-stubs.jar differ
diff --git a/current/sdk_library/system/framework-statsd.srcjar b/current/sdk_library/system/framework-statsd.srcjar
index 688cbba774f175bba1cb149524d2077b1ff4e533..44d927d83388963938ffd66eaec02c4ce4d588db 100644
Binary files a/current/sdk_library/system/framework-statsd.srcjar and b/current/sdk_library/system/framework-statsd.srcjar differ
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index 466576e1dec33670885448759068d89f32e0b2c7..b5e3b8a7b56a0301939c72af930eb24d2957c272 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-12279057
\ No newline at end of file
+12712324
\ No newline at end of file
diff --git a/current/x86/lib/libstatspull.so b/current/x86/lib/libstatspull.so
index 4046997d092a34ef6e4b60862a26aa165f10c3db..f4dd5f25cfbb8e1fd7f6ca118c02a25db12a48bb 100755
Binary files a/current/x86/lib/libstatspull.so and b/current/x86/lib/libstatspull.so differ
diff --git a/current/x86/lib/libstatssocket.so b/current/x86/lib/libstatssocket.so
index f61725af16c0957c6358cb7cbf223afe80010b7a..1a8ee43584bd26225394b2c230d195a488baa793 100755
Binary files a/current/x86/lib/libstatssocket.so and b/current/x86/lib/libstatssocket.so differ
diff --git a/current/x86_64/lib/libstatspull.so b/current/x86_64/lib/libstatspull.so
index 689c5f605d75ae90764df48536224fa06ee1d8c4..1034dee9f1fc67faeb96ebe6b060d97bd5f538c8 100755
Binary files a/current/x86_64/lib/libstatspull.so and b/current/x86_64/lib/libstatspull.so differ
diff --git a/current/x86_64/lib/libstatssocket.so b/current/x86_64/lib/libstatssocket.so
index bb6bf70a16e96be7a68cbbb6b0ec5efe9d23167d..d33636c14a4951672d5c098ccafef7d0f4fb79fc 100755
Binary files a/current/x86_64/lib/libstatssocket.so and b/current/x86_64/lib/libstatssocket.so differ