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