Snap for 7641964 from bc50d228a24212fbc5d6f4ba76cda0be109667cf to sc-d1-release

Change-Id: I35920f20e016bfc10637e5b89d5ef1e40efc2829