Snap for 7314842 from bdf1f2ed2cba87c7cdcc2f89e5c0c44e2d1afe16 to sc-v2-release

Change-Id: I7ae1481c2b3bbbd62c879092690a9663a5ae098a