Merge "Snap for 6357634 from 8b9e63695434a28d9c8f8f73c0c16f63d3fbd6c7 to sdk-release" into sdk-release