Snap for 7351654 from 6ee0782167be0007a7c2533662d039a728282b1f to sc-v2-release

Change-Id: Ia5425f61e452d5bac1f45d50f2df7335b8f2fd5a