Snap for 7160059 from 573ca6065b0d1b727444826c5fa59cdbd9739978 to sc-d1-release Change-Id: I27e513ea810d2d77ed3c1d2d828a652832506f74