Snap for 11486370 from 542905c587507317f86352a8cf95bc9fd48b0667 to 24Q2-release

Change-Id: I68e9758de27e7979d6634496e9f93761cf678767