[coastguard skipped] Merge sparse cherrypicks from sparse-13009785-L68500030009402311 into 25Q1-release.

COASTGUARD_SKIP: Ibd82092054dec0d7ee8da9cfd535bba9852bef54

Change-Id: Ic85d5ea8cf068a10ed88503edc9f17c91140bb8f
diff --git a/core/build_id.mk b/core/build_id.mk
index 9fe5e8f..c642e4a 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.250305.020.A1
+BUILD_ID=BP1A.250305.020