Snap for 6198741 from 36d2ce62750acc984116f6af9b67b19b23a1afc5 to sdk-release

Change-Id: I5aaf35af3ab2574e6054f8746d90b0838ef9738f