Snap for 11784291 from 81713db74cba1ee0e63be20cc9fbd773832c73df to 24Q3-release

Change-Id: Ifec5e9e3e3907ed92bbac426df2c055779382acd