Snap for 12543847 from 52aeb7f8ee3b320e05f6c5c0b39e9db1520984cd to 25Q1-release

Change-Id: Ia2613affad8c23a6dca74eca7376fb1968b2cbaf