Snap for 12727401 from f428c2ae75d66e2a6fdca3553db884110608c88d to 25Q1-release

Change-Id: I6bfd4f9f1d05a6574e562adb9f2e4c9e2eed56ed