Snap for 7717622 from 903a564340557977a894e3f4d27a240918b3414a to sc-v2-release

Change-Id: I040c64c1735c28eda6f84bb1d4a19c4dd8b0f90e