Snap for 7387931 from a24048503ce4eae2d12d321251a6482627552ce0 to sc-v2-release

Change-Id: I413fa04333515ff14b8510b5438b85c82f45d9b9