Snap for 7717622 from 9874b5d68b8e7d46e7aa091d354462f2b90b3e1c to sc-v2-release

Change-Id: I1550374982cc31cb4766123d17b14de2c5ad5954