Snap for 7120416 from 4e8e917a860ecc3021c810bdadc328bda9a9c215 to sc-v2-release

Change-Id: Ic97d11657eb4b3b1537724ce3ce482b37c297d62