Merge "Snap for 11541002 from 74640f99231132d45339f0d92a49728f421e9b81 to sdk-release" into sdk-release