Snap for 6198741 from 7ddc362165b9a621526d23526be1a778fe157100 to sdk-release

Change-Id: Iead49589d2c52bafc8cd3aa55deaec9755c1efdf