Snap for 8327259 from 01b1c623c4d556558b68fab2e3c9b09b21863f98 to main-cg-testing-release

Change-Id: I7f6a78bf8a44ac45a1b1b6a3591811f35d683dcb