Merge "Snap for 7487883 from 465fb3954c063a938aafdec7ed9a15b3cd196086 to sdk-release" into sdk-release