Snap for 12385180 from 60a83d25ca3c82fd9b62fe8a3d79c1cf40e2e601 to 24Q4-release

Change-Id: Idf1a2017b5c9130c092e92a658e707a8ca9225ca