Snap for 11380007 from eb8ce2de083258de0f32b99a1589b03b1e6a8246 to 24Q2-release

Change-Id: I46616ed3d7ce6c76c116c41315d38830f158da9d