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

COASTGUARD_SKIP: Iaa87b5c5ed269e8d2b53fb43a21d782ccfcb06c8

Change-Id: I84e1903b1b51be1461c5b38aa69a080e875d99e9
diff --git a/core/build_id.mk b/core/build_id.mk
index d004b46..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.D1
+BUILD_ID=BP1A.250405.006