Merge "Snap for 8294919 from bd5499f46c0f862b5c98d97021711dc7feaa9e78 to main-cg-testing-release" into main-cg-testing-release