Snap for 7739396 from e48d931740c36cfac16ae0bc23db7a72acfa41c7 to sc-v2-release

Change-Id: I52b3b33b535494f1494f225859635cc36cfc8eb0