Snap for 4499105 from fabbb665d0e0aa1c4286acd423cc1e572d10d684 to sdk-release

Change-Id: I4be7e7054472bd3422b5b850aebb752b1ae0cbd1