[coastguard skipped] Merge sparse cherrypicks from sparse-13023662-L95400030009450945 into 25Q1-release.

COASTGUARD_SKIP: I5681a36bf28d70ce37e583b088511c9ebd8955b4

Change-Id: I0f16c43ef14a82a740e14c54d5377d58e8d28f88
diff --git a/core/build_id.mk b/core/build_id.mk
index 41e35fe..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.A2
+BUILD_ID=BP1A.250305.020