Snap for 12815566 from 16475c68547640fd545d6d20a7431f66a75c04bc to sdk-release

Change-Id: I66c60592ba17fddcd57742f57a2d2bfd33d28cd6