Merge "Snap for 8554636 from 11864eb9d96d78c533b193d12dc7cc0fb33af56c to sdk-release" into sdk-release