Snap for 11399958 from 586fabb805b517d0b2e7876d30fb3e6df71bd395 to 24Q2-release

Change-Id: Idd63ce2b14118e75c4be66b4d1f93e3a949dfcf2