[coastguard skipped] Merge sparse cherrypicks from sparse-13218059-L03300030010398185 into 25Q1-release.

COASTGUARD_SKIP: Ib7e80d58d5c18a95ba139b675aaa958a19d26fff

Change-Id: Id00b7e71d3eb4284de8c549ae51a53c9ff674bc2
diff --git a/core/build_id.mk b/core/build_id.mk
index d140e2d..9e14778 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.006.B1
+BUILD_ID=BP1A.250405.006