Snap for 11954976 from 4d8c26dc76fae945908c41f2a40f681ee04aee4f to 24Q3-release

Change-Id: I4dc13107fd1c9cfd43427bed1ef19ca2f86ffa51