Snap for 8108068 from 2fcf57e9fd260db88c8abfa014eab775b86db76b to main-cg-testing-release

Change-Id: Icb7343e24b644e99d71ac605ec4a605dd24e5194