Snap for 7306623 from ec4879ba87d05eab56662ef5d18ba621221113c0 to sc-v2-release

Change-Id: I6648293efd527f47557054052f1f39ac86485693