Snap for 7451779 from f3e5b69bce555e0eb8bedb76127ee036929d0a0a to sc-v2-release

Change-Id: I926a7a8931b182f94db6a828a3be7cd61f4ffd98