Merge "Snap for 5798008 from 8272e7ad1e221440c4438cafdfbad03313354565 to sdk-release" into sdk-release