Snap for 12910931 from 7c23e0168355de159ff7727b4ff0eeae5c02a6fd to 25Q2-release

Change-Id: I913047228feb49383af94c3408e2d0bbf1ddda37