Snap for 12730349 from 9aab1380a87a0cedb35788e48016737805564a2d to 25Q1-release

Change-Id: I73724388c89909ff43cc1f64edec7b9ef196a3b2