Merge "Snap for 7183507 from 670dd9b349695260cab8add93784d684928b18db to sdk-release" into sdk-release