[coastguard skipped] Merge sparse cherrypicks from sparse-13240079-L37200030010491572 into 25Q1-release.

COASTGUARD_SKIP: I0e0dee5abe7d4764ca35ae01dcc924c50584e9aa

Change-Id: I97346305db825fa7f6d5d63d8cdd6de22a60b1a2
diff --git a/core/build_id.mk b/core/build_id.mk
index 41b4466..1d143ac 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.250405.007.B1
+BUILD_ID=BP1A.250405.007