Snap for 8029350 from 93a213f5572d268e742071705c15410e9d124917 to main-cg-testing-release

Change-Id: I0cc2ba51d44f165e1e85312b46b8448ae3a6eb69