[coastguard skipped] Merge sparse cherrypicks from sparse-13428024-L78200030011887684 into 25Q2-release.

COASTGUARD_SKIP: I3f05809129f3969ba8eacc6330807d16b4a4c1e3

Change-Id: I02ca33332896b9947a1492781b8f4fd9ce185905
diff --git a/core/build_id.mk b/core/build_id.mk
index 1604aa1..2208080 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=BP2A.250605.015.X5
+BUILD_ID=BP2A.250605.030