Merge "Snap for 11962796 from 1ff512b7198d16418202e2149f406a04d22e5109 to sdk-release" into sdk-release