Merge "Snap for 6435660 from ca8931333214a559ec8c4fa6b795ca6c7ce0919e to sdk-release" into sdk-release