Snap for 11220357 from 80d344a4e1228e933ecb650d571a95aef1fed110 to 24Q1-release

Change-Id: I281817666954e546f96da668b0ea050c00aa18bb