Snap for 6890929 from 7aa2dc156a571529f0ea9e828fdd704ad572fbab to sc-d1-release

Change-Id: I40c01a73f7361fe566e299bcf50466a16eec7006