Snap for 11869550 from 85df9202b8080eee1cd9d8b108b1de02cca384eb to 24Q3-release

Change-Id: I36bcf3d19fb34e0d4273d241da660d5dddcc3423