Snap for 11650815 from 3dc1679b4bc47410cc743f4fbe64c0bf9ddf71ba to 24Q3-release

Change-Id: Ia1eee3de0e78e24b81771a7bc6fc72891feb7f82