Merge "Snap for 8005954 from 7cf6703c1712492bcd689514bbb214cff8281970 to sdk-release" into sdk-release