[coastguard skipped] Merge sparse cherrypicks from sparse-12845244-L01000030008561666 into 25Q1-release.

COASTGUARD_SKIP: I791c8b78d80045ffc64d74bb76ec181a5f9170b3

Change-Id: Ia1ff952b79c10d79f44a656e02561928e166a63d
diff --git a/core/build_id.mk b/core/build_id.mk
index 5ca834d..cc05353 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.241210.018.A1
+BUILD_ID=BP1A.241210.018