Snap for 7486544 from a3501d61740c92f989de47d2a6d86d4aec029843 to sc-release

Change-Id: I8ba8d9ebb70236ddbc1c227a524e535213b42626