Snap for 11078623 from 3d4f496662b4e6626cf016758252c8188d51c0dc to 24Q1-release

Change-Id: I535f260ae932f545569035c6de511e2ba6598b27