Merge "Snap for 6877830 from 6c541722ff4fc606d42a0cd13095ca20e8154f22 to sdk-release" into sdk-release