Snap for 6686656 from 9c956efc090a2df584088f120bf810aef3586c71 to sdk-release

Change-Id: I5ad3287d8d858c04f03ff13e4649664710be7e5d