Snap for 8782634 from af7a8c1e0a7cf571bc59fc1eb352f7e8720588d4 to sdk-release

Change-Id: I8a0d979d7f25e2068406f26be0826e914bfe5eb7