Snap for 11794304 from a025682c3fe3fca1094f8e1567b9c7b5902bc27a to 24Q3-release

Change-Id: I902e8c255bb68b212b3a35ed2fcc3eb50581210b