Merge "Snap for 6533464 from af7ab0e434074d79645d213db9d5df945c23691c to sdk-release" into sdk-release