Snap for 12763142 from 27130f606dc64880363d08f32e45a5499ffe218c to 25Q1-release

Change-Id: I5b01253a6e6b3b6bdb12b5caa52f3c2a47f6b466