Merge "Snap for 6405781 from 662d97440093d0c89b3b94694892d779c3d92691 to sdk-release" into sdk-release