Snap for 11869550 from 1bf5d25a5f4f14461225ac2e04e14482c4e820e4 to 24Q3-release

Change-Id: I4ac164df5b39833a873ca0a9b1357a1ce9c328eb