Snap for 7810574 from de6434459d987d58d03a7313ddcb862bb7b24503 to main-cg-testing-release Change-Id: I1417c80bdd4157299aaadb4a1ae977df020f8cff