Snap for 7357013 from b4b786ca611bc01daeab3a9e40db03885840ee20 to sc-d1-release

Change-Id: I92e52f343b4b0993a8ba5c80b3d959b68bff244d