[coastguard skipped] Merge sparse cherrypicks from sparse-13270399-L91000030010642732 into 25Q1-release.

COASTGUARD_SKIP: Id40a44ce8b091c286229252638065ad5ceae92a2

Change-Id: Ic18db919d2c525076097e4e136aada9f33a19048
diff --git a/core/build_id.mk b/core/build_id.mk
index e926b8e..72600bd 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.003.D1
+BUILD_ID=BP1A.250505.003