Snap for 7810574 from 5d5dbcaf7d0400d3b428cbe0590de0693cc26f00 to main-cg-testing-release

Change-Id: I59e9d3f16194a14febb1760d8da4ab2ec7bce20f