Snap for 7160059 from 34b2a1fc483b0375845b8859b8f7a5acf57fbae1 to sc-d1-release

Change-Id: Ib873c0141dc3d5df10a16589888e9bb9b7bf253e