Merge "Snap for 6877830 from 7644aec2c85d1db63d4467421995a237de6c3141 to sdk-release" into sdk-release