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