Snap for 7397158 from 1919443e37bc1c8f0ea4f8c78b27cb5586f3835e to sc-v2-release

Change-Id: I67673b4f906bf11206673e9cc024af51817f5a40