[coastguard skipped] Merge sparse cherrypicks from sparse-12192237-L32900030005709642 into 24Q3-release.

COASTGUARD_SKIP: I926dbb03a144eb424e0177ff6b27b31700dbdf5b

Change-Id: Ic0bd375ca790ab0d8e5a66292a644e9376443764
diff --git a/core/build_id.mk b/core/build_id.mk
index 11ca12a..5114822 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=AP3A.240905.014.Y1
+BUILD_ID=AP3A.240905.014