[coastguard skipped] Merge sparse cherrypicks from sparse-13150826-L99900030010068474 into 25Q1-release.

COASTGUARD_SKIP: I43cf408176e0b53c00fd2f46838569a2030e1e18

Change-Id: I5d9e4c53a5ad63b6fbb41da07b5bb3456035330e
diff --git a/core/build_id.mk b/core/build_id.mk
index 77fafaa..b741873 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.005.C1
+BUILD_ID=BP1A.250405.005