Snap for 7557463 from 5bd217414c850d23b2c12d757d0ac65ed73189a7 to sc-v2-release

Change-Id: Ibbd2c6dfab789764fc47db958f670fa9dade02b8