Snap for 7419753 from 1be32d01e0f091387db38a73ad8b3b3842465ca4 to sc-release

Change-Id: I0b38587e50ce2e9066aaa5611980c945354e9984