Snap for 11967491 from 1800e6e7c566004e6f2695108fd678ed47b931c1 to 24Q3-release

Change-Id: Iada04acf79e3c2734ed1997139d688d90d0f7642