[coastguard skipped] Merge sparse cherrypicks from sparse-13150826-L89700030010089926 into 25Q1-release.

COASTGUARD_SKIP: Ia61e74593908644e3baf5ded44d2056d9ea8f9b4

Change-Id: I22a5ad616a1fc3478b1cbab396a4c5352981defa
diff --git a/core/build_id.mk b/core/build_id.mk
index 31e56be..b741873 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.005.B1
+BUILD_ID=BP1A.250405.005