Snap for 7475038 from 3fcc02b8dc68d05e9acbca532e762e691efdfd0c to sc-v2-release

Change-Id: I26df7eb88d0c53c154a772569b784498fc837f6d