Snap for 7149879 from 9dcdd5b15d761d786a1c654d4f24ae6873f58c54 to sc-v2-release

Change-Id: I05b8bb79c49563c382b7c52ff622150a115689f8