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

COASTGUARD_SKIP: I0c43890ee1f64d1867b9cbcd227b898116bdb7f0

Change-Id: Ic8f078a68263d0cd21e5cd20d802ba87a3133918
diff --git a/core/build_id.mk b/core/build_id.mk
index ad0a218..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.X1
+BUILD_ID=BP1A.250405.003