Snap for 6686656 from 8b6eb89f36d32d6c35dea1710c284856b67b9293 to sdk-release

Change-Id: I8f3b89d546fc0408766b2fc2f4e468ed2736ae0e