Merge "Snap for 11785460 from 2eee6f12bcbb89158d6dd70fd35bf034f047489f to sdk-release" into sdk-release