Snap for 7426904 from be3c102a0237e3ef8569b1485cc6572bba8b7c9b to sc-v2-release

Change-Id: Ief9cc23726d146878c8e4e7c9c45d5e2293b3ef1