Snap for 7343210 from 33f0b715b21c6eced501ef43f1425fa1be36aa31 to sc-v2-release

Change-Id: Iedcc38afad80a8a68eb6cc42f3e234f4e3741d5d