[coastguard skipped] Merge sparse cherrypicks from sparse-13272751-L58400030010693881 into 25Q1-release.

COASTGUARD_SKIP: Ib49698eab8a0818418399870b9169ba2fb3776fa

Change-Id: I4e75d7b241536e4c86181df7aa1651e4c0bd086e
diff --git a/core/build_id.mk b/core/build_id.mk
index f3a9c09..ebf668b 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.250505.004.A1
+BUILD_ID=BP1A.250505.004