Snap for 6436511 from ec278f2547a2641292bdad531a5e5c9668fc53f8 to sc-release

Change-Id: I82b25f6fe6ad524c9b89d8aa6d5dde9df13bd359