[coastguard skipped] Merge sparse cherrypicks from sparse-12621605-L35400030007607992 into 24Q4-release.

COASTGUARD_SKIP: I470e765ded52826376b74d3b263b2519ca625ef1

Change-Id: I830874ab9d95ff9ff41b01e734aedd3f2641c7a7
diff --git a/core/build_id.mk b/core/build_id.mk
index 4d19d90..fcc0f39 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=AP4A.241205.013.B1
+BUILD_ID=AP4A.241205.013