Snap for 7168754 from c2a1825c569adf2b8f0afdb44b758924fae7fa34 to sc-v2-release

Change-Id: I5b815c44db865e8ae7c15c0198fab397cc3a5472