Merge "Snap for 6435660 from bd7455035a4b009d4121c483adaf03cf94815bb5 to sdk-release" into sdk-release