Merge "Snap for 6877830 from e83f58adebead82491f8b1b2430942fb0a057ce1 to sdk-release" into sdk-release