Snap for 6877830 from 68f3ab10d1221919aac33788d33cd6cef6555b0c to sdk-release

Change-Id: Iae0a08e7bbd82e9df8c59b869f1a2be599027047