Snap for 11784291 from 0330e0296bdf044ab94d15343b01fa3576cc695f to 24Q3-release

Change-Id: Ic6ee15ab9549c32d6ac9e036d252f1962ad376e6