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

COASTGUARD_SKIP: I1ab38fc21d17d62da1e06ea37b94c9c9fb3b884d

Change-Id: Ie3f2e9ee3370da69d17f61d03ac0f90aee515b67
diff --git a/core/build_id.mk b/core/build_id.mk
index 3318e3c..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.D1
+BUILD_ID=BP1A.250405.007