Merge "Snap for 5934975 from 6440886347661829ccfb71f21836a59caf28caa3 to sdk-release" into sdk-release