Snap for 12687986 from 879d4e78d617270d5e9402fdd0a0ccfd98ac2eac to 25Q1-release

Change-Id: I157250f493faa16f43fcbb42c2b316ca15050f96