Snap for 11746631 from 3a8ade1b4f468b4657e732d258f123ec63c28c5a to 24Q3-release

Change-Id: I01636718b658f480ec2090d0c6dec4db08163eaf