Snap for 11828632 from 550ee079b2a88a9770b124d142a01f636c3f6ff9 to 24Q3-release

Change-Id: Ibf94d665844e5379b406a8b9b87603de3cd2c221