Merge "Snap for 7183507 from ec1a6704a2a94221e2e2967160efa5d3ae8498d2 to sdk-release" into sdk-release