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

COASTGUARD_SKIP: Ie3bac5b3e534dcd0fd2f945f3fefe39799b05dd1

Change-Id: Id0d90e56d8531bd33e4a48810222f09b866695a1
diff --git a/core/build_id.mk b/core/build_id.mk
index 68bdb03..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.C1
+BUILD_ID=BP1A.250405.003