Merge "Snap for 12925830 from 2e598de2ffcec7903d52742d4ecb80f11e7e1b92 to sdk-release" into sdk-release