Snap for 12526387 from 9c2846deb764e81b900d17585b9be826a00c7247 to 25Q1-release

Change-Id: I55f49c2b4690a08f8b21acf82a19f4035a6aa2ff