Snap for 7611421 from a67358bc8d5bd44abc293fc5e42341ac85412b20 to sc-v2-release

Change-Id: I80d2451280fe96292596c51577102707e9743bdd