Snap for 7625316 from e649047f057f018f3eb460b5a67bb7887ff082e4 to sc-v2-release

Change-Id: Ied29124d0cab81ed04aa921786a9f6f4632eddea