Merge "Snap for 8554636 from 72e5d5b59fd76dadb261df580fb4a4bb38d18a8f to sdk-release" into sdk-release