Merge "Snap for 6357634 from 6736db52bb416cafea5e0a2d70dfbed96329d783 to sdk-release" into sdk-release