Snap for 7183507 from 594e4947dacdb70297e74d461b9bb103be448d48 to sdk-release

Change-Id: I1fbffe468337eca62f683e42b55e75271f84530c