Merge "Snap for 6198741 from 4b2da35108aa7786b211b2102a8e5a60635eda27 to sdk-release" into sdk-release