Snap for 12224018 from 501c6a123e1aa0df849531df4b45d4e553f201e2 to 24Q4-release

Change-Id: I82446b28b57473a988db92da2fdb02cea35a97cf