Merge commit 'Prepare v2023.07' into master

Bug: 297523929
Change-Id: I8ae2465825bc7db1b32626f17c5689ee43a81dd8