Snap for 11479750 from 5dca5ea2b718116d888f86960d0fe7e8871ee250 to 24Q3-release

Change-Id: Ifc068f61c20b847dad1b1db0caf1bf07f8e7ae27