Snap for 7641964 from 2a4893e165d98498bb5604584e241ed7c328dee3 to sc-d1-release

Change-Id: I9a5560a1471842b5e1e402925f4015fe283abcdd