[coastguard skipped] Merge sparse cherrypicks from sparse-13270399-L13500030010685594 into 25Q1-release.

COASTGUARD_SKIP: If956dbdfcaf41641d8fcc4bd16381004bac8c342

Change-Id: Ie97c5c0910bf8cf58c675529bb69817a915720d5
diff --git a/core/build_id.mk b/core/build_id.mk
index 7986eb7..72600bd 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=BP1A.250505.003.B1
+BUILD_ID=BP1A.250505.003