Snap for 12304452 from c63510ab7e17a98c6ceaf06293a368eb5e0fb132 to 24Q4-release

Change-Id: I91798004920b5f89542b18b94dea9f6c78c5fbb3