Snap for 7642774 from 71375918c5ba22d6c1058f50493b064e9882d6c6 to sc-v2-release

Change-Id: I0b85e76c063a10bdc2224aff72f250da8a7444f6