Merge "Snap for 8554636 from 01c102600be4d4de633751d6ca0bc09eda527a92 to sdk-release" into sdk-release