Snap for 7149879 from 1dea109e0a909f63a76a3b2062b3f4df374cd5c3 to sc-d1-release

Change-Id: I7d2ea60ec806a0a63e229dcea14ab7c8eb5bfc92