Merge "Snap for 11819063 from 591bc3abbf385a1094ae4e37c7f82e10c3e36227 to sdk-release" into sdk-release