Snap for 7357013 from 890240f470002e00a038b3152f81044cf7aa7b22 to sc-v2-release

Change-Id: Ib2944300632d6a6b9a8542b78ed4ffdcb8486119