Snap for 12573674 from 4c4eed7b3e782e7a738e320ce999614ee4e80089 to 25Q1-release

Change-Id: I27d169a5e711389fea5bcf1a7621894246d17667