[coastguard skipped] Merge sparse cherrypicks from sparse-12701944-L55000030008465871 into 24Q4-release.

COASTGUARD_SKIP: I5072051e95d215a88a4b86abd3c0ff29fa289d4f

Change-Id: I9e74c17f23a51ebd3e4d95f5414c070c674299e9
diff --git a/core/build_id.mk b/core/build_id.mk
index eda79f7..ebec06d 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.250105.002.C1
+BUILD_ID=AP4A.250105.002