Merge "Snap for 10399941 from 3760638efecdd8934e36c0913eb8f246a9ff49df to sdk-release" into sdk-release