Snap for 7724743 from 7aa80337ab0fcee919df4febaf41060df25c8dba to sc-v2-release

Change-Id: Ic0f59acd5a7443c58affa5facde8b7f28a7033a5