Snap for 11938003 from 5f07eaa43bcc589c777114aec44fed0c56934add to 24Q3-release

Change-Id: I3407ccf44220673398c417c40827791dc5080e93