Snap for 11881322 from 4bcb32acf4703975c54bcf2e1be59d032b089667 to 24Q3-release

Change-Id: Ia0cc941998f1d0821c322c6d0f8690ae5a4cdd80