Merge "Snap for 5925869 from 737b0d2daabf33a458ed754e045b2f0e2b65da70 to sdk-release" into sdk-release