Merge cherrypicks of [17804723] into sparse-8485989-L47100000954183944.

Change-Id: Id45f4aa4f510dd28737341be73e059bfc74a5d21
diff --git a/core/build_id.mk b/core/build_id.mk
index 52ccf82..72fb4bd 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=M_2022_05
+BUILD_ID=M_2022_06