Snap for 6686656 from 4fa3c48a1f9a4f7dcd7a44c639eabca7d7b067c6 to sdk-release

Change-Id: I35b47704f2c398c889f9faf97702f26e91e02477