Snap for 12755599 from b13fa53f9b061aa11dfef62e20e8e8d14ec2a2fe to 25Q1-release

Change-Id: I645332008ca639f49e3012bd1e8ff1586284992d