Snap for 12404440 from 8475450c7a7aa0d0af4dfefc48c1e02ee416e000 to 24Q4-release

Change-Id: I442f05b5cd091237bba0119e812f48a9cb674e46