[coastguard skipped] Merge sparse cherrypicks from sparse-13240079-L72900030010449535 into 25Q1-release.

COASTGUARD_SKIP: I38719828e40435293b2576fbbbfebfed6cf8cef8

Change-Id: I84db777edc30d05b3a801a38fb4666cad3cec9c5
diff --git a/core/build_id.mk b/core/build_id.mk
index b88a3fd..1d143ac 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.007.C1
+BUILD_ID=BP1A.250405.007