Snap for 7160059 from 42b90536d6d39b96b0417e19214dcdb727b80368 to sc-release

Change-Id: I815eb5aa2bcef13458967f2b12616a1dc666f2ba