[coastguard skipped] Merge sparse cherrypicks from sparse-13272751-L19500030010647637 into 25Q1-release.

COASTGUARD_SKIP: Ic87457e057aaa554038b149968125b01cfb50e8e

Change-Id: Id424ff6b0d8fd4ff1832d21123920c060a6fb2b7
diff --git a/core/build_id.mk b/core/build_id.mk
index 228fc31..ebf668b 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.004.B1
+BUILD_ID=BP1A.250505.004