Merge "Snap for 11541002 from 3620788d47f8a37b74a51eb614824319ae0c8393 to sdk-release" into sdk-release