Snap for 7901677 from 279123c3c92a7b4321230a87c45e1d941d79da34 to sc-platform-release

Change-Id: Iea7a0a33947ad097087223724fefbea9b67910e1