Merge commit 'Prepare v2024.01' into master

Bug: 322054801
Change-Id: If901af1d08ff1c022bbdf9e8979f75ea7650561b