[coastguard skipped] Merge sparse cherrypicks from sparse-13219495-L66100030010403296 into 25Q1-release.

COASTGUARD_SKIP: I9ff5e80f8cda086f30d9f75948332bb556053f9a

Change-Id: I1b206be0ad21d7518fffcaf45a6665418530273f
diff --git a/core/build_id.mk b/core/build_id.mk
index f1b10ad..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.250305.019.W6
+BUILD_ID=BP1A.250405.006