Merge "Snap for 12847752 from 5b5a8ede5f111d5db8c9d8d21cb9895542cd00d6 to sdk-release" into sdk-release