Snap for 11084970 from dae27dce2a10efd9c6c5143dc2b55d778f8b6d6b to 24Q1-release

Change-Id: I47d520b3ddb7657b5a5a00dc7d64c0bafa477747