Snap for 7343210 from 3c69d251f11d8f15349b44ccdda4a51769f656aa to sc-release

Change-Id: Idb5827d8a3f47022dd8251fe91a58d5e1d448b03