Snap for 8261789 from 93e109d886da4cd1ac12637b037195c83e7bc6fe to main-cg-testing-release

Change-Id: I3f87a039ea6babf7b2a4ce44dfd6201fc6a40591