Snap for 11510485 from 448440ff8193c6504a854c0294526419e3efe1f3 to 24Q2-release

Change-Id: I1b39e08556cd78329a941f6d37f4e66f5fb77844