Merge "Snap for 12847752 from 32a64e1f8aa2055fd5275a944e0f5d98664d5e42 to sdk-release" into sdk-release