Snap for 11859356 from af6893a4dba40bf3c19b3f86eefa2f5f90c2c92c to 24Q3-release

Change-Id: I45fcfbca85e1b78e8223cc1a07878eef45193c75