Snap for 7810574 from 1512c6d298dfa9e5a297982c76bec60f202360f2 to main-cg-testing-release

Change-Id: I1c62cf9c83f53f070422c7051bc36e2ae09e994b