[coastguard skipped] Merge sparse cherrypicks from sparse-10121037-L10400000960889242 into tm-qpr3-release.

COASTGUARD_SKIP: I864a4057004570f5efeb4c90d06cf26da89cb1bc

Change-Id: I7349ee8437d5b8a9c25ac74f7c34ef35e88b9758
diff --git a/core/build_id.mk b/core/build_id.mk
index 1ceaa50..275f714 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.230605.010.A1
+BUILD_ID=TQ3A.230605.011