Snap for 7549382 from 7609cc4e58e9f5777f8a111d8e29b0182f95e8b0 to sc-v2-release

Change-Id: If5de70af67489e2993c49b22caa9474b74a3cd19