Snap for 7537202 from 33fd185692dde5005fa743ca8a01b3633b68dc12 to sc-v2-release

Change-Id: I5fec606c86c41606e57d3e7cc8efc55fc650fec4