Snap for 6852980 from 107c2e6da818b68fc7bbc262a300c9907a8850d5 to sc-d1-release

Change-Id: I4908300196ad06edb2203c0c7bccc061b2f65326