Snap for 11784291 from ee8fb183d309b42092d3ebea5b108bdc28ed5b16 to 24Q3-release

Change-Id: I9107d2bfdb2d8be31d10ac13a1655053d244a843