Snap for 11211173 from 2d463b31298bb13c59569a3d5408b0affb2d5ab4 to 24Q1-release

Change-Id: I6e92befba24ecb9b688d2fff21b610c554dd7614