Merge "Snap for 11754915 from 577a4b6a0352293d28a0a13dc2f28e996ae5f445 to sdk-release" into sdk-release