[coastguard skipped] Merge sparse cherrypicks from sparse-10316531-L15400000961262887 into tm-qpr3-release.

COASTGUARD_SKIP: I6c867ce953f0d343d51d3d9177814022f6618485

Change-Id: I2f4125f8090b94e270518a72348e675b08962330
diff --git a/core/build_id.mk b/core/build_id.mk
index b8414f9..e70e58b 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=TQ3A.230805.001.A1
+BUILD_ID=TQ3A.230805.001