Snap for 11987757 from 4856dedc4552cd6fac5053e440552fa6f0c71112 to 24Q4-release

Change-Id: I20552d6c046e3708bf864a6857f0f7f081f8f216