Snap for 7695339 from 0f657f2772f8944fac0468355a7968376ad4cd7d to sc-v2-release

Change-Id: Ia0a5d35edc9c821d0730645b2587d9023bd96dee