Snap for 7616100 from e8b35336f4a506386e5505ff5b05edfd95fa63bd to sc-release

Change-Id: I6be3cddff5a306fff7c1bdadadc1fbe83c6d52ed