Merge "Snap for 6405781 from b416a925ab0535c41d2f8c69dcef7dc962dcbfcc to sdk-release" into sdk-release