Snap for 11784291 from 315a8aa376b634ac4d9c4ce0a5c9fa336fe7f29f to 24Q3-release

Change-Id: Iefda9e00ac412dea5d32262e1ddbd391a2ab0635