[coastguard skipped] Merge sparse cherrypicks from sparse-13218059-L87800030010393461 into 25Q1-release.

COASTGUARD_SKIP: I6a969b8d3d50afa9ccc30813ec9199ee86dccc8d

Change-Id: Ie7dec54a5c74469d84cd11b154b6284c11050c11
diff --git a/core/build_id.mk b/core/build_id.mk
index 61f08c8..9e14778 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.006.C1
+BUILD_ID=BP1A.250405.006