Snap for 6774496 from 8762648bcf57fe302364be37c7a8a703e861c050 to sc-d1-release

Change-Id: I7478046722fe785f1ffea17dcf2f114b55b47373