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

COASTGUARD_SKIP: Ib7f944dc167ac1bb571eabeaf2dab6ca4ee4e817

Change-Id: I156cc007e38e22e3beb97134f98d3a4b50d155fc
diff --git a/core/build_id.mk b/core/build_id.mk
index 476be64..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.A1
+BUILD_ID=BP1A.250405.007