Snap for 6876194 from 9bd7c76323b86810801c2f6b0793c068e47e7081 to sc-d1-release

Change-Id: Ib5f7a2de721d9b818ffb41e8a6527a5c509a854f