Snap for 7642774 from 28c8a63f3a7372da7abcedb508fd484d31d238ef to sc-v2-release

Change-Id: I2ed47ac642970852af33eb6c39dc9737e2111442