Merge "Snap for 6198741 from d93e8475dfb265c8cc1de511c76b8a235e4a8114 to sdk-release" into sdk-release