Merge "Snap for 7487883 from 771e70cdf19e5939542da417def931e4f87bcc67 to sdk-release" into sdk-release