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

COASTGUARD_SKIP: Ie39216559094785893db205c133a76537bce9bf6

Change-Id: Ib0a35bdd075926d1469589ec3914698841aaab64
diff --git a/core/build_id.mk b/core/build_id.mk
index 8af25b2..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.D1
+BUILD_ID=BP1A.250405.005