[coastguard skipped] Merge sparse cherrypicks from sparse-13150826-L41900030010035865 into 25Q1-release.

COASTGUARD_SKIP: I5176d960004a7eda7c7a979f5c0e2a7323d16265

Change-Id: I82beb2638ae5f352c745a50bf4acd08707f6a837
diff --git a/core/build_id.mk b/core/build_id.mk
index c5258de..b741873 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.005.A1
+BUILD_ID=BP1A.250405.005