Snap for 7339742 from d11b8380b2ec7688e08338fa4cdac6974113a1f0 to sc-v2-release

Change-Id: Ie5fafdebe70c97a8b1cf2fb09a3ede4425a2bc3c