Snap for 12091711 from eb11b78314c9015387d8893c8e2bfbb5401baa0b to 24Q4-release

Change-Id: I21fc64b97350032b2b43a122237c6c7051dd0546