Snap for 12140224 from ac7e01c139ef28402c4dd18416acbbef60133d09 to 24Q4-release

Change-Id: I88474bd046d27ee4f826147eea0a4879f5637e8c