[coastguard skipped] Merge sparse cherrypicks from sparse-13096125-L35000030009891390 into 25Q1-release.

COASTGUARD_SKIP: I094c80f9f5b7e09412f9ac2ac4356ba789e7bf23

Change-Id: I5e7cb34cbeff9414fa25fff7e98054f921f5f0c7
diff --git a/core/build_id.mk b/core/build_id.mk
index 9cb1449..b5240b7 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.003.B1
+BUILD_ID=BP1A.250405.003