Merge "Snap for 5277895 from 967b86269c8bbd3bca2e9ed9e41f40e85de4d9fa to sdk-release" into sdk-release