[coastguard skipped] Merge sparse cherrypicks from sparse-13218059-L75500030010391139 into 25Q1-release.

COASTGUARD_SKIP: I87e961db0897d48c869c468a39feb88717b105b8

Change-Id: Ied28868c6a4e23ac1edebd5ada02ababb8995f46
diff --git a/core/build_id.mk b/core/build_id.mk
index c4d70dc..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.250405.006.A1
+BUILD_ID=BP1A.250405.006