Snap for 12319997 from 3b0fa118acf9a460015a25281e5184ebe7bf997e to 24Q4-release

Change-Id: I63d2bffa8957f3ea246de44510d6b9688a2df14b