Snap for 11881322 from 71dd0de8d95d093612fb9cd8aece45076699773a to 24Q3-release

Change-Id: I48aa4719f3a89bd26fea7f070e55a09251336bde