Snap for 11784291 from 3f796f0a8c541fff4beb40c87c9c64dfc85b54bf to 24Q3-release

Change-Id: Id95016d85edb034570ee7dd074b41273783109c8