Snap for 7430084 from 9fee641640938b6b245e513df471747eef999c97 to sc-v2-release

Change-Id: Ib808405365e48c1b6706521f604491ba9ff9fd10