Merge "Snap for 11754915 from ce820631d58f50b169448a940f98f926fa180f44 to sdk-release" into sdk-release