Snap for 6877830 from a58cc5a4fbbf72fee4b642a4af9be1bede584119 to sdk-release

Change-Id: I279b30fee9873d41c816fa372d47e4e2dff043df