Merge "Snap for 5934975 from 0d76cad830bcecb3b5d0108aa8db3d2fac790d2f to sdk-release" into sdk-release