Snap for 7314842 from a07241891a91496d7ba8168ce4678ea1d5948a4b to sc-v2-release

Change-Id: Idc3d3b37e20e30dd709de7d966a78a6cd68a86d1