Merge "Snap for 9679998 from b0bb1036ca37b1e457a0e7cbb1e271c4b6b2e3e2 to sdk-release" into sdk-release