Merge "Snap for 11211409 from 82063b818f19c6c40eb3e06b7e489b73a170b506 to sdk-release" into sdk-release