Snap for 11908474 from 78d96c7781c5bd78f1e53f717675007ab6e08a85 to 24Q3-release

Change-Id: If1eaba29c51d970ecdad5a1fa66b818955f900e0