[coastguard skipped] Merge sparse cherrypicks from sparse-13272751-L40800030010704228 into 25Q1-release.

COASTGUARD_SKIP: I2f29dba2761a54b53ef249b4cbc968b7a2fa1db2

Change-Id: Idba6a89f92ccf9fdc8c38da7f4be3f4e010dfd36
diff --git a/core/build_id.mk b/core/build_id.mk
index 16a8250..ebf668b 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.250505.004.D1
+BUILD_ID=BP1A.250505.004