[coastguard skipped] Merge sparse cherrypicks from sparse-13083703-L97000030009736637 into 25Q1-release.

COASTGUARD_SKIP: If5b71f8514414fb5ef697fe28ed9cca1d6c230cb

Change-Id: Icd1213f8bf6cd7f56b44260a3bd7810f6f721e25
diff --git a/core/build_id.mk b/core/build_id.mk
index 100107b..f29e245 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.001.X1
+BUILD_ID=BP1A.250405.001