Snap for 12337407 from a24dba9a5e386602970cc5ccbae35f943c1ecaaa to 25Q1-release

Change-Id: Id74574ef0b35588c1a730199be9f1788d84bd9a8