Snap for 13198286 from 75c360f9a8b8c364cb0239b76d6d8679eb4364a6 to sdk-release

Change-Id: I6f9ee5dec67e0fe5867527bc7db091ee89fa64dd