Merge "Snap for 7110675 from 4f1685621b991185fcb8c05cb5dc33f47ee10ec4 to sdk-release" into sdk-release