Snap for 7838477 from 5de859a229bcb948e9fe517d7da4305a23d47b89 to sc-v2-release

Change-Id: Ia71e6975be5b91ed48127041dd6799b350ab4c9c