Snap for 7493928 from 8a462256c10c0bd88071b2e234c8f61b480408f2 to sc-v2-release

Change-Id: I6ce798b6bd1216916ab79eb8b9565ca985bea490