Merge 11.2023 lk upstream master

Bug: 291553072
Change-Id: I41c563c43e0da26d28f33ef39ef059d66b8fceb8
Signed-off-by: Dmitrii Merkurev <dimorinny@google.com>