[coastguard skipped] Merge sparse cherrypicks from sparse-13270399-L70500030010643884 into 25Q1-release.

COASTGUARD_SKIP: I1eebeb0182db3b3226d17e59dcad4bfb705cd856

Change-Id: Icd970e18eefe3e1e7a018b5a0f7024801be9e85b
diff --git a/core/build_id.mk b/core/build_id.mk
index 5ad1a86..72600bd 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.003.A1
+BUILD_ID=BP1A.250505.003