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