Merge "Snap for 10411223 from 6cbae2d6d0adcddafe2d0c0dd50aec53a6a12cfe to sdk-release" into sdk-release