Snap for 11517367 from 792837721c8fe5f99f8c517bf79ba02c60151f70 to 24Q2-release

Change-Id: I26a71eba4ea79fe4c244115c7eb9a8dc1e91fc60