Merge "Snap for 6198741 from 7ddc362165b9a621526d23526be1a778fe157100 to sdk-release" into sdk-release