Snap for 12748980 from fac6ebf2f4f9e4f21516c4c5a74b3dd518af2df0 to 25Q1-release

Change-Id: I78f0c454a2bf09835f155188a83b2dc4ed8a7630