Snap for 11869550 from eac7835ac35bb6f8143926200cb5d5845ffb7ff9 to 24Q3-release

Change-Id: I4a74e94dd28ba9f64f9c366312e2b7e599520a56