Snap for 6877830 from 8d824e60a437ef926b740f7c3b99a665443483a1 to sdk-release

Change-Id: I304881febca95af3997ba341ab9221b6dac3630b