Merge "Snap for 7800789 from 9371ddc5aaf79e80c20ab29aa34552cdfc588cf7 to sdk-release" into sdk-release