Snap for 12426030 from 96a0ec11ba0545a56f6496c5a93ecb570a3ca7f7 to 25Q1-release

Change-Id: If8061ce5d8a11566663719468bdfb432ef5bbb4f