Snap for 7509579 from 70b8341b6d3265b8b55793e2435fe1aa20e296ca to sc-v2-release

Change-Id: I0dbbccff917bac8d3217f40d21818f70edc86a21