Snap for 4499105 from c96e5aa6f5f1f6df03ef539b4b85c78bf7c292e5 to sdk-release

Change-Id: I7056a1e457220f992641d2993b7b9bd6418d0bac