Snap for 8294919 from bf043b21279859690beb16a00b1fb385b0d9754a to main-cg-testing-release

Change-Id: I3c0faa29e27a78c4f83c28751ca5de81a805b599