Snap for 7354453 from 3956b3ea84d7cffa8d50d5b5061e11202952b899 to sc-v2-release

Change-Id: Ic1e92ec28af552ddd75ff17aeb2e57e12fd88ffb