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