[coastguard skipped] Merge sparse cherrypicks from sparse-13096125-L75400030010013175 into 25Q1-release.

COASTGUARD_SKIP: Ibd4e91d69708cf03d3ec6765bc2b6d390c1045e4

Change-Id: I86c72e573e54f846ff37cb75cad3e2b688ec034d
diff --git a/core/build_id.mk b/core/build_id.mk
index 559fa32..b5240b7 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.003.Y1
+BUILD_ID=BP1A.250405.003