Merge "Snap for 7810574 from 16260b260608b988600036195064f1ba8ed269d4 to main-cg-testing-release" into main-cg-testing-release