Merge "Snap for 5925869 from 2c7b625904073fc96ab12e78a4ee6901c266f1d5 to sdk-release" into sdk-release