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

COASTGUARD_SKIP: I4b4b690e89edb4daee1b96b4100889be240de978

Change-Id: Id16ec8b00e83b5b7723907dc5ac2438c921763d5
diff --git a/core/build_id.mk b/core/build_id.mk
index 92bd372..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.A1
+BUILD_ID=BP1A.250405.003