Snap for 8294919 from 1157fa13dc217b6ef3b28a2882f293a948b2abe0 to main-cg-testing-release

Change-Id: I0b12f2574b0d499e75f334dec2038b18e8e8d32f