Merge "Snap for 5277895 from 51dde35ab45fb6f9b2718bb8ec8180fef22ec694 to sdk-release" into sdk-release