Merge "Snap for 5475808 from 8843541a211b388bd2d48037ea6595265d125730 to sdk-release" into sdk-release