Snap for 7633965 from 9ac9c1d5756b8f38941264f290405e12008065eb to sc-d1-release

Change-Id: I80826b6686e537d5cca26820e9b8b2a230c010c6