Snap for 11869550 from 89f6a3beda1ecfd835e239ec81a543c6c4fda881 to 24Q3-release

Change-Id: I6661e99b843457038bc4bdfc4506f3fd1847d369