Snap for 7628048 from 28836849254e2c382b80bc80caf3d2a23c21247f to sc-v2-release

Change-Id: Iebc32fcbcd72687e6339b5162a7c708701500c7b