Snap for 12406339 from cd6a99dee298db56f17a60cadc0abc18fd687375 to 24Q4-release

Change-Id: Idfc4c824277921002d932c2fdb5b57ce6f462ac1