Snap for 7549382 from a0109466981efd8814d8dc40267d3d2eea4e15f6 to sc-v2-release

Change-Id: I297983fda905a581dfd7b7529727d364f21d435d