Snap for 11975806 from cbf046dc47f228d58fbe930f1d4b9914d7bf1ba6 to 24Q3-release

Change-Id: I02a41d39e10c7224626bbe7a7f58d40d094ac4cf