Merge commit 'Prepare v2023.10' into master

Bug: 297523929
Change-Id: Ie1b48550b6747cf39fae5395760934c740068442