Snap for 6790641 from e02247070b82bef4a62e9185be4c440a9b63bb5e to sc-d1-release

Change-Id: Iae25a7f479cd7da193d35b3288c2f1246fe96d00