Merge "Snap for 8952093 from 20442986717074297510612ff3dd4f7be266e0b9 to sdk-release" into sdk-release