Merge "Snap for 8580505 from c970c8257d79766fb49bb219d5f622862fa7dad2 to main-cg-testing-release" into main-cg-testing-release