Snap for 8261789 from dd6c389416365c333df245f94f0dd02772cd07ce to main-cg-testing-release

Change-Id: If4c914878cfa1d14c2ba66bf39be00a5a840cd8e