Snap for 8294919 from 170ba3ee2db3998bd86a59ceaf7d54753169fa06 to main-cg-testing-release

Change-Id: I037f215e15873cf36c1030cb447c7a464354eb7a