Snap for 7060454 from 020d24a2db249fff728464c1b755e126e60e2e11 to sc-d1-release

Change-Id: I52177440b05b8f3ec1d50dc30d54d028a824d48d