Merge "Snap for 11253470 from 72cc4897fa7aef52abf41b9a569cf576b866b92e to sdk-release" into sdk-release