[coastguard skipped] Merge sparse cherrypicks from sparse-13226307-L32000030010566977 into 25Q1-release.

COASTGUARD_SKIP: Ibf4fa41e7dd7978afbe93e17493083a0f86ba647

Change-Id: I92274891eed15ada2087b8743d52fa40f09b546e
diff --git a/core/build_id.mk b/core/build_id.mk
index 7a6e24f..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.250305.019.W7
+BUILD_ID=BP1A.250405.007