Merge "Snap for 7362692 from 93406da189f9cd0765ffe87b56fb33707b59d4b5 to main-cg-testing-release" into main-cg-testing-release